[Pkg-cups-devel] r589 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/patches
Martin Pitt
mpitt at alioth.debian.org
Tue Sep 11 21:18:19 UTC 2007
Author: mpitt
Date: Tue Sep 11 21:18:19 2007
New Revision: 589
Log:
merge from trunk
Added:
cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.install
cupsys/branches/cups-1.2-ubuntu/debian/patches/str2488-fix-localedir.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/str2505_localize.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch (contents, props changed)
Modified:
cupsys/branches/cups-1.2-ubuntu/ (props changed)
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/rules
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Tue Sep 11 21:18:19 2007
@@ -1,3 +1,27 @@
+cupsys (1.3.0-4ubuntu1) UNRELEASED; urgency=low
+
+ * Merge bugfixes from Debian.
+
+ -- Martin Pitt <mpitt at debian.org> Tue, 11 Sep 2007 23:16:54 +0200
+
+cupsys (1.3.0-4) unstable; urgency=low
+
+ * Install PO files again, but this time under /usr/share/cups/locale. cups
+ 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)
+ * debian/rules: Add --enable-gssapi to ensure that the package is built with
+ Kerberos support.
+ * debian/rules: Use -Wl,--as-needed linker flag. This drops a few
+ unnecessary dependencies and should make checklib much happier.
+ * Add debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch: Do not kill
+ edit-config.tmpl on distclean. Forwarded upstream as STR#2508.
+ (Closes: #441697)
+ * Add debian/patches/str2505_localize.dpatch: Fix localization of web
+ interface (STR#2505, Closes: #440256)
+
+ -- Martin Pitt <mpitt at debian.org> Tue, 11 Sep 2007 22:43:06 +0200
+
cupsys (1.3.0-3ubuntu1) gutsy; urgency=low
* Merge bugfixes from Debian.
Added: cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.install
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.install Tue Sep 11 21:18:19 2007
@@ -0,0 +1,3 @@
+usr/share/cups/charsets
+usr/share/cups/charmaps
+usr/share/cups/locale
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Tue Sep 11 21:18:19 2007
@@ -1,3 +1,6 @@
+str2488-fix-localedir.dpatch
+str2505_localize.dpatch
+str2508-dont_kill_edit-config.tmpl.dpatch
freebsd.dpatch
removecvstag.dpatch
pam.dpatch
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/str2488-fix-localedir.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/str2488-fix-localedir.dpatch Tue Sep 11 21:18:19 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"
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/str2505_localize.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/str2505_localize.dpatch Tue Sep 11 21:18:19 2007
@@ -0,0 +1,129 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## str2505_localize.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~/cups/localize.c trunk/cups/localize.c
+--- trunk~/cups/localize.c 2007-07-17 01:11:59.000000000 +0200
++++ trunk/cups/localize.c 2007-09-11 22:42:28.000000000 +0200
+@@ -44,7 +44,8 @@
+ * Local functions...
+ */
+
+-static void ppd_ll_CC(char *ll_CC, char *ll);
++static void ppd_ll_CC(char *ll_CC, int ll_CC_size,
++ char *ll, int ll_size);
+ static ppd_attr_t *ppd_localized_attr(ppd_file_t *ppd,
+ const char *keyword,
+ const char *spec, const char *ll_CC,
+@@ -90,7 +91,7 @@
+ * Get the default language...
+ */
+
+- ppd_ll_CC(ll_CC, ll);
++ ppd_ll_CC(ll_CC, sizeof(ll_CC), ll, sizeof(ll));
+
+ /*
+ * Now lookup all of the groups, options, choices, etc.
+@@ -240,7 +241,7 @@
+ * Get the default language...
+ */
+
+- ppd_ll_CC(ll_CC, ll);
++ ppd_ll_CC(ll_CC, sizeof(ll_CC), ll, sizeof(ll));
+
+ /*
+ * Find the localized attribute...
+@@ -391,8 +392,9 @@
+
+ static void
+ ppd_ll_CC(char *ll_CC, /* O - Country-specific locale name */
+- char *ll) /* O - Generic locale name */
+-
++ int ll_CC_size, /* I - Size of country-specific name */
++ char *ll, /* O - Generic locale name */
++ int ll_size) /* I - Size of generic name */
+ {
+ cups_lang_t *lang; /* Current language */
+
+@@ -403,8 +405,8 @@
+
+ if ((lang = cupsLangDefault()) == NULL)
+ {
+- strcpy(ll_CC, "en_US");
+- strcpy(ll, "en");
++ strlcpy(ll_CC, "en_US", ll_CC_size);
++ strlcpy(ll, "en", ll_size);
+ return;
+ }
+
+@@ -412,8 +414,10 @@
+ * Copy the locale name...
+ */
+
+- strlcpy(ll_CC, lang->language, sizeof(ll_CC));
+- strlcpy(ll, lang->language, sizeof(ll));
++ strlcpy(ll_CC, lang->language, ll_CC_size);
++ strlcpy(ll, lang->language, ll_size);
++
++ DEBUG_printf(("ll_CC=\"%s\", ll=\"%s\"\n", ll_CC, ll));
+
+ if (strlen(ll_CC) == 2)
+ {
+@@ -423,16 +427,16 @@
+ */
+
+ if (!strcmp(ll_CC, "cs"))
+- strcpy(ll_CC, "cs_CZ");
++ strlcpy(ll_CC, "cs_CZ", ll_CC_size);
+ else if (!strcmp(ll_CC, "en"))
+- strcpy(ll_CC, "en_US");
++ strlcpy(ll_CC, "en_US", ll_CC_size);
+ else if (!strcmp(ll_CC, "ja"))
+- strcpy(ll_CC, "ja_JP");
++ strlcpy(ll_CC, "ja_JP", ll_CC_size);
+ else if (!strcmp(ll_CC, "sv"))
+- strcpy(ll_CC, "sv_SE");
+- else if (!strcmp(ll_CC, "zh"))
+- strcpy(ll_CC, "zh_CN"); /* Simplified Chinese */
+- else
++ strlcpy(ll_CC, "sv_SE", ll_CC_size);
++ else if (!strcmp(ll_CC, "zh")) /* Simplified Chinese */
++ strlcpy(ll_CC, "zh_CN", ll_CC_size);
++ else if (ll_CC_size >= 6)
+ {
+ ll_CC[2] = '_';
+ ll_CC[3] = toupper(ll_CC[0] & 255);
+@@ -475,8 +479,10 @@
+ snprintf(lkeyword, sizeof(lkeyword), "%s.%s", ll, keyword);
+ attr = ppdFindAttr(ppd, lkeyword, spec);
+
+- if (!attr && !strcmp(ll, "ja"))
++ if (!attr)
+ {
++ if (!strcmp(ll, "ja"))
++ {
+ /*
+ * Due to a bug in the CUPS DDK 1.1.0 ppdmerge program, Japanese
+ * PPD files were incorrectly assigned "jp" as the locale name
+@@ -487,6 +493,18 @@
+ snprintf(lkeyword, sizeof(lkeyword), "jp.%s", keyword);
+ attr = ppdFindAttr(ppd, lkeyword, spec);
+ }
++ else if (!strcmp(ll, "no"))
++ {
++ /*
++ * Norway has two languages, "Bokmal" (the primary one)
++ * and "Nynorsk" (new Norwegian); we map "no" to "nb" here as
++ * recommended by the locale folks...
++ */
++
++ snprintf(lkeyword, sizeof(lkeyword), "nb.%s", keyword);
++ attr = ppdFindAttr(ppd, lkeyword, spec);
++ }
++ }
+ }
+
+ #ifdef DEBUG
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch Tue Sep 11 21:18:19 2007
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## str2508-dont_kill_edit-config.tmpl.dpatch by <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debian #441697, STR #2508
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile 2007-07-11 23:46:42.000000000 +0200
++++ trunk/Makefile 2007-09-11 22:22:39.000000000 +0200
+@@ -63,9 +63,8 @@
+ $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
+ $(RM) man/cupsd.conf.man man/lpoptions.man
+ $(RM) packaging/cups.list
+- $(RM) templates/edit-config.tmpl templates/header.tmpl
++ $(RM) templates/header.tmpl
+ -$(RM) doc/*/index.html
+- -$(RM) templates/*/edit-config.tmpl
+ -$(RM) templates/*/header.tmpl
+ -$(RM) -r autom4te*.cache
+
Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules Tue Sep 11 21:18:19 2007
@@ -18,13 +18,14 @@
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 --enable-gssapi --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_INSTALLINIT_ARGS := -u'multiuser 19'
DEB_DH_FIXPERMS_ARGS := -Xusr/lib/cups/backend-available
DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/cupsys/examples/scripting
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+LDFLAGS := -Wl,--as-needed
clean::
rm -f man/client.conf.man packaging/cups.list
More information about the Pkg-cups-devel
mailing list