UBUNTU: Ubuntu-raspi2-4.8.0-1007.8

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.raspi2/changelog b/debian.raspi2/changelog
index ed7acfd23eb14547671b70a75edd4ca008340955..bbfd8ec856431a064033c8ea8e6000c7ad92a77c 100644 (file)
--- a/debian.raspi2/changelog
+++ b/debian.raspi2/changelog
@@ -1,8 +1,7 @@
-linux-raspi2 (4.8.0-1007.8) UNRELEASED; urgency=low
+linux-raspi2 (4.8.0-1007.8) yakkety; 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.
+  * Miscellaneous Ubuntu changes
+    - [Config] updateconfigs after rebase to fix FTBS
 
  -- Tim Gardner <tim.gardner@canonical.com>  Thu, 15 Sep 2016 12:18:03 -0600
 

diff --git a/debian.raspi2/reconstruct b/debian.raspi2/reconstruct
index 7d5b652a0095e6b7fb49bab4cb35860dbc30caf3..caa0378ec18f9da7b74b4dd7e6d6c3292bc55164 100644 (file)
--- a/debian.raspi2/reconstruct
+++ b/debian.raspi2/reconstruct
@@ -1,4 +1,6 @@
 # Recreate any symlinks created since the orig.
+[ ! -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'
 # Remove any files deleted from the orig.
 rm -f 'arch/powerpc/kernel/hmi.c'
 rm -f 'debian.master/abi/4.8.0-0.0/abiname'

diff --git a/debian/source/options b/debian/source/options
index b29684e492759f92f57e95c832734a3550b8649c..27b0b0309b589c331a8e67a96ce7ef8147865fd0 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,6 +1,8 @@
 # Ignore vbox symlinks, we will regenerate these at clean (LP:1426113)
 ## autoreconstruct -- begin
 # Ignore any symlinks created since the orig which are rebuilt by reconstruct.
+extend-diff-ignore=spl/rpm/redhat/spl-dkms.spec.in
+extend-diff-ignore=spl/rpm/redhat/spl.spec.in
 ## autoreconstruct -- end
 
 # force "dpkg-source -I -i" behavior