[linux-latest] 01/01: Merge tag '80' into jessie-backports

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch jessie-backports
in repository linux-latest.

commit 4bd7729fede62c226ae899d5540c36f9946be784
Merge: 45f7b70 434abec
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Mon May 22 11:49:32 2017 +0200

    Merge tag '80' into jessie-backports
    
    Release linux-latest (80).
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>

 debian/bin/gencontrol.py                            |  4 ----
 debian/changelog                                    | 14 +++++++++++---
 debian/rules.defs                                   |  2 +-
 debian/rules.real                                   |  3 ---
 debian/templates/control.extra.in                   |  7 +++++++
 debian/templates/control.xen-linux-system.latest.in |  6 ------
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index cba710f,867142c..3c50b1a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- linux-latest (79~bpo8+1) jessie-backports; urgency=medium
++linux-latest (80~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
-   * d/rules.defs: update kernel version ABI to 0.bpo.2
++  * d/rules.defs: update kernel version ABI to 0.bpo.3
 +
-  -- Héctor Orón Martínez <zumbi at debian.org>  Tue, 07 Mar 2017 11:26:14 +0100
++ -- Héctor Orón Martínez <zumbi at debian.org>  Mon, 22 May 2017 11:49:20 +0200
++
+ linux-latest (80) unstable; urgency=medium
+ 
+   * Re-introduce xen-linux-system-amd64 *again* as transitional package
+     (Closes: #857039)
+   * Update to 4.9.0-3
+ 
+  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 04 May 2017 16:33:51 +0100
  
  linux-latest (79) unstable; urgency=medium
  
diff --cc debian/rules.defs
index 59b2a4d,b8a9b6d..63680f5
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@@ -1,4 -1,4 +1,4 @@@
  BUILD_DIR = debian/build
  STAMPS_DIR = debian/stamps
  TEMPLATES_DIR = debian/templates
- KERNELVERSION := 4.9.0-0.bpo.2
 -KERNELVERSION := 4.9.0-3
++KERNELVERSION := 4.9.0-0.bpo.3
diff --cc debian/rules.real
index 8dc9e27,7c7cd11..5f17a23
--- a/debian/rules.real
+++ b/debian/rules.real
@@@ -56,8 -56,5 +56,5 @@@ install-flavour
  	dh_testroot
  	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION) -plinux-headers$(LOCALVERSION)'
  ifeq ($(DEBUG),True)
 -	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION)-dbgsym' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -DAuto-Built-Package=debug-symbols'
 +	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION)-dbg'
  endif
- ifeq ($(XEN),True)
- 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-pxen-linux-system$(LOCALVERSION)'
- endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-latest.git