summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2011-06-10 15:29:17 +0200
committerMichael Vogt <mvo@debian.org>2011-06-10 15:29:17 +0200
commit6ab671833ad9ef912018c4dda8afe26433783c44 (patch)
tree666f0007a864c18e8f50401416ad76fd33d65d3f
parent68c872643f0b0470debca17b703b7bb6db47dd9f (diff)
parentceab242d7547968fa358b5c549207be209c381ef (diff)
merged lp:~mvo/apt/add-library-pkgs
-rw-r--r--debian/apt.install2
-rw-r--r--debian/control2
-rw-r--r--debian/libapt-inst1.2.install3
-rw-r--r--debian/libapt-pkg4.10.install3
-rwxr-xr-xdebian/rules6
5 files changed, 11 insertions, 5 deletions
diff --git a/debian/apt.install b/debian/apt.install
index ba57f7efa..9d4008fab 100644
--- a/debian/apt.install
+++ b/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
diff --git a/debian/control b/debian/control
index 9aefcde8d..cf7be1ee5 100644
--- a/debian/control
+++ b/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
diff --git a/debian/libapt-inst1.2.install b/debian/libapt-inst1.2.install
index 575199b53..b7b63be81 100644
--- a/debian/libapt-inst1.2.install
+++ b/debian/libapt-inst1.2.install
@@ -1 +1,2 @@
-bin/libapt-inst*.so.* usr/lib/ \ No newline at end of file
+bin/libapt-inst*.so.* usr/lib/
+usr/share/locale/*/*/libapt-inst*.mo
diff --git a/debian/libapt-pkg4.10.install b/debian/libapt-pkg4.10.install
index 571dc8478..91b39a31b 100644
--- a/debian/libapt-pkg4.10.install
+++ b/debian/libapt-pkg4.10.install
@@ -1 +1,2 @@
-bin/libapt-pkg*.so.* usr/lib/ \ No newline at end of file
+bin/libapt-pkg*.so.* usr/lib/
+usr/share/locale/*/*/libapt-pkg*.mo
diff --git a/debian/rules b/debian/rules
index fd894b73b..b6f45a38e 100755
--- a/debian/rules
+++ b/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$@