Bug#685287: marked as done (tpu: cdbs/0.4.115+deb7u1)

To: "Adam D. Barratt" <adam@adam-barratt.org.uk>
Subject: Bug#685287: marked as done (tpu: cdbs/0.4.115+deb7u1)
From: owner@bugs.debian.org (Debian Bug Tracking System)
Date: Sun, 26 Aug 2012 08:57:04 +0000
Message-id: <[🔎] handler.685287.D685287.134597125327812.ackdone@bugs.debian.org>
References: <901a6725631112f6380a75a4f535e8b9@mail.adsl.funky-badger.org> <[🔎] 87ehn3f8wn.fsf@marvin.43-1.org>

Your message dated Sun, 26 Aug 2012 09:54:05 +0100
with message-id <901a6725631112f6380a75a4f535e8b9@mail.adsl.funky-badger.org>
and subject line Re: Bug#685287: tpu: cdbs/0.4.115+deb7u1
has caused the Debian Bug report #685287,
regarding tpu: cdbs/0.4.115+deb7u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
685287: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685287
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems

--- Begin Message ---

To: submit@bugs.debian.org
Subject: unblock or tpu: cdbs/0.4.117
From: Ansgar Burchardt <ansgar@debian.org>
Date: Sun, 19 Aug 2012 12:55:36 +0200
Message-id: <[🔎] 87ehn3f8wn.fsf@marvin.43-1.org>

Package: release.debian.org
Usertags: xz-for-wheezy

cdbs/0.4.117 included the change to switch the default compression for
GNOME packages to xz which I would like to include in wheezy.

However cdbs/0.4.116 was uploaded to unstable after the freeze and
includes some changes that do not meet the requirements for freeze
exceptions: switching to debhelper compat level 8 and small changes to
auto-resolved build dependencies making them unversioned if already
satisfied in stable (Squeeze).

I have attached both the current diff from unstable to testing and a
diff of only the changes in 0.4.117.  If you prefer an upload to tpu
instead of unblocking the version currently in unstable, this would be
the changes I would ask Jonas to include.

Ansgar

diff -Nru cdbs-0.4.115/1/class/gnome.mk.in cdbs-0.4.117/1/class/gnome.mk.in
--- cdbs-0.4.115/1/class/gnome.mk.in	2011-01-08 15:37:13.000000000 +0100
+++ cdbs-0.4.117/1/class/gnome.mk.in	2012-08-05 10:35:17.000000000 +0200
@@ -42,4 +42,7 @@
 	$(if $(wildcard /usr/bin/dh_gconf),dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS))
 	$(if $(wildcard /usr/bin/dh_icons),dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONS_ARGS))
 
+# Use xz compression.
+DEB_DH_BUILDDEB_ARGS ?= -u-Zxz
+
 endif
diff -Nru cdbs-0.4.115/1/class/langcore.mk.in cdbs-0.4.117/1/class/langcore.mk.in
--- cdbs-0.4.115/1/class/langcore.mk.in	2012-06-22 17:10:01.000000000 +0200
+++ cdbs-0.4.117/1/class/langcore.mk.in	2012-07-07 13:11:01.000000000 +0200
@@ -67,8 +67,4 @@
 	DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
-# Tighten to versions handling compile flags fix when enabled
-CDBS_BUILD_DEPENDS_class_langcore_fix ?= cdbs (>= 0.4.90~)
-CDBS_BUILD_DEPENDS += $(if $(CDBS_FIX_COMPILE_FLAGS),$(comma) $(CDBS_BUILD_DEPENDS_class_langcore_fix))
-
 endif
diff -Nru cdbs-0.4.115/1/class/makefile.mk.in cdbs-0.4.117/1/class/makefile.mk.in
--- cdbs-0.4.115/1/class/makefile.mk.in	2011-04-24 12:05:50.000000000 +0200
+++ cdbs-0.4.117/1/class/makefile.mk.in	2012-07-07 13:12:07.000000000 +0200
@@ -36,10 +36,6 @@
 
 DEB_PHONY_RULES += makefile-clean $(cdbs_make_clean_nonstamps)
 
