Move Dpkg.pm and Dpkg/Gettext.pm from dpkg to libdpkg-perl

debian/changelog

@@ -66,6 +66,7 @@ dpkg (1.15.8) UNRELEASED; urgency=low
     using a list of negated architectures.
   * Use Breaks instead of Conflicts in dpkg, dpkg-dev and libdpkg-perl binary
     packages.
+  * Move Dpkg.pm and Dpkg/Gettext.pm from dpkg to libdpkg-perl.
 
   [ Updated programs translations ]
   * Catalan (Guillem Jover).

debian/control

@@ -32,7 +32,8 @@ Architecture: any
 Essential: yes
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils
 Depends: ${misc:Depends}
-Breaks: dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1),
+Breaks: dpkg-dev (<< 1.14.16), libdpkg-perl (<< 1.15.8),
+ apt (<< 0.7.7), aptitude (<< 0.4.7-1),
 # install-info transition
 # see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
  jed (<< 1:0.99.18+dfsg.1-13), xjed (<< 1:0.99.18+dfsg.1-13),
@@ -71,7 +72,7 @@ Depends: dpkg (>= 1.15.4), perl, libtimedate-perl, ${misc:Depends}
 Recommends: bzip2, xz-utils
 Suggests: debian-keyring, gnupg, gpgv, binutils, patch
 Breaks: dpkg-dev (<< 1.15.6)
-Replaces: dpkg-dev (<< 1.15.6)
+Replaces: dpkg (<< 1.15.8), dpkg-dev (<< 1.15.6)
 Description: Dpkg perl modules
  This package provides the perl modules used by the scripts
  in dpkg-dev. They cover a wide range of functionalities. Among them

debian/dpkg.install

@@ -26,8 +26,6 @@ usr/share/man/{*/*,*}/dpkg.cfg.5
 usr/share/man/{*/*,*}/dpkg.1
 usr/share/man/{*/*,*}/start-stop-daemon.8
 usr/share/man/{*/*,*}/update-alternatives.8
-usr/share/perl5/Dpkg.pm
-usr/share/perl5/Dpkg/Gettext.pm
 var/lib/dpkg/alternatives
 var/lib/dpkg/info
 var/lib/dpkg/parts

debian/libdpkg-perl.install

@@ -1,4 +1,4 @@
 usr/lib/dpkg/parsechangelog
 usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo
 usr/share/man/man3/Dpkg*.3
-usr/share/perl5/Dpkg
+usr/share/perl5/Dpkg*

debian/rules

@@ -108,7 +108,7 @@ binary-arch: install
 binary-indep: install
 	dh_testdir -i
 	dh_testroot -i
-	dh_install --sourcedir=debian/tmp -i -XDpkg/Gettext.pm
+	dh_install --sourcedir=debian/tmp -i
 	dh_installcron -i
 	dh_installchangelogs -i ChangeLog*
 	dh_installdocs -i

scripts/Dpkg.pm

@@ -18,12 +18,6 @@ use warnings;
 
 our $VERSION = "1.00";
 
-# This module is the only one provided by dpkg and not dpkg-dev
-#
-# Don't add things here if you don't need them in dpkg itself.
-# If you do, and also use the new stuff in dpkg-dev, you'll have to bump
-# the dependency of dpkg-dev on dpkg.
-
 use base qw(Exporter);
 our @EXPORT = qw($version $progname $admindir $dpkglibdir $pkgdatadir);