[Pkg-cups-devel] r582 - in cupsys/trunk/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Thu Aug 23 06:49:27 2007
New Revision: 582

Log:
* Add debian/patches/str2488-fix-localedir.dpatch: Make the --localedir
  configure option actually work (taken from upstream SVN, STR#2488)
* Remove the hacks from the previous commit.



Added:
   cupsys/trunk/debian/patches/str2488-fix-localedir.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/cupsys-common.install
   cupsys/trunk/debian/patches/00list
   cupsys/trunk/debian/rules

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Thu Aug 23 06:49:27 2007
@@ -1,10 +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).
+    has its own crazy PO file parser.
+  * Add debian/patches/str2488-fix-localedir.dpatch: Make the --localedir
+    configure option actually work (taken from upstream SVN, STR#2488)
 
- -- Martin Pitt <mpitt at debian.org>  Tue, 21 Aug 2007 08:34:08 +0200
+ -- Martin Pitt <mpitt at debian.org>  Thu, 23 Aug 2007 08:37:54 +0200
 
 cupsys (1.3.0-3) unstable; urgency=low
 

Modified: cupsys/trunk/debian/cupsys-common.install
==============================================================================
--- cupsys/trunk/debian/cupsys-common.install	(original)
+++ cupsys/trunk/debian/cupsys-common.install	Thu Aug 23 06:49:27 2007
@@ -1,3 +1,3 @@
 usr/share/cups/charsets
 usr/share/cups/charmaps
-usr/share/locale usr/share/cups
+usr/share/cups/locale

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Thu Aug 23 06:49:27 2007
@@ -1,3 +1,4 @@
+str2488-fix-localedir.dpatch
 freebsd.dpatch
 removecvstag.dpatch
 pam.dpatch

Added: cupsys/trunk/debian/patches/str2488-fix-localedir.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/str2488-fix-localedir.dpatch	Thu Aug 23 06:49:27 2007
@@ -0,0 +1,86 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## str2488-fix-localedir.dpatch by  <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/config-scripts/cups-directories.m4 trunk/config-scripts/cups-directories.m4
+--- trunk~/config-scripts/cups-directories.m4	2007-08-23 08:33:42.000000000 +0200
++++ trunk/config-scripts/cups-directories.m4	2007-08-23 08:36:08.000000000 +0200
+@@ -292,20 +292,24 @@
+ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
+ 
+ # Locale data
+-case "$uname" in
+-	Linux | GNU | *BSD* | Darwin*)
+-		CUPS_LOCALEDIR="$datadir/locale"
+-		;;
++if test "$localedir" = "\${datarootdir}/locale"; then
++	case "$uname" in
++		Linux | GNU | *BSD* | Darwin*)
++			CUPS_LOCALEDIR="$datarootdir/locale"
++			;;
+ 
+-	OSF1* | AIX*)
+-		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
+-		;;
++		OSF1* | AIX*)
++			CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
++			;;
+ 
+-	*)
+-		# This is the standard System V location...
+-		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
+-		;;
+-esac
++		*)
++			# This is the standard System V location...
++			CUPS_LOCALEDIR="$exec_prefix/lib/locale"
++			;;
++	esac
++else
++	CUPS_LOCALEDIR="$localedir"
++fi
+ 
+ AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
+ AC_SUBST(CUPS_LOCALEDIR)
+--- trunk~/configure	2007-08-23 08:40:47.000000000 +0200
++++ trunk/configure	2007-08-23 08:42:37.000000000 +0200
+@@ -9380,20 +9380,24 @@
+ 
+ 
+ # Locale data
+-case "$uname" in
+-	Linux | GNU | *BSD* | Darwin*)
+-		CUPS_LOCALEDIR="$datadir/locale"
+-		;;
++if test "$localedir" = "\${datarootdir}/locale"; then
++	case "$uname" in
++		Linux | GNU | *BSD* | Darwin*)
++			CUPS_LOCALEDIR="$datarootdir/locale"
++			;;
+ 
+-	OSF1* | AIX*)
+-		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
+-		;;
++		OSF1* | AIX*)
++			CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
++			;;
+ 
+-	*)
+-		# This is the standard System V location...
+-		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
+-		;;
+-esac
++		*)
++			# This is the standard System V location...
++			CUPS_LOCALEDIR="$exec_prefix/lib/locale"
++			;;
++	esac
++else
++	CUPS_LOCALEDIR="$localedir"
++fi
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define CUPS_LOCALEDIR "$CUPS_LOCALEDIR"

Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules	(original)
+++ cupsys/trunk/debian/rules	Thu Aug 23 06:49:27 2007
@@ -30,11 +30,6 @@
 	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/%: