From 53ec04bb0fd4c086e54e2a6779fa88ee53139628 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 22 Mar 2012 00:51:44 +0100
Subject: * debian/apt-utils.install:   - ship the ftparchive,
 apt-extractemplates and apt-sortpkgs locales     in the apt-utils package
 instead of the apt package

---
 cmdline/makefile         | 33 +++++++++++++++++++--------------
 debian/apt-utils.install |  2 +-
 debian/changelog         |  6 ++++--
 ftparchive/makefile      |  1 +
 methods/makefile         |  2 +-
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/cmdline/makefile b/cmdline/makefile
index 07e9eb8ca..f3712232a 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -33,20 +33,6 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 
-# The apt-sortpkgs program
-PROGRAM=apt-sortpkgs
-SLIBS = -lapt-pkg $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-sortpkgs.cc
-include $(PROGRAM_H)
-
-# The apt-extracttemplates program
-PROGRAM=apt-extracttemplates
-SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-extracttemplates.cc 
-include $(PROGRAM_H)
-
 # The apt-key program
 SOURCE=apt-key
 TO=$(BIN)
@@ -66,6 +52,25 @@ include $(PROGRAM_H)
 #TARGET=program
 #include $(COPY_H)
 
+#
+# the following programs are shipped in apt-utils
+#
+APT_DOMAIN:=apt-utils
+
+# The apt-sortpkgs program
+PROGRAM=apt-sortpkgs
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-sortpkgs.cc
+include $(PROGRAM_H)
+
+# The apt-extracttemplates program
+PROGRAM=apt-extracttemplates
+SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-extracttemplates.cc 
+include $(PROGRAM_H)
+
 # The internal solver acting as an external
 PROGRAM=apt-internal-solver
 SLIBS = -lapt-pkg $(INTLLIBS)
diff --git a/debian/apt-utils.install b/debian/apt-utils.install
index 8b1378917..cdbcb2f37 100644
--- a/debian/apt-utils.install
+++ b/debian/apt-utils.install
@@ -1 +1 @@
-
+usr/share/locale/*/*/apt-utils.mo
diff --git a/debian/changelog b/debian/changelog
index ca622a78c..cb82f715c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ apt (0.8.16~exp14) UNRELEASED; urgency=low
     (Closes: #659333, LP: #924628)
   * debian/libapt-pkg4.12:
     - update symbols file
+  * debian/apt-utils.install:
+    - ship the ftparchive, apt-extractemplates and apt-sortpkgs locales
+      in the apt-utils package instead of the apt package
   * apt-pkg/packagemanager.cc:
     - recheck all dependencies if we changed a package in SmartConfigure
       as this could break an earlier dependency (LP: #940396)
@@ -39,8 +42,7 @@ apt (0.8.16~exp14) UNRELEASED; urgency=low
     - do not link rred against libz anymore as FileFd handles all
       this transparently now
 
-
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 21 Mar 2012 18:50:23 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 22 Mar 2012 00:50:03 +0100
 
 apt (0.8.16~exp13) experimental; urgency=low
 
diff --git a/ftparchive/makefile b/ftparchive/makefile
index 504ebf893..362c29198 100644
--- a/ftparchive/makefile
+++ b/ftparchive/makefile
@@ -7,6 +7,7 @@ include ../buildlib/defaults.mak
 
 # The apt-ftparchive program
 ifdef BDBLIB
+APT_DOMAIN:=apt-utils
 PROGRAM=apt-ftparchive
 SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile apt-inst/makefile
diff --git a/methods/makefile b/methods/makefile
index 6f904d071..6fe95f29a 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 include ../buildlib/libversion.mak
-APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR)
+APT_DOMAIN := apt
 
 # The file method
 PROGRAM=file
-- 
cgit v1.2.3