-# Tighten to versions supporting multiflavors if feature actually used
-CDBS_BUILD_DEPENDS_class_autotools_flavors ?= cdbs (>= 0.4.72~)
-CDBS_BUILD_DEPENDS += $(if $(cdbs_make_flavors),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools_flavors))
-
 pre-build::
 	$(if $(cdbs_make_flavors),mkdir -p debian/stamp-makefile-build debian/stamp-makefile-install)
 	$(and $(cdbs_make_flavors),$(DEB_MAKE_CHECK_TARGET),mkdir -p debian/stamp-makefile-check)
diff -Nru cdbs-0.4.115/1/class/perl-build.mk.in cdbs-0.4.117/1/class/perl-build.mk.in
--- cdbs-0.4.115/1/class/perl-build.mk.in	2011-08-20 17:20:55.000000000 +0200
+++ cdbs-0.4.117/1/class/perl-build.mk.in	2012-07-07 14:14:31.000000000 +0200
@@ -29,15 +29,6 @@
 CDBS_BUILD_DEPENDS_class_perl-build_perl ?= perl
 CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_perl-build_perl)
 
-# Depend on Module::Build
-# (older releases choke on --ccflags and treat destdir differently)
-CDBS_BUILD_DEPENDS_class_perl-build_module ?= perl-modules (>= 5.10.0) | libmodule-build-perl (>= 0.2808)
-CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_perl-build_module)
-
-# Tighten to versions of cdbs providing working version of this snippet
-CDBS_BUILD_DEPENDS_class_perl-build ?= cdbs (>= 0.4.78~)
-CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_perl-build)
-
 # Sanity check: DEB_PERL_SRCDIR must be declared early
 cdbs_perl_srcdir_early := $(DEB_PERL_SRCDIR)
 cdbs_perl_srcdir_check = $(if $(call cdbs_streq,$(cdbs_perl_srcdir_early),$(DEB_PERL_SRCDIR)),,$(error DEB_PERL_SRCDIR must be set before including perl-build.mk, not after))
diff -Nru cdbs-0.4.115/1/class/perl-makemaker.mk.in cdbs-0.4.117/1/class/perl-makemaker.mk.in
--- cdbs-0.4.115/1/class/perl-makemaker.mk.in	2010-05-22 22:52:01.000000000 +0200
+++ cdbs-0.4.117/1/class/perl-makemaker.mk.in	2012-07-07 13:22:29.000000000 +0200
@@ -23,7 +23,7 @@
 ifndef _cdbs_class_perl_makemaker
 _cdbs_class_perl_makemaker = 1
 
-# Make sure that CDBS_BUILD_DEPENDS is initialised
+# Initialize CDBS_BUILD_DEPENDS and shared DEB_MAKE_*
 include $(_cdbs_class_path)/perl-makemaker-vars.mk$(_cdbs_makefile_suffix)
 include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
 
diff -Nru cdbs-0.4.115/1/class/perl-vars.mk.in cdbs-0.4.117/1/class/perl-vars.mk.in
--- cdbs-0.4.115/1/class/perl-vars.mk.in	2012-03-02 06:04:50.000000000 +0100
+++ cdbs-0.4.117/1/class/perl-vars.mk.in	2012-07-07 13:13:17.000000000 +0200
@@ -36,10 +36,6 @@
 # then set DEB_PERL_DESTDIR = $(cdbs_curdestdir)
 DEB_PERL_DESTDIR ?= $(if $(filter 1,$(words $(DEB_PERL_PACKAGES))),$(CURDIR)/debian/$(DEB_PERL_PACKAGES),$(cdbs_curdestdir))
 
-# Tighten to versions of cdbs actually providing this snippet
-CDBS_BUILD_DEPENDS_class_perl-vars ?= cdbs (>= 0.4.73~)
-CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_perl-vars)
-
 # Avoid auto-building dependencies
 export PERL_AUTOINSTALL='--skipdeps'
 
diff -Nru cdbs-0.4.115/1/class/perlmodule.mk.in cdbs-0.4.117/1/class/perlmodule.mk.in
--- cdbs-0.4.115/1/class/perlmodule.mk.in	2010-05-22 22:52:01.000000000 +0200
+++ cdbs-0.4.117/1/class/perlmodule.mk.in	2012-07-07 13:24:57.000000000 +0200
@@ -23,7 +23,7 @@
 ifndef _cdbs_class_perlmodule
 _cdbs_class_perlmodule = 1
 
-# Make sure that CDBS_BUILD_DEPENDS is initialised
+# Initialize CDBS_BUILD_DEPENDS
 include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
 
 $(warning WARNING:  perlmodule.mk is deprecated - please use perl-makemaker.mk instead)
diff -Nru cdbs-0.4.115/1/class/python-autotools.mk.in cdbs-0.4.117/1/class/python-autotools.mk.in
--- cdbs-0.4.115/1/class/python-autotools.mk.in	2011-02-08 12:26:39.000000000 +0100
+++ cdbs-0.4.117/1/class/python-autotools.mk.in	2012-07-07 13:25:47.000000000 +0200
@@ -31,7 +31,7 @@
 # Build-time per-package variables conflict with with flavor variables
 cdbs_python_single_system = true
 
-CDBS_BUILD_DEPENDS_class_python-autotools ?= $(cdbs_python_builddeps_cdbs), cdbs (>= 0.4.75~)
+CDBS_BUILD_DEPENDS_class_python-autotools ?= $(cdbs_python_builddeps_cdbs)
 CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-autotools)
 
 # Python-related dependencies according to Python policy, appendix A
diff -Nru cdbs-0.4.115/1/class/python-module.mk.in cdbs-0.4.117/1/class/python-module.mk.in
--- cdbs-0.4.115/1/class/python-module.mk.in	2011-09-12 12:15:50.000000000 +0200
+++ cdbs-0.4.117/1/class/python-module.mk.in	2012-07-07 13:31:19.000000000 +0200
@@ -38,7 +38,7 @@
 CDBS_BUILD_DEPENDS += $(if $(cdbs_python_pycentral),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pycentral))
 
 # dh_python2 comes from python package
-CDBS_BUILD_DEPENDS_class_python-module_python2 ?= python (>= 2.6.5)
+CDBS_BUILD_DEPENDS_class_python-module_python2 ?= python
 CDBS_BUILD_DEPENDS += $(if $(cdbs_python2),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python2))
 
 CDBS_BUILD_DEPENDS_class_python-module_python3 ?= python3
diff -Nru cdbs-0.4.115/1/class/python-sugar.mk.in cdbs-0.4.117/1/class/python-sugar.mk.in
--- cdbs-0.4.115/1/class/python-sugar.mk.in	2012-05-28 19:47:43.000000000 +0200
+++ cdbs-0.4.117/1/class/python-sugar.mk.in	2012-07-07 13:32:23.000000000 +0200
@@ -54,7 +54,7 @@
 cdbs_sugar_allbranchdeps = $(call cdbs_expand_branches,$1,$(DEB_SUGAR_BRANCHES),$(comma) ,$(comma) ,$(DEB_SUGAR_PRIMARY_BRANCH))
 cdbs_sugar_anybranchdeps = $(call cdbs_expand_branches,$1,$(DEB_SUGAR_BRANCHES),$(comma) , | ,$(DEB_SUGAR_PRIMARY_BRANCH))
 
-CDBS_BUILD_DEPENDS_class_python-sugar ?= $(cdbs_python_builddeps_cdbs), cdbs (>= 0.4.67~)
+CDBS_BUILD_DEPENDS_class_python-sugar ?= $(cdbs_python_builddeps_cdbs)
 CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-sugar)
 
 # Python-related dependencies according to Python policy, appendix A
diff -Nru cdbs-0.4.115/1/class/scons-vars.mk.in cdbs-0.4.117/1/class/scons-vars.mk.in
--- cdbs-0.4.115/1/class/scons-vars.mk.in	2012-03-02 06:34:02.000000000 +0100
+++ cdbs-0.4.117/1/class/scons-vars.mk.in	2012-07-07 13:32:41.000000000 +0200
@@ -43,7 +43,4 @@
 
 #DEB_SCONS_CHECK_TARGET =
 
-CDBS_BUILD_DEPENDS_class_scons-vars ?= cdbs (>= 0.4.73~)
-CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_scons-vars)
-
 endif
