[Pkg-cups-devel] r581 - cupsys/trunk/debian

[Martin Pitt]

Author: mpitt
Date: Tue Aug 21 07:04:19 2007
New Revision: 581

Log:
* Install PO files again, but this time under /usr/share/cups/locale. cups
  has its own crazy PO file parser. This requires some hacks since
  --localedir configure option does not work (STR #2488).

Added:
   cupsys/trunk/debian/cupsys-common.install
      - copied, changed from r576, /cupsys/trunk/debian/cupsys-common.files
Removed:
   cupsys/trunk/debian/cupsys-common.files
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/rules

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Tue Aug 21 07:04:19 2007
@@ -1,3 +1,11 @@
+cupsys (1.3.0-4) UNRELEASED; urgency=low
+
+  * Install PO files again, but this time under /usr/share/cups/locale. cups
+    has its own crazy PO file parser. This requires some hacks since
+    --localedir configure option does not work (STR #2488).
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 21 Aug 2007 08:34:08 +0200
+
 cupsys (1.3.0-3) unstable; urgency=low
 
   [ Martin Pitt ]

Copied: cupsys/trunk/debian/cupsys-common.install (from r576, /cupsys/trunk/debian/cupsys-common.files)
==============================================================================
--- /cupsys/trunk/debian/cupsys-common.files	(original)
+++ cupsys/trunk/debian/cupsys-common.install	Tue Aug 21 07:04:19 2007
@@ -1,2 +1,3 @@
 usr/share/cups/charsets
 usr/share/cups/charmaps
+usr/share/locale usr/share/cups

Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules	(original)
+++ cupsys/trunk/debian/rules	Tue Aug 21 07:04:19 2007
@@ -18,7 +18,7 @@
 
 unpatch: deapply-dpatches
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --localedir=/usr/share/cups/locale --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin
 DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
 DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
 DEB_DH_STRIP_ARGS := --dbg-package=cupsys-dbg
@@ -30,6 +30,11 @@
 	rm -f man/client.conf.man packaging/cups.list
 	rm -f conf/mime.convs conf/snmp.conf init/org.cups.cups-lpd.plist
 
+common-configure-arch::
+	# configure's --localedir does not actually work, hack around
+	# it for now (http://www.cups.org/str.php?L2488)
+	sed -i '/CUPS_LOCALEDIR/ s_/usr/share/locale_/usr/share/cups/locale_' config.h
+
 common-install-prehook-impl::
 	(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
 $(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%: