remove l10n packages, add Depends: hildon-libs-l10n-3.0-engb | hildon-libs-l10n-3...

diff --git a/debian/changelog b/debian/changelog
index 390cda7..b8b7b01 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hildon-libs (0.9.35-3) unstable; urgency=low
+
+  * debian/control:
+  * debian/rules: remove l10n packages, add Depends:
+    hildon-libs-l10n-3.0-engb | hildon-libs-l10n-3.0-english
+
+ -- Tommi Komulainen <tommi.komulainen@nokia.com>  Wed, 17 Aug 2005 17:40:47 +0300
+
 hildon-libs (0.9.35-2) unstable; urgency=low
 
   * Maemo dev release

diff --git a/debian/control b/debian/control
index 179a1f0..77925a4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Description: Hildon libraries development files
 Package: hildon-libs0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hildon-lgpl0, hildon-fm1, osso-sounds-ui, libosso-gnomevfs2-0, osso-esd
+Depends: ${shlibs:Depends}, ${misc:Depends}, hildon-lgpl0, hildon-fm1, osso-sounds-ui, libosso-gnomevfs2-0, osso-esd, hildon-libs-l10n-3.0-engb | hildon-libs-l10n-3.0-english
 Description: Hildon libraries
 
 Package: hildon-libs0-dbg
@@ -23,13 +23,3 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, hildon-lgpl0-dbg, hildon-fm1-dbg, osso-sounds-ui, libosso-gnomevfs2-0, osso-esd
 Description: Hildon libraries (with debug info)
 
-Package: hildon-libs-l10n-engb
-Architecture: all
-Description: Locale for package hildon-libs
- en_GB locale for hildon-libs.
-
-Package: hildon-libs-l10n-src
-Architecture: all
-Depends: gettext
-Description: Locale source package for hildon-libs
- Source package for locales.

diff --git a/debian/rules b/debian/rules
index 9f4c0e5..9396b10 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,13 +80,6 @@ install: build
        -mkdir -p $(CURDIR)/debian/build/usr/lib/debug
        -cp -vd $(CURDIR)/debian/build/usr/lib/lib*.so* $(CURDIR)/debian/build/usr/lib/debug
 
-       # Install locale stuff
-       mkdir -p $(CURDIR)/debian/build/usr/share/osso/l10n/hildon-libs
-       cp po/*.po po/porules.mk $(CURDIR)/debian/build/usr/share/osso/l10n/hildon-libs/
-       cp -a po/debian $(CURDIR)/debian/build/usr/share/osso/l10n/hildon-libs/
-       cp debian/hildon-libs-l10n-engb.install $(CURDIR)/debian/build/usr/share/osso/l10n/hildon-libs/debian/
-       cp debian/copyright $(CURDIR)/debian/build/usr/share/osso/l10n/hildon-libs/debian/
-       sed -r -e "s/^([a-z0-9-]+) /\1-l10n-src /g" debian/changelog > $(CURDIR)/debian/build/usr/share/osso/l10n/hildon-libs/debian/changelog 
 
 # Build architecture-independent files here.
 binary-indep: build install