diff -Nru cdbs-0.4.115/1/rules/buildcore.mk.in cdbs-0.4.117/1/rules/buildcore.mk.in
--- cdbs-0.4.115/1/rules/buildcore.mk.in	2012-03-08 03:21:21.000000000 +0100
+++ cdbs-0.4.117/1/rules/buildcore.mk.in	2012-07-07 13:48:34.000000000 +0200
@@ -211,10 +211,6 @@
 cdbs_pkgrel_varnames = $(patsubst %,CDBS_%,DEPENDS PREDEPENDS RECOMMENDS SUGGESTS BREAKS PROVIDES REPLACES CONFLICTS ENHANCES)
 cdbs_pkgrel_allvars = $(strip $(call cdbs_expand_allvars,$(cdbs_pkgrel_varnames)))
 
-# require recent cdbs if binary relations are actually used
-CDBS_BUILD_DEPENDS_rules_buildcore_pkgrel ?= cdbs (>= 0.4.72~)
-CDBS_BUILD_DEPENDS += $(if $(cdbs_pkgrel_allvars),$(comma) $(CDBS_BUILD_DEPENDS_rules_buildcore_pkgrel))
-
 
 ifneq (,$(wildcard debian/control.in))
 ifneq (, $(DEB_AUTO_UPDATE_DEBIAN_CONTROL))
@@ -237,19 +233,10 @@
 	@bdep='$(strip $(CDBS_BUILD_DEPENDS))' perl -n \
 		-e 'my $$bd = $$ENV{"bdep"};' \
 		-e '$$bd =~ $(cdbs_re_squash_extended_space);' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.106~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~|0\.4\.75~|0\.4\.78~|0\.4\.85~|0\.4\.90~|0\.4\.91~|0\.4\.93~|0\.4\.97~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.97~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~|0\.4\.75~|0\.4\.78~|0\.4\.85~|0\.4\.90~|0\.4\.91~|0\.4\.93~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.93~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~|0\.4\.75~|0\.4\.78~|0\.4\.85~|0\.4\.90~|0\.4\.91~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.91~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~|0\.4\.75~|0\.4\.78~|0\.4\.85~|0\.4\.90~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.90~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~|0\.4\.75~|0\.4\.78~|0\.4\.85~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.85~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~|0\.4\.75~|0\.4\.78~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.78~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~|0\.4\.75~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.75~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~|0\.4\.73~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.73~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~|0\.4\.72~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.72~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~|0\.4\.70~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.70~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~|0\.4\.69~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.69~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53|0\.4\.67~)\)/, /g;' \
-		-e '$$bd =~ /\bcdbs \(>= 0\.4\.67~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.53)\)/, /g;' \
+		-e '$$bd =~ /\bcdbs \(>= 0\.4\.106~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.90~|0\.4\.91~|0\.4\.93~|0\.4\.97~)\)/, /g;' \
+		-e '$$bd =~ /\bcdbs \(>= 0\.4\.97~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.90~|0\.4\.91~|0\.4\.93~)\)/, /g;' \
+		-e '$$bd =~ /\bcdbs \(>= 0\.4\.93~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.90~|0\.4\.91~)\)/, /g;' \
+		-e '$$bd =~ /\bcdbs \(>= 0\.4\.91~\)/ && $$bd =~ s/\bcdbs *\(>= (0\.4\.90~)\)/, /g;' \
 		-e '$$bd =~ $(cdbs_re_pkg_strip_unversioned_before_maybeversioned);' \
 		-e '$$bd =~ $(cdbs_re_pkg_strip_versioned_before_sameversioned);' \
 		-e '$$bd =~ $(cdbs_re_pkg_strip_unversioned_after_versioned);' \
diff -Nru cdbs-0.4.115/1/rules/debhelper.mk.in cdbs-0.4.117/1/rules/debhelper.mk.in
--- cdbs-0.4.115/1/rules/debhelper.mk.in	2011-09-12 09:51:13.000000000 +0200
+++ cdbs-0.4.117/1/rules/debhelper.mk.in	2012-07-07 14:32:43.000000000 +0200
@@ -87,16 +87,15 @@
 DH_COMPAT = 5
 endif
 
-# build-depend unversioned when satisfied even in oldstable
+# build-depend unversioned when satisfied in all supported distributions
 CDBS_BUILD_DEPENDS_rules_debhelper_v4 ?= debhelper
 CDBS_BUILD_DEPENDS_rules_debhelper_v5 ?= debhelper
 CDBS_BUILD_DEPENDS_rules_debhelper_v6 ?= debhelper
