[Reproducible-commits] [dpkg] 01/03: Only build the dpkg-dev and libdpkg-perl packages

[Holger Levsen]

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

holger pushed a commit to annotated tag 1.16.1.1_bpo60+2
in repository dpkg.

commit 2706341a508369a087caef02b96dec2c22061bc4
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Nov 23 13:57:47 2011 +0100

    Only build the dpkg-dev and libdpkg-perl packages
    
    The backports team made it clear that they do not want a backports
    of dpkg/dselect as it's too risky. But they understand the need of
    a newer dpkg-dev to facilitate other backports.
    
    See thread at http://lists.debian.org/debian-backports/2011/11/msg00030.html
    
    Thus drop dpkg/dselect/libdpkg-dev from debian/control and remove
    code from debian/rules which touch files installed in the dpkg package.
---
 debian/changelog |  7 +++++++
 debian/control   | 43 -------------------------------------------
 debian/rules     | 26 +-------------------------
 3 files changed, 8 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2272fc5..1e4c307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dpkg (1.16.1.1~bpo60+2) UNRELEASED; urgency=low
+
+  * Only build dpkg-dev and libdpkg-perl as discussed with the backports
+    team: http://lists.debian.org/debian-backports/2011/11/msg00030.html
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Wed, 23 Nov 2011 13:48:47 +0100
+
 dpkg (1.16.1.1~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.
diff --git a/debian/control b/debian/control
index 5c49402..6b9c96c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,35 +16,6 @@ Build-Depends: debhelper (>= 7), pkg-config, flex,
  libncursesw5-dev,
  libtimedate-perl, libio-string-perl
 
-Package: libdpkg-dev
-Section: libdevel
-Priority: optional
-Architecture: any
-Depends: ${misc:Depends}
-Description: Debian package management static library
- This package provides the header files and static library necessary to
- develop software using libdpkg, the same library used internally by dpkg.
- .
- Note though, that the API is to be considered volatile, and might change
- at any time, use at your own risk.
-
-Package: dpkg
-Architecture: any
-Essential: yes
-Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils
-Depends: ${misc:Depends}
-Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8),
- apt (<< 0.7.7), aptitude (<< 0.4.7-1),
-# install-info transition
-# see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
- tkinfo (<< 2.8-3.1), pinfo (<< 0.6.9-3.1)
-Suggests: apt
-Description: Debian package management system
- This package provides the low-level infrastructure for handling the
- installation and removal of Debian software packages.
- .
- For Debian package development tools, install dpkg-dev.
-
 Package: dpkg-dev
 Section: utils
 Priority: optional
@@ -94,17 +65,3 @@ Description: Dpkg perl modules
  .
  All the packages listed in Suggests or Recommends are used by some of the
  modules.
-
-Package: dselect
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, dpkg (>= 1.13.1), ${misc:Depends}
-Suggests: perl
-Conflicts: dpkg-ftp, dpkg-multicd
-Replaces: dpkg-ftp, dpkg-multicd
-Description: Debian package management front-end
- dselect is a high-level interface for managing the installation and
- removal of Debian software packages.
- .
- Many users find dselect intimidating and new users may prefer to use
- apt-based user interfaces.
diff --git a/debian/rules b/debian/rules
index 8d56d25..8be1e01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,30 +79,6 @@ ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	        $(CURDIR)/debian/tmp/usr/share/dpkg/cputable
 endif
 
-# Put together the dpkg and dselect packages
-binary-arch: install
-	dh_testdir -a
-	dh_testroot -a
-	dh_install --sourcedir=debian/tmp -a
-	dh_installcron -a
-	dh_installlogrotate -a
-
-	install -d debian/dpkg/sbin
-	mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
-
-	dh_installchangelogs -a ChangeLog*
-	dh_installdocs -a
-	dh_link -a
-	dh_lintian -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
 # Put together the dpkg-dev package
 binary-indep: install
 	dh_testdir -i
@@ -121,7 +97,7 @@ binary-indep: install
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary: binary-arch binary-indep
+binary: binary-indep
 
 
 # Clean up the mess we made

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git