UBUNTU: Ubuntu-raspi2-4.11.0-1004.5

Signed-off-by: Andy Whitcroft <apw@canonical.com>
(cherry picked from commit 6335bd5ed58f77db086071a9ba973fce436dbf70)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/debian.raspi2/changelog b/debian.raspi2/changelog
index ece46da7de8af3ea5d59563545b6b87333244ea4..7dd56b46026fa52acf74eae2105437fd79537f60 100644 (file)
--- a/debian.raspi2/changelog
+++ b/debian.raspi2/changelog
@@ -1,8 +1,11 @@
-linux-raspi2 (4.11.0-1004.5) UNRELEASED; urgency=low
+linux-raspi2 (4.11.0-1004.5) artful; urgency=low
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  * linux-raspi2: 4.11.0-1004.5 -proposed tracker (LP: #1704188)
+
+  * Miscellaneous Ubuntu changes
+    - rebase to Ubuntu-4.11.0-11.16
+    - [Config] update configs following rebase to Ubuntu-4.11.0-11.16
+    - [Packaging] fix insertchanges
 
   [ Ubuntu: 4.11.0-11.16 ]
 

diff --git a/debian.raspi2/reconstruct b/debian.raspi2/reconstruct
index abefd3d0a483544523205c92b5b7f2456a546566..85b65db52f1397e4776d5ebaded8434a46596a1e 100644 (file)
--- a/debian.raspi2/reconstruct
+++ b/debian.raspi2/reconstruct
@@ -1,7 +1,6 @@
 # Recreate any symlinks created since the orig.
 [ ! -L 'arch/arm64/boot/dts/overlays' ] && ln -sf '../../../arm/boot/dts/overlays' 'arch/arm64/boot/dts/overlays'
 [ ! -L 'spl/rpm/redhat/spl-dkms.spec.in' ] && ln -sf '../generic/spl-dkms.spec.in' 'spl/rpm/redhat/spl-dkms.spec.in'
-[ ! -L 'spl/rpm/redhat/spl.spec.in' ] && ln -sf '../generic/spl.spec.in' 'spl/rpm/redhat/spl.spec.in'
 [ ! -L 'ubuntu/vbox/vboxguest/include' ] && ln -sf '../include' 'ubuntu/vbox/vboxguest/include'
 [ ! -L 'ubuntu/vbox/vboxguest/r0drv' ] && ln -sf '../r0drv' 'ubuntu/vbox/vboxguest/r0drv'
 [ ! -L 'ubuntu/vbox/vboxsf/include' ] && ln -sf '../include' 'ubuntu/vbox/vboxsf/include'

diff --git a/debian/source/options b/debian/source/options
index f18978d11e8d9848e13deb615f51c4b7c25ec9dc..b37ec4c1091d788e2c7fc7d7a5769ac64b8847d8 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -3,7 +3,6 @@
 # Ignore any symlinks created since the orig which are rebuilt by reconstruct.
 extend-diff-ignore=^arch/arm64/boot/dts/overlays$
 extend-diff-ignore=^spl/rpm/redhat/spl-dkms.spec.in$
-extend-diff-ignore=^spl/rpm/redhat/spl.spec.in$
 extend-diff-ignore=^ubuntu/vbox/vboxguest/include$
 extend-diff-ignore=^ubuntu/vbox/vboxguest/r0drv$
 extend-diff-ignore=^ubuntu/vbox/vboxsf/include$