-
 CDBS_BUILD_DEPENDS_rules_debhelper_v7 ?= debhelper
+CDBS_BUILD_DEPENDS_rules_debhelper_v8 ?= debhelper
 
 # by default build-depend on version matching compat level
-# * recent cdbs needed for dh_prep fix
-CDBS_BUILD_DEPENDS_rules_debhelper_v$(DH_COMPAT) ?= cdbs (>= 0.4.85~), debhelper (>= $(DH_COMPAT)~)
+CDBS_BUILD_DEPENDS_rules_debhelper_v$(DH_COMPAT) ?= debhelper (>= $(DH_COMPAT)~)
 CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_rules_debhelper_v$(DH_COMPAT))
 
 CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo ?= dh-buildinfo
diff -Nru cdbs-0.4.115/1/rules/upstream-tarball.mk.in cdbs-0.4.117/1/rules/upstream-tarball.mk.in
--- cdbs-0.4.115/1/rules/upstream-tarball.mk.in	2012-04-23 08:46:54.000000000 +0200
+++ cdbs-0.4.117/1/rules/upstream-tarball.mk.in	2012-07-07 13:47:02.000000000 +0200
@@ -22,9 +22,6 @@
 
 include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
 
-CDBS_BUILD_DEPENDS_rules_upstream-tarball ?= cdbs (>= 0.4.70~)
-CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_rules_upstream-tarball)
-
 # Prefix for upstream location of all upstream tarballs (mandatory!)
 #DEB_UPSTREAM_URL = 
 
diff -Nru cdbs-0.4.115/1/rules/utils.mk.in cdbs-0.4.117/1/rules/utils.mk.in
--- cdbs-0.4.115/1/rules/utils.mk.in	2012-03-08 03:17:33.000000000 +0100
+++ cdbs-0.4.117/1/rules/utils.mk.in	2012-07-07 14:06:22.000000000 +0200
@@ -52,7 +52,7 @@
 
 DEB_PHONY_RULES += list-missing
 
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check ?= cdbs (>= 0.4.69~), devscripts
+CDBS_BUILD_DEPENDS_rules_utils_copyright-check ?= devscripts
 CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_rules_utils_copyright-check)
 
 CDBS_BUILD_DEPENDS_rules_utils_upstream_cruft ?= cdbs (>= 0.4.106~)
diff -Nru cdbs-0.4.115/debian/changelog cdbs-0.4.117/debian/changelog
--- cdbs-0.4.115/debian/changelog	2012-06-22 17:22:04.000000000 +0200
+++ cdbs-0.4.117/debian/changelog	2012-08-05 10:38:54.000000000 +0200
@@ -1,3 +1,21 @@
+cdbs (0.4.117) unstable; urgency=low
+
+  * Have gnome.mk use xz compression by default.
+    Closes: bug#683819. Thanks to Ansgar Burchardt.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 05 Aug 2012 10:38:47 +0200
+
+cdbs (0.4.116) unstable; urgency=low
+
+  * Simplify auto-resolved build-dependencies to be unversioned when
+    satisfied in stable (Wheezy): Oldstable (Lenny) is no longer
+    supported.  Versioning will now be dropped for cdbs << 0.4.89,
+    python << 2.6.6, perl << 5.10.1 and debhelper << 8.
+    Thanks to Paul Wise and Dominique Dumont.
+  * Bump debhelper compatibility level to 8.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 07 Jul 2012 14:45:56 +0200
+
 cdbs (0.4.115) unstable; urgency=high
 
   * Fix resolve default CXXFLAGS.
diff -Nru cdbs-0.4.115/debian/compat cdbs-0.4.117/debian/compat
--- cdbs-0.4.115/debian/compat	2011-09-16 21:42:56.000000000 +0200
+++ cdbs-0.4.117/debian/compat	2012-07-07 14:30:47.000000000 +0200
@@ -1 +1 @@
-7
+8
diff -Nru cdbs-0.4.115/debian/rules cdbs-0.4.117/debian/rules
--- cdbs-0.4.115/debian/rules	2012-04-14 19:39:15.000000000 +0200
+++ cdbs-0.4.117/debian/rules	2012-07-07 14:21:48.000000000 +0200
@@ -29,8 +29,6 @@
 
 # Suppress build-dependency on ourselves
 CDBS_BUILD_DEPENDS_rules_buildvars =
