revert libapt-common addition because of http://lists.debian.org/debian-devel/2011...

diff --git a/debian/control b/debian/control
index 24c429ad42918964b0359ce3509db28c1b2393d0..03d74c51f3dbbff69fb52f4f88cc64a862d466a2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -35,20 +35,11 @@ Description: APT's commandline package manager
   * apt-config as an interface to the configuration settings
   * apt-key as an interface to manage authentication keys
 
   * apt-config as an interface to the configuration settings
   * apt-key as an interface to manage authentication keys
 

-Package: libapt-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9)
-Replaces: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9)
-Description: Common files for APT libraries
- This package includes translation files common to APT library packages.
-

 Package: libapt-pkg4.12
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Package: libapt-pkg4.12
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}

-Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common
+Depends: ${shlibs:Depends}, ${misc:Depends}

 Description: APT's package managment runtime library
  This library provides the common functionality for searching and
  managing packages as well as information about packages.
 Description: APT's package managment runtime library
  This library provides the common functionality for searching and
  managing packages as well as information about packages.


@@ -69,7 +60,7 @@ Package: libapt-inst1.4
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}

-Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common
+Depends: ${shlibs:Depends}, ${misc:Depends}

 Description: APT's deb package format runtime library
  This library provides methods to query and extract information 
  from deb packages. This includes the control data and the package
 Description: APT's deb package format runtime library
  This library provides methods to query and extract information 
  from deb packages. This includes the control data and the package

diff --git a/debian/libapt-inst1.4.install.in b/debian/libapt-inst1.4.install.in
index b81d15c10370f3a83fd8ec6ef4c5bedc44099feb..8bcce2c28981aa830552b2974b7b6de51a010851 100644 (file)
--- a/debian/libapt-inst1.4.install.in
+++ b/debian/libapt-inst1.4.install.in
@@ -1 +1,2 @@
 bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/
 bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/

+usr/share/locale/*/*/libapt-inst*.mo

diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.12.install.in
index 0db4075fa3bfb82ea004b1243a4fad3b8b2ce4c5..56bed39d30669fa408b687b00fbbec7582e2ad24 100644 (file)
--- a/debian/libapt-pkg4.12.install.in
+++ b/debian/libapt-pkg4.12.install.in
@@ -1 +1,2 @@
 bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/
 bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/

+usr/share/locale/*/*/libapt-pkg*.mo

diff --git a/debian/rules b/debian/rules
index 6a5c95d22c7c4286bb526d778f04dd8d7a09a185..4ef5bb47aa4f85f5250d94e2dfa0215b975aa075 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -125,25 +125,8 @@ clean:
 debian/%.install: debian/%.install.in
        sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
 
 debian/%.install: debian/%.install.in
        sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
 

-binary-indep: libapt-common apt-doc libapt-pkg-doc
+binary-indep: apt-doc libapt-pkg-doc

 # Build architecture-independent files here.
 # Build architecture-independent files here.

-libapt-common: build
-       dh_testdir -p$@
-       dh_testroot -p$@
-       dh_prep -p$@
-       dh_installdirs -p$@
-
-       dh_install -p$@ --sourcedir=$(BLD)
-       dh_installdocs -p$@
-       dh_installchangelogs -p$@
-       dh_strip -p$@
-       dh_compress -p$@
-       dh_fixperms -p$@
-       dh_installdeb -p$@
-       dh_gencontrol -p$@
-       dh_md5sums -p$@
-       dh_builddeb -p$@
-

 libapt-pkg-doc: build-doc
        dh_testdir -p$@
        dh_testroot -p$@
 libapt-pkg-doc: build-doc
        dh_testdir -p$@
        dh_testroot -p$@