Browse Source

merged lp:~mvo/apt/add-library-pkgs

Michael Vogt 15 years ago
parent
commit
6ab671833a
5 changed files with 11 additions and 5 deletions
  1. 1 1
      debian/apt.install
  2. 1 1
      debian/control
  3. 2 1
      debian/libapt-inst1.2.install
  4. 2 1
      debian/libapt-pkg4.10.install
  5. 5 1
      debian/rules

+ 1 - 1
debian/apt.install

@@ -1,4 +1,4 @@
 bin/apt-* usr/bin/
 bin/methods/* usr/lib/apt/methods/
 scripts/dselect/* usr/lib/dpkg/methods/apt/
-locale usr/share/
+usr/share/locale/*/*/apt.mo

+ 1 - 1
debian/control

@@ -52,7 +52,7 @@ Description: Documentation for APT
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional
-Depends: libapt-pkg4.10 (= ${binary:Version}), libapt-inst1.2 (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
+Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
 Section: libdevel
 Description: Development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for

+ 2 - 1
debian/libapt-inst1.2.install

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

+ 2 - 1
debian/libapt-pkg4.10.install

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

+ 5 - 1
debian/rules

@@ -97,6 +97,10 @@ build/configure-stamp: configure
 build/build-stamp: build/configure-stamp
 	# Add here commands to compile the package.
 	$(MAKE) binary
+	# compat symlink for the locale split
+	mkdir -p build/usr/share 
+	cd build/usr/share && ln -f -s ../../locale .
+	# done here
 	touch $@
 
 build/build-doc-stamp: build/configure-stamp
@@ -226,7 +230,7 @@ libapt-pkg-dev: build
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@
+	dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST)
 	dh_md5sums -p$@
 	dh_builddeb -p$@