merged from debian-experimental2

4 files changed, 5 insertions, 29 deletions

diff --git a/debian/control b/debian/control
index 28d9dd839..d7e295243 100644
--- a/debian/control
+++ b/debian/control
@@ -37,20 +37,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
 
-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}
-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.
@@ -71,7 +62,7 @@ Package: libapt-inst1.4
 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
diff --git a/debian/libapt-inst1.4.install.in b/debian/libapt-inst1.4.install.in
index b81d15c10..8bcce2c28 100644
--- 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@/
+usr/share/locale/*/*/libapt-inst*.mo
diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.12.install.in
index 0db4075fa..56bed39d3 100644
--- 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@/
+usr/share/locale/*/*/libapt-pkg*.mo
diff --git a/debian/rules b/debian/rules
index ce9c7e6cc..234114d5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,25 +128,8 @@ clean:
 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.
-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$@