Explorar el Código

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

Michael Vogt hace 14 años
padre
commit
386566e36b
Se han modificado 4 ficheros con 5 adiciones y 29 borrados
  1. 2 11
      debian/control
  2. 1 0
      debian/libapt-inst1.4.install.in
  3. 1 0
      debian/libapt-pkg4.12.install.in
  4. 1 18
      debian/rules

+ 2 - 11
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
 
-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.
@@ -69,7 +60,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

+ 1 - 0
debian/libapt-inst1.4.install.in

@@ -1 +1,2 @@
 bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/
+usr/share/locale/*/*/libapt-inst*.mo

+ 1 - 0
debian/libapt-pkg4.12.install.in

@@ -1 +1,2 @@
 bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/
+usr/share/locale/*/*/libapt-pkg*.mo

+ 1 - 18
debian/rules

@@ -125,25 +125,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$@