-CDBS_BUILD_DEPENDS_rules_buildcore_pkgrel =
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check = devscripts
 
 # We use autotools too modern for default CDBS
 DEB_CONFIGURE_LIBEXECDIR = /usr/lib

diff -Nru cdbs-0.4.116/1/class/gnome.mk.in cdbs-0.4.117/1/class/gnome.mk.in
--- cdbs-0.4.116/1/class/gnome.mk.in	2011-01-08 15:37:13.000000000 +0100
+++ cdbs-0.4.117/1/class/gnome.mk.in	2012-08-05 10:35:17.000000000 +0200
@@ -42,4 +42,7 @@
 	$(if $(wildcard /usr/bin/dh_gconf),dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS))
 	$(if $(wildcard /usr/bin/dh_icons),dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONS_ARGS))
 
+# Use xz compression.
+DEB_DH_BUILDDEB_ARGS ?= -u-Zxz
+
 endif
diff -Nru cdbs-0.4.116/debian/changelog cdbs-0.4.117/debian/changelog
--- cdbs-0.4.116/debian/changelog	2012-07-07 14:46:02.000000000 +0200
+++ cdbs-0.4.117/debian/changelog	2012-08-05 10:38:54.000000000 +0200
@@ -1,3 +1,10 @@
+cdbs (0.4.117) unstable; urgency=low
+
+  * Have gnome.mk use xz compression by default.
+    Closes: bug#683819. Thanks to Ansgar Burchardt.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 05 Aug 2012 10:38:47 +0200
+
 cdbs (0.4.116) unstable; urgency=low
 
   * Simplify auto-resolved build-dependencies to be unversioned when

--- End Message ---

--- Begin Message ---

To: Ansgar Burchardt <ansgar@debian.org>, <685287-done@bugs.debian.org>

Subject: Re: Bug#685287: tpu: cdbs/0.4.115+deb7u1

From: "Adam D. Barratt" <adam@adam-barratt.org.uk>

Date: Sun, 26 Aug 2012 09:54:05 +0100

Message-id: <901a6725631112f6380a75a4f535e8b9@mail.adsl.funky-badger.org>

In-reply-to: <[🔎] 87fw7ag4mk.fsf_-_@deep-thought.43-1.org>

References: <[🔎] 87ehn3f8wn.fsf@marvin.43-1.org> <[🔎] 20120822101751.GO5375@radis.cristau.org> <20120825100533.GB26587__11365.342725958$1345889359$gmane$org@mraw.org> <[🔎] 87fw7ag4mk.fsf_-_@deep-thought.43-1.org>
On 25.08.2012 20:20, Ansgar Burchardt wrote:
Control: retitle -1 tpu: cdbs/0.4.115+deb7u1

Cyril Brulebois <kibi@debian.org> writes:
Julien Cristau <jcristau@debian.org> (22/08/2012):
On Sun, Aug 19, 2012 at 12:55:36 +0200, Ansgar Burchardt wrote:
> I have attached both the current diff from unstable to testingand a> diff of only the changes in 0.4.117. If you prefer an upload totpu> instead of unblocking the version currently in unstable, thiswould
> be the changes I would ask Jonas to include.
>
I think the latter (just the xz change in tpu) would be best.
Yeah. Additionally, I'd feel better if that could be done before wespin
wheezy d-i beta 2 CDs, meaning: in less than a week. Any taker? :)
I just uploaded cdbs/0.4.115+deb7u1 to tpu.
Approve hint added; thanks.

Regards,

Adam
--- End Message ---

Reply to:

References:
- Bug#685287: unblock or tpu: cdbs/0.4.117
  - From: Ansgar Burchardt <ansgar@debian.org>

Prev by Date: Bug#685900: unblock: circos/0.61-3
Next by Date: Bug#685847: marked as done (freeze exception for psutils to fix RC bug)
Previous by thread: Processed: Re: Bug#685287: tpu: cdbs/0.4.115+deb7u1
Next by thread: Bug#682472: unblock: mandos/1.6.0-1
Index(es):
- Date
- Thread