[Pkg-zsh-commits] [zsh] 01/01: No more pass -Zxz to dpkg-deb explicitly

[Axel Beckert]

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

abe pushed a commit to branch debian
in repository zsh.

commit f0ab89ab1651cc61b23ea5ea5f5fbd6a68daf6b2
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Aug 25 15:36:00 2013 +0200

    No more pass -Zxz to dpkg-deb explicitly
    
    dpkg-deb uses xz as compressor by default since 1.17.0 so still having
    them explicitly for some, but not all to be built binary packages is
    probably more confusing than we will gain when doing backports.
    
    This also allows to remove the Pre-Depends on dpkg >= 1.15.6~.
    Complexity reduction for the win!
---
 debian/control |    4 ----
 debian/rules   |    6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index c0e5dd3..5d10cd2 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/zsh.git
 Package: zsh
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, zsh-common (= ${source:Version})
-Pre-Depends: dpkg (>= 1.15.6~)
 Recommends: ${shlibs:Recommends}
 Suggests: zsh-doc
 Description: shell with lots of features
@@ -45,7 +44,6 @@ Description: shell with lots of features
 Package: zsh-common
 Architecture: all
 Depends: ${misc:Depends}
-Pre-Depends: dpkg (>= 1.15.6~)
 Replaces: zsh (<= 5.0.2-1)
 Breaks: zsh (<= 5.0.2-1)
 Recommends: zsh
@@ -66,7 +64,6 @@ Package: zsh-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}, zsh-common (= ${source:Version})
-Pre-Depends: dpkg (>= 1.15.6~)
 Description: zsh documentation - info/HTML format
  Zsh is a UNIX command interpreter (shell) usable as an
  interactive login shell and as a shell script command
@@ -115,7 +112,6 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: zsh (= ${binary:Version}), ${misc:Depends}, zsh-common (= ${source:Version})
-Pre-Depends: dpkg (>= 1.15.6~)
 Description: shell with lots of features (debugging symbols)
  Zsh is a UNIX command interpreter (shell) usable as an
  interactive login shell and as a shell script command
diff --git a/debian/rules b/debian/rules
index 3fc3b09..7c10b18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,7 +112,7 @@ binary-indep: build-indep
 	dh_md5sums           -pzsh-doc -pzsh-beta -pzsh-beta-doc
 	dh_gencontrol        -pzsh-doc -pzsh-beta -pzsh-beta-doc
 	dh_builddeb                    -pzsh-beta -pzsh-beta-doc
-	dh_builddeb          -pzsh-doc -- -Zxz
+	dh_builddeb          -pzsh-doc
 
 binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
 binary-arch-dynamic: build-arch
@@ -180,7 +180,7 @@ binary-arch-dynamic: build-arch
 	dh_installdeb        -pzsh -pzsh-common -pzsh-dbg
 	dh_md5sums           -pzsh -pzsh-common -pzsh-dbg
 	dh_gencontrol        -pzsh -pzsh-common -pzsh-dbg
-	dh_builddeb          -pzsh -pzsh-common           -- -Zxz
+	dh_builddeb          -pzsh -pzsh-common
 	dh_builddeb                             -pzsh-dbg
 
 binary-arch-static: build-static
@@ -207,7 +207,7 @@ binary-arch-static: build-static
 	dh_installdeb        -pzsh-static
 	dh_md5sums           -pzsh-static
 	dh_gencontrol        -pzsh-static -- -VBuilt-Using="$(BUILT_USING)"
-	dh_builddeb          -pzsh-static -- -Zxz
+	dh_builddeb          -pzsh-static
 
 binary-arch-dev: build-arch
 	dh_testdir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git