[Pkg-cups-devel] r495 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches po

Mon Jul 16 12:55:03 UTC 2007

Author: mpitt
Date: Mon Jul 16 12:55:03 2007
New Revision: 495

Log:
merge from Debian trunk

Removed:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
   cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/po/da.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/es.po
   cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po
   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	Mon Jul 16 12:55:03 2007
@@ -1,3 +1,38 @@
+cupsys (1.2.12-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge to Debian's svn head to get upstream fixes.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 16 Jul 2007 14:52:55 +0200
+
+cupsys (1.2.12-2) UNRELEASED; urgency=low
+
+  [ Kenshi Muto ]
+  * Added scripting directory to /usr/share/doc/cupsys/examples.
+    This directory contains the binding code from Java, Perl, and PHP
+    to CUPS.
+    Although we Debian CUPS team cannot afford to maintain them,
+    some of you may want them.
+  * Added 'Recommends: cupsys' to cupsys-bsd. (closes: #426521)
+  * Changed cupsys-client from 'Recommends: cupsys-bsd' to 'Suggests:
+    cupsys-bsd.' because cupsys-bsd isn't so necessary for cupsys-client.
+
+  ** Well, is it time to separate cupsys and cupsys-bin? (#233339) **
+
+ -- Kenshi Muto <kmuto at debian.org>  Sun, 15 Jul 2007 23:39:33 +0900
+
+cupsys (1.2.12-1) unstable; urgency=low
+
+  * New upstream release
+  * removed unnecessary dependency against patch package (Closes: #431069)
+  * Debconf translation
+    - Danish (Closes: #426772)
+    - Vietnamese (Closes: #426822)
+    - Spanish (Closes: #430004)
+  * Disabled external_pam_helper due to #425944 and Ubuntu#112803.
+    (closes: #425944)
+
+ -- Kenshi Muto <kmuto at debian.org>  Sat, 14 Jul 2007 14:56:24 +0900
+
 cupsys (1.2.11-2ubuntu2) gutsy; urgency=low
 
   * debian/oopstops*, debian/rules: Added Helge Bliscke's

Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control	Mon Jul 16 12:55:03 2007
@@ -52,7 +52,7 @@
 Priority: optional
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), sysv-rc (>= 2.86.ds1-14.1ubuntu2)
+Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), sysv-rc (>= 2.86.ds1-14.1ubuntu2)
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters
@@ -75,8 +75,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, adduser, cupsys-common
 Conflicts: lprng
-Recommends: cupsys-bsd
-Suggests: cupsys, kdeprint, gtklp, cupsys-pt, xpp
+Suggests: cupsys, kdeprint, gtklp, cupsys-pt, xpp, cupsys-bsd
 Replaces: cupsys (<= 1.1.18-3)
 Description: Common UNIX Printing System(tm) - client programs (SysV)
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
@@ -137,6 +136,7 @@
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, cupsys-client (= ${Source-Version}), debconf, update-inetd, cupsys-common
+Recommends: cupsys
 Conflicts: lpr, lprng, manpages-fr (<< 0.9.5-1)
 Provides: lpr
 Replaces: lpr, cupsys (<= 1.1.15-2), manpages-fr (<< 0.9.5-1)

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples	Mon Jul 16 12:55:03 2007
@@ -1,2 +1,3 @@
 debian/filters/*
 debian/printer.schema
+scripting

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	Mon Jul 16 12:55:03 2007
@@ -17,7 +17,6 @@
 54_cups-config_modeldir.dpatch
 55_ppd_okidata_name.dpatch
 #56_dirsvc.dpatch
-57_cupsaddsmb.dpatch
 58_cupsd.conf-AllowLocal.dpatch
 60_device_uri.dpatch
 62_classes_crash.dpatch

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch	Mon Jul 16 12:55:03 2007
@@ -5,19 +5,21 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cups-1.2-ubuntu~/configure cups-1.2-ubuntu/configure
---- cups-1.2-ubuntu~/configure	2007-04-30 10:40:19.000000000 +0200
-+++ cups-1.2-ubuntu/configure	2007-04-30 10:40:55.000000000 +0200
-@@ -309,7 +309,7 @@
- #endif"
- 
- ac_default_prefix=/
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR RCLEVELS RCSTART RCSTOP XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR RCLEVELS RCSTART RCSTOP XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
+diff -urNad cupsys-1.2.12~/configure cupsys-1.2.12/configure
+--- cupsys-1.2.12~/configure	2007-07-14 15:39:04.616155164 +0900
++++ cupsys-1.2.12/configure	2007-07-14 15:42:12.968290213 +0900
+@@ -792,7 +792,9 @@
+ INSTALL_LANGUAGES
+ UNINSTALL_LANGUAGES
+ LIBOBJS
+-LTLIBOBJS'
++LTLIBOBJS
++CUPS_DROP_PRIVILEGES
++'
  ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -881,6 +881,7 @@
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1407,6 +1409,7 @@
                            enable ImplicitClasses by default, default=yes
    --enable-use-network-default
                            enable UseNetworkDefault by default, default=auto
@@ -25,10 +27,10 @@
    --enable-pdftops        build pdftops filter, default=auto
  
  Optional Packages:
-@@ -14055,6 +14056,26 @@
+@@ -14582,6 +14585,26 @@
+ #define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "$CUPS_BROWSE_REMOTE_PROTOCOLS"
  _ACEOF
  
- 
 +# Check whether --enable-privilege-dropping or --disable-privilege-dropping was given.
 +if test "${enable_privilege_dropping+set}" = set; then
 +  enableval="$enable_privilege_dropping"
@@ -50,13 +52,42 @@
 +
 +
  
- # Check whether --with-printcap or --without-printcap was given.
- if test "${with_printcap+set}" = set; then
-@@ -15355,6 +15376,7 @@
- s, at CUPS_GROUP@,$CUPS_GROUP,;t t
- s, at CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
- s, at CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t
-+s, at CUPS_DROP_PRIVILEGES@,$CUPS_DROP_PRIVILEGES,;t t
- s, at PAP@,$PAP,;t t
- s, at PDFTOPS@,$PDFTOPS,;t t
- s, at JAVA@,$JAVA,;t t
+ # Check whether --enable-browse_short was given.
+ if test "${enable_browse_short+set}" = set; then
+diff -urNad cupsys-1.2.12~/configure.rej cupsys-1.2.12/configure.rej
+--- cupsys-1.2.12~/configure.rej	1970-01-01 09:00:00.000000000 +0900
++++ cupsys-1.2.12/configure.rej	2007-07-14 15:39:04.776155278 +0900
+@@ -0,0 +1,33 @@
++***************
++*** 309,315 ****
++  #endif"
++  
++  ac_default_prefix=/
++- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR RCLEVELS RCSTART RCSTOP XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
++  ac_subst_files=''
++  
++  # Initialize some variables set by options.
++--- 309,315 ----
++  #endif"
++  
++  ac_default_prefix=/
+++ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR RCLEVELS RCSTART RCSTOP XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
++  ac_subst_files=''
++  
++  # Initialize some variables set by options.
++***************
++*** 15882,15887 ****
++  s, at CUPS_GROUP@,$CUPS_GROUP,;t t
++  s, at CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
++  s, at CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t
++  s, at PAP@,$PAP,;t t
++  s, at PDFTOPS@,$PDFTOPS,;t t
++  s, at JAVA@,$JAVA,;t t
++--- 15903,15909 ----
++  s, at CUPS_GROUP@,$CUPS_GROUP,;t t
++  s, at CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
++  s, at CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t
+++ s, at CUPS_DROP_PRIVILEGES@,$CUPS_DROP_PRIVILEGES,;t t
++  s, at PAP@,$PAP,;t t
++  s, at PDFTOPS@,$PDFTOPS,;t t
++  s, at JAVA@,$JAVA,;t t

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/10_external_pam_helper.dpatch	Mon Jul 16 12:55:03 2007
@@ -5,26 +5,26 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cups-1.2-ubuntu~/scheduler/Makefile cups-1.2-ubuntu/scheduler/Makefile
---- cups-1.2-ubuntu~/scheduler/Makefile	2006-07-13 21:59:36.000000000 +0200
-+++ cups-1.2-ubuntu/scheduler/Makefile	2006-07-26 17:50:33.000000000 +0200
+diff -urNad cupsys-1.2.12~/scheduler/Makefile cupsys-1.2.12/scheduler/Makefile
+--- cupsys-1.2.12~/scheduler/Makefile	2006-09-12 03:30:09.000000000 +0900
++++ cupsys-1.2.12/scheduler/Makefile	2007-07-14 18:21:16.403132897 +0900
 @@ -58,6 +58,7 @@
  		cups-driverd.o \
  		cups-lpd.o \
  		cups-polld.o \
 +		cups-check-pam-auth.o \
  		testdirsvc.o \
+ 		testlpd.o \
  		testmime.o \
- 		testspeed.o \
-@@ -68,6 +69,7 @@
+@@ -70,6 +71,7 @@
  		cups-driverd \
  		cups-lpd \
  		cups-polld \
 +		cups-check-pam-auth \
  		libmime.a \
  		testdirsvc \
- 		testmime \
-@@ -116,6 +118,7 @@
+ 		testlpd \
+@@ -120,6 +122,7 @@
  	$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
  	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
  	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
@@ -32,7 +32,7 @@
  	echo Creating $(SERVERBIN)/driver...
  	$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
  	echo Creating $(SERVERROOT)...
-@@ -161,6 +164,7 @@
+@@ -165,6 +168,7 @@
  	$(RM) $(SERVERBIN)/daemon/cups-driverd
  	$(RM) $(SERVERBIN)/daemon/cups-lpd
  	$(RM) $(SERVERBIN)/daemon/cups-polld
@@ -40,7 +40,7 @@
  	-$(RMDIR) $(STATEDIR)/certs
  	-$(RMDIR) $(STATEDIR)
  	-$(RMDIR) $(SERVERROOT)/ppd
-@@ -229,6 +233,13 @@
+@@ -233,6 +237,13 @@
  	echo Linking $@...
  	$(CC) $(LDFLAGS) -o cups-polld cups-polld.o $(LIBS)
  
@@ -54,9 +54,9 @@
  
  #
  # libmime.a
-diff -urNad cups-1.2-ubuntu~/scheduler/auth.c cups-1.2-ubuntu/scheduler/auth.c
---- cups-1.2-ubuntu~/scheduler/auth.c	2006-07-26 17:40:24.000000000 +0200
-+++ cups-1.2-ubuntu/scheduler/auth.c	2006-07-26 17:40:50.000000000 +0200
+diff -urNad cupsys-1.2.12~/scheduler/auth.c cupsys-1.2.12/scheduler/auth.c
+--- cupsys-1.2.12~/scheduler/auth.c	2006-09-12 22:58:39.000000000 +0900
++++ cupsys-1.2.12/scheduler/auth.c	2007-07-14 18:23:44.131238819 +0900
 @@ -300,6 +300,59 @@
    memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
  }
@@ -117,10 +117,11 @@
  
  /*
   * 'cupsdAuthorize()' - Validate any authorization credentials.
-@@ -467,6 +520,26 @@
+@@ -467,6 +520,28 @@
      {
        case AUTH_BASIC :
            {
++#if CUPS_DROP_PRIVILEGES == 1
 +	    /* first, try whether the external PAM helper works */
 +	    int pam_auth_result = cupsdCallPamAuthHelper(username, password);
 +	    cupsdLogMessage(CUPSD_LOG_DEBUG, 
@@ -140,13 +141,14 @@
 +		  "cupsdAuthorize: PAM authentication helper failed with code %i\n", 
 +		  pam_auth_result);
 +	    }
++#endif
 +
  #if HAVE_LIBPAM
  	   /*
  	    * Only use PAM to do authentication.  This supports MD5
-diff -urNad cups-1.2-ubuntu~/scheduler/cups-check-pam-auth.c cups-1.2-ubuntu/scheduler/cups-check-pam-auth.c
---- cups-1.2-ubuntu~/scheduler/cups-check-pam-auth.c	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.2-ubuntu/scheduler/cups-check-pam-auth.c	2006-07-26 17:41:35.000000000 +0200
+diff -urNad cupsys-1.2.12~/scheduler/cups-check-pam-auth.c cupsys-1.2.12/scheduler/cups-check-pam-auth.c
+--- cupsys-1.2.12~/scheduler/cups-check-pam-auth.c	1970-01-01 09:00:00.000000000 +0900
++++ cupsys-1.2.12/scheduler/cups-check-pam-auth.c	2007-07-14 18:21:16.403132897 +0900
 @@ -0,0 +1,148 @@
 +/* setgid shadow PAM authentication helper for cupsd
 + * 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/da.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/da.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/da.po	Mon Jul 16 12:55:03 2007
@@ -3,143 +3,139 @@
 # translation of Debian cupsys debconf to Danish
 #
 # Claus Hindsgaul <claus_h at image.dk>, 2004.
-# Claus Hindsgaul <claus.hindsgaul at gmail.com>, 2006.
+# Claus Hindsgaul <claus.hindsgaul at gmail.com>, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
-"PO-Revision-Date: 2006-06-07 18:05+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-05-25 04:32+0200\n"
+"PO-Revision-Date: 2007-03-27 20:59+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
-"Language-Team: Danish <dansk at klid.dk>\n"
+"Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Ønsker du at sætte BSD lpd-kompatibilitetsserveren op?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
-#, fuzzy
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
 "to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
 "these computers cannot be converted to use the IPP protocol that CUPS uses."
 msgstr ""
-"Denne pakke indeholder en server, der kan modtage print-jobs på BSD-form og "
-"sende dem videre til CUPS. Du behøver kun at sætte den op, hvis du har andre "
-"computere, der sender jobs over netværket via servicerne \"BSD\" eller \"LPR"
-"\", og disse computere ikke kan ændres til at benytte den IPP-protokol, som "
+"CUPS-pakken indeholder en server, der kan modtage print-jobs på BSD-form og "
+"sende dem videre til CUPS. Den bør kun sættes op, hvis det er muligt, at "
+"andre computere sender jobs over netværket via servicerne \"BSD\" eller \"LPR"
+"\", og disse computere ikke kan overgå til at benytte den IPP-protokol, som "
 "CUPS benytter."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "Ønsker du at CUPS skal udskrive ukendte jobs som rå jobs?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
-#, fuzzy
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
 msgstr ""
-"Alle print-jobs i IPP får en MIME-type. Da ikke alle printjob-kilder kan "
-"medsende den relevante type, vil mange jobs blive sendt med MIME-typen "
-"\"application/octet-stream\". Derfor vil CUPS forsøge at gætte formatet, når "
-"den modtager sådan et job. Som udgangspunkt vil den afvise jobbet, hvis den "
-"ikke kan gætte typen."
+"Internet Printing Protocol IPP kræver, at der angives MIME-type for alle "
+"printjobs. Da ikke alle printjob-kilder kan medsende den relevante type, vil "
+"mange jobs blive sendt med MIME-typen \"application/octet-stream\", og kunne "
+"blive afvist, såfremt CUPS ikke kan gætte jobbets format."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
-#, fuzzy
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
 msgstr ""
-"Du kan få CUPS til at behandle alle ikke-genkendte jobs med denne MIME-type "
-"som et \"råt\" job, som bliver sendt direkte til printeren uden yderligere "
-"behandling."
+"CUPS kan håndtere sådanne jobs som \"rå\" jobs, hvilket betyder, at de "
+"sendes direkte til printeren uden yderligere behandling."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
 msgstr ""
+"Det anbefales at vælge denne indstilling, hvis serveren kommer til at "
+"modtage printjobs fra Windows-computere eller Samba-servere."
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "parallel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "seriel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "sokkel"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Printer-kommunikationsveje:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-#, fuzzy
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
@@ -148,18 +144,17 @@
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-#, fuzzy
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
 msgstr ""
-"Desværre giver nogle af disse bagvedliggende programmer visse problemer (f."
-"eks. bryder kernen sammen på nogle PPC-maskiner med parallel-programmet)"
+"Desværre giver nogle af disse bagvedliggende programmer ofte visse problemer "
+"(f.eks. bryder kernen sammen på nogle PPC-maskiner med parallel-programmet)."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
@@ -167,79 +162,78 @@
 "Vælg det bagvedliggende program, CUPS skal bruge. Det forvalgte burde være "
 "passende under de mest almindelige forhold."
 
-#~ msgid ""
-#~ "If you will be accepting print jobs from Windows computers, you probably "
-#~ "want this option set, as Windows gives all IPP print jobs processed by a "
-#~ "local driver the MIME type application/octet-stream. Samba also submits "
-#~ "its print jobs this way."
-#~ msgstr ""
-#~ "Hvis du vil acceptere printjobs fra Windows-computere, bør du acceptere "
-#~ "denne funktion, da Windows giver alle IPP-printjobs, som håndteres af en "
-#~ "lokal driver MIME-typen \"application/octet-stream\". Samba sender sine "
-#~ "jobs på samme måde."
-
-#~ msgid "Port or/and host name where CUPS will listen to:"
-#~ msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
-
-#~ msgid ""
-#~ "Please specify the port or the host name CUPS daemon will listen to. The "
-#~ "following formats are allowed:"
-#~ msgstr ""
-#~ "Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater "
-#~ "er gyldige:"
-
-#~ msgid ""
-#~ " - Port number (631);\n"
-#~ " - Host name   (debian.example.com);\n"
-#~ " - Host:Port   (debian.example.com:631);\n"
-#~ " - File domain socket (/var/run/cups/cups.sock)."
-#~ msgstr ""
-#~ " - Portnummer  (631);\n"
-#~ " - værtsnavn   (debian.eksempel.dk);\n"
-#~ " - Vært:Port   (debian.eksempel.dk:631);\n"
-#~ " - Fildomænesokkel (/var/run/cups/cups.sock)."
-
-#~ msgid ""
-#~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr "Du kan kombinere disse i en liste adskilt med mellemrum."
-
-#~ msgid ""
-#~ "The default port 631 is reserved for the Internet Printing Protocol "
-#~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
-#~ "for security reasons."
-#~ msgstr ""
-#~ "Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
-#~ "\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et "
-#~ "selvstændigt miljø op."
-
-#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
-#~ msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
-
-#~ msgid ""
-#~ "CUPS daemon can broadcast printer information for clients on the network, "
-#~ "and detect printers on the network automatically."
-#~ msgstr ""
-#~ "CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket "
-#~ "og detektere printere på netværket automatisk."
-
-#~ msgid ""
-#~ "If you choose this option, the CUPS daemon will periodically send UDP "
-#~ "broadcasts to detect printers."
-#~ msgstr ""
-#~ "Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
-#~ "rundsendinger for at detektere printere."
-
-#~ msgid "Incorrect value entered"
-#~ msgstr "Ugyldig værdi indtastet"
-
-#~ msgid "an error occurred while parsing the port number or the host name."
-#~ msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Hvis du vil acceptere printjobs fra Windows-computere, bør du acceptere "
+"denne funktion, da Windows giver alle IPP-printjobs, som håndteres af en "
+"lokal driver MIME-typen \"application/octet-stream\". Samba sender sine jobs "
+"på samme måde."
+
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
+
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater er "
+"gyldige:"
+
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - Portnummer  (631);\n"
+" - værtsnavn   (debian.eksempel.dk);\n"
+" - Vært:Port   (debian.eksempel.dk:631);\n"
+" - Fildomænesokkel (/var/run/cups/cups.sock)."
+
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr "Du kan kombinere disse i en liste adskilt med mellemrum."
+
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
+"\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et selvstændigt "
+"miljø op."
+
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
+
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket og "
+"detektere printere på netværket automatisk."
+
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
+"rundsendinger for at detektere printere."
+
+msgid "Incorrect value entered"
+msgstr "Ugyldig værdi indtastet"
+
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
 
-#~ msgid "Please correct your input."
-#~ msgstr "Ret venligst din indtastning."
+msgid "Please correct your input."
+msgstr "Ret venligst din indtastning."
 
-#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-#~ msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
+msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
 
-#~ msgid "Select the backends you want."
-#~ msgstr "Vælg det bagvedliggende program, du ønsker."
+msgid "Select the backends you want."
+msgstr "Vælg det bagvedliggende program, du ønsker."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/es.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/es.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/es.po	Mon Jul 16 12:55:03 2007
@@ -1,10 +1,12 @@
 # cupsys debconf translation to spanish
-# Copyright (C) 2003, 2004, 2006 Software in the Public Interest
+# Copyright (C) 2003, 2004, 2006, 2007 Software in the Public Interest
 # This file is distributed under the same license as the cupsys package.
 #
 # Changes:
 # - Initial translation
 #        Carlos Valdivia Yagüe <valyag at dat.etsit.upm.es>, 2003, 2004, 2006
+# - Translation update
+#        Javier Fernandez-Sanguino <jfs at debian.org>, 2007
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -21,9 +23,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsys 1.2.2-1\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
-"PO-Revision-Date: 2006-08-15 01:10+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-09 04:30+0200\n"
+"PO-Revision-Date: 2007-06-21 18:51+0200\n"
 "Last-Translator: Carlos Valdivia Yagüe <valyag at dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish Team <debian-l10n-spanish at lists.debian."
 "org>\n"
@@ -33,145 +35,124 @@
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "¿Desea configurar el servidor de compatibilidad lpd de BSD?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys-bsd.templates:1001
-#, fuzzy
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
 "to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
 "these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"Este paquete incluye un servidor que acepta trabajos de impresión al estilo "
-"BSD y se los envía a CUPS. Configúrelo únicamente en el caso de que haya "
-"otras máquinas que envíen trabajos de impresión mediante la red, usando "
-"servicios \"BSD\" o \"LPR\" y no puedan usar el protocolo IPP que utiliza "
-"CUPS."
+msgstr "Este paquete incluye un servidor que acepta trabajos de impresión al estilo BSD y se los envía a CUPS. Configúrelo únicamente en el caso de que haya otras máquinas que envíen trabajos de impresión mediante la red, usando los servicios \"BSD\" o \"LPR\" y no se puede hacer que estos utilice el protocolo IPP que utiliza CUPS."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
 msgstr "¿Quiere que CUPS imprima en bruto los trabajos desconocidos?"
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
-#, fuzzy
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
-msgstr ""
-"En IPP todos los trabajos de impresión tienen un tipo MIME. Puesto que no "
-"todas las fuentes de trabajos de impresión asignan correctamente algún tipo "
-"MIME, muchos llegan con el tipo application/octet-stream. Por ello, cuando "
-"CUPS recibe un trabajo con ese tipo MIME, intenta adivinar su formato. De "
-"manera predeterminada, si no puede adivinar el tipo apropiado, lo rechaza."
+msgstr "En IPP todos los trabajos de impresión tienen un tipo MIME. Puesto que no todas las fuentes de trabajos de impresión asignan correctamente algún tipo MIME, muchos llegan con el tipo «application/octet-stream» y podrían rechazarse si CUPS no puede adivinar el formato del trabajo."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
-#, fuzzy
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
-msgstr ""
-"Es posible hacer que CUPS trate todos los trabajos no reconocidos, con este "
-"tipo MIME, como trabajos «en bruto», con lo que se mandan directamente a la "
-"impresora sin procesar."
+msgstr "Es posible hacer que CUPS trate todos estos trabajos como trabajos «en crudo», con lo que se mandan directamente a la impresora sin procesar."
 
 #. Type: boolean
 #. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
-msgstr ""
+msgstr "Se recomienda que escoga esta opción si el servidor va a aceptar trabajos de impresión de ordenadores con Windows o servidores Samba."
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "paralelo"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "serie"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "socket"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
 #. Type: multiselect
 #. Choices
-#: ../cupsys.templates:2001
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
 msgstr "Motores de comunicación con la impresora:"
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-#, fuzzy
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
-msgstr "CUPS utiliza diversos motores para comunicarse con la impresora."
+msgstr "CUPS utiliza diversos motores para comunicarse con el puerto o dispositivo de la impresora."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
-#, fuzzy
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
-msgstr ""
-"Desafortunadamente, ciertos motores pueden causar problemas. (Por ejemplo, "
-"con el motor del puerto paralelo se producen algunas caídas del núcleo en la "
-"arquitectura PPC."
+msgstr "Desafortunadamente, ciertos motores pueden causar problemas. Por ejemplo, con el motor del puerto paralelo se producen algunas caídas del núcleo en la arquitectura PPC."
 
 #. Type: multiselect
 #. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."

Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/vi.po	Mon Jul 16 12:55:03 2007
@@ -1,175 +1,152 @@
 # Vietnamese Translation for CupSys.
-# Copyright Â© 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie at riverland.net.au>, 2005.
+# Copyright Â© 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2007.
 # 
 msgid ""
-msgstr ""
-"Project-Id-Version: cupsys 1.1.24\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-03-27 22:18+0900\n"
-"PO-Revision-Date: 2005-12-19 17:24+1030\n"
+""
+msgstr "Project-Id-Version: cupsys_1.2.11-2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-05-25 04:32+0200\n"
+"PO-Revision-Date: 2007-05-31 15:31+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.5.1b\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
 
-#. Type: boolean
-#. Description
-#: ../cupsys-bsd.templates:1001
+#.Type: boolean
+#.Description
+#: ../cupsys-bsd.templates:2001
 msgid "Do you want to set up the BSD lpd compatibility server?"
 msgstr "Báº¡n cÃ³ muá»‘n thiáº¿t láºp trÃ¬nh phá»¥c vá»¥ tÆ°Æ¡ng thÃch vá»›i lpd BSD khÃ´ng?"
 
-#. Type: boolean
-#. Description
-#: ../cupsys-bsd.templates:1001
-#, fuzzy
+#.Type: boolean
+#.Description
+#: ../cupsys-bsd.templates:2001
 msgid ""
 "The CUPS package contains a server that can accept BSD-style print jobs and "
 "submit them to CUPS. It should only be set up if other computers are likely "
 "to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
 "these computers cannot be converted to use the IPP protocol that CUPS uses."
-msgstr ""
-"GÃ³i nÃ y chá»©a má»™t trÃ¬nh phá»¥c vá»¥ cÃ³ thá»ƒ cháº¥p nháºn viá»‡c in kiá»ƒu BSD vÃ  Ä‘á»‡ trÃ¬nh "
-"chÃºng vÃ o há»‡ thá»‘ng in CUPS. Chá»‰ nÃªn thiáº¿t láºp nÃ³ náº¿u báº¡n cÃ³ mÃ¡y tÃnh khÃ¡c Ä‘á»‡ "
-"trÃ¬nh viá»‡c in qua máº¡ng báº±ng dá»‹ch vá»¥ Â« BSD Â» hay Â« LPR Â», vÃ  khÃ´ng thá»ƒ chuyá»ƒn "
-"Ä‘á»•i mÃ¡y tÃnh Ä‘Ã³ Ä‘á»ƒ dÃ¹ng giao thá»©c IPP do CUPS dÃ¹ng."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:1001
+msgstr "GÃ³i CUPS chá»©a má»™t trÃ¬nh phá»¥c vá»¥ cÃ³ kháº£ nÄƒng cháº¥p nháºn viá»‡c in kiá»ƒu BSD, cÅ©ng Ä‘á»‡ trÃ¬nh nÃ³ vÃ o CUPS. Chá»‰ nÃªn Ä‘áº·t gÃ³i nÃ y náº¿u mÃ¡y khÃ¡c sáº½ Ä‘á»‡ trÃ¬nh viá»‡c in qua máº¡ng báº±ng dá»‹ch vá»¥ Â« BSD Â» hay Â« LPR Â», vÃ  mÃ¡y khÃ¡c nÃ y khÃ´ng thá»ƒ Ä‘Æ°á»£c chuyá»ƒn Ä‘á»•i Ä‘á»ƒ sá» dá»¥ng giao thá»©c IPP mÃ  CUPS dÃ¹ng."
+
+#.Type: boolean
+#.Description
+#: ../cupsys.templates:2001
 msgid "Do you want CUPS to print unknown jobs as raw jobs?"
-msgstr "Báº¡n cÃ³ muá»‘n CUPS in má»i viá»‡c in láº¡ nhÆ° lÃ  viá»‡c thÃ´ khÃ´ng?"
+msgstr "Báº¡n cÃ³ muá»‘n CUPS in viá»‡c in láº¡ nhÆ° lÃ  viá»‡c thÃ´ khÃ´ng?"
 
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:1001
-#, fuzzy
+#.Type: boolean
+#.Description
+#: ../cupsys.templates:2001
 msgid ""
 "The Internet Printing Protocol (IPP) enforces a MIME type for all print "
 "jobs. Since not all sources of print jobs can attach an appropriate type, "
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
-msgstr ""
-"Trong IPP, má»i viá»‡c in Ä‘Æ°á»£c má»™t kiá»ƒu MIME. VÃ¬ khÃ´ng pháº£i táº¥t cáº£ cÃ¡c nguá»“n "
-"viá»‡c in cÃ³ thá»ƒ Ä‘Ãnh kÃ¨m kiá»ƒu thÃch há»£p, nhiá»u viá»‡c in Ä‘Æ°á»£c Ä‘á»‡ trÃ¬nh vá»›i kiá»ƒu "
-"MIME Â« application/octet-stream Â» (á»©ng dá»¥ng/dÃ²ng dáº¡ng bá»™ tÃ¡m Ä‘iá»u). Do Ä‘Ã³, "
-"khi CUPS nháºn má»™t viá»‡c in cÃ³ kiá»ƒu MIME Ä‘Ã³, nÃ³ cá»‘ Ä‘oÃ¡n dang thá»©c nÃ³. Máº·c Ä‘á»‹nh "
-"lÃ  náº¿u nÃ³ khÃ´ng thá»ƒ Ä‘oÃ¡n kiá»ƒu Ä‘Ãºng nÃªn tá»« chá»‘i viá»‡c in."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:1001
-#, fuzzy
+msgstr "Giao thá»©c In Máº¡ng (Internet Printing Protocol: IPP) Ã©p buá»™c kiá»ƒu MIME cho má»i viá»‡c in. VÃ¬ khÃ´ng pháº£i táº¥t cáº£ cÃ¡c nguá»“n viá»‡c in cÃ³ kháº£ nÄƒng Ä‘Ãnh kÃ¨m kiá»ƒu thÃch há»£p, nhiá»u viá»‡c Ä‘Æ°á»£c Ä‘á»‡ trÃ¬nh nhÆ° kiá»ƒu MIME Â« application/octet-stream Â» vÃ  cÃ³ thá»ƒ bá»‹ tá»« chá»‘i náº¿u CUPS khÃ´ng thá»ƒ Ä‘oÃ¡n Ä‘Æ°á»£c Ä‘á»‹nh dáº¡ng cá»§a viá»‡c in Ä‘Ã³."
+
+#.Type: boolean
+#.Description
+#: ../cupsys.templates:2001
 msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
-msgstr ""
-"CÃ³ thá»ƒ Ä‘áº·t CUPS phÃ¢n loáº¡i má»i viá»‡c in chÆ°a nháºn ra vÃ  cÃ³ kiá»ƒu MIME nÃ y nhÆ° "
-"lÃ  viá»‡c in Â« thÃ´ Â». NhÆ° tháº¿ thÃ¬, CUPS sáº½ gá»Ÿi chÃºng tháº³ng vÃ o mÃ¡y in, khÃ´ng "
-"xá» lÃ½ gÃ¬ trÆ°á»›c."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:1001
+msgstr "CUPS cÃ³ kháº£ nÄƒng quáº£n lÃ½ cÃ¡c viá»‡c nhÆ° váºy nhÆ° lÃ  viá»‡c Â« thÃ´ Â», mÃ  gÃ¢y ra chÃºng Ä‘Æ°á»£c gá»i trá»±c tiáº¿p cho mÃ¡y in, khÃ´ng xá» lÃ½ gÃ¬."
+
+#.Type: boolean
+#.Description
+#: ../cupsys.templates:2001
 msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
-msgstr ""
+msgstr "KhuyÃªn báº¡n báºt tÃ¹y chá»n nÃ y náº¿u trÃ¬nh phá»¥c vá»¥ sáº½ cháº¥p nháºn viá»‡c in tá»« mÃ¡y Windows hay trÃ¬nh phá»¥c vá»¥ Samba."
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "ipp"
 msgstr "ipp"
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "lpd"
 msgstr "lpd"
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "parallel"
 msgstr "song song"
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "scsi"
 msgstr "scsi"
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "serial"
 msgstr "ná»‘i tiáº¿p"
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "socket"
 msgstr "á»• cáº¯m"
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "usb"
 msgstr "usb"
 
-#. Type: multiselect
-#. Choices
-#: ../cupsys.templates:2001
+#.Type: multiselect
+#.Choices
+#: ../cupsys.templates:3001
 msgid "snmp"
 msgstr "snmp"
 
-#. Type: multiselect
-#. Description
-#: ../cupsys.templates:2002
+#.Type: multiselect
+#.Description
+#: ../cupsys.templates:3002
 msgid "Printer communication backends:"
-msgstr "CÃ¡c háºu phÆ°Æ¡ng liÃªn láº¡c vá»›i mÃ¡y in:"
+msgstr "Háºu phÆ°Æ¡ng liÃªn láº¡c vá»›i mÃ¡y in:"
 
-#. Type: multiselect
-#. Description
-#: ../cupsys.templates:2002
-#, fuzzy
+#.Type: multiselect
+#.Description
+#: ../cupsys.templates:3002
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
-msgstr ""
-"Pháº§n má»m CUPS dÃ¹ng trÃ¬nh háºu phÆ°Æ¡ng Ä‘á»ƒ truyá»n thÃ´ng vá»›i thiáº¿t bá»‹ in hay cá»•ng."
+msgstr "Pháº§n má»m CUPS dÃ¹ng má»™t sá»‘ chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng Ä‘á»ƒ liÃªn láº¡c vá»›i thiáº¿t bá»‹/cá»•ng mÃ¡y in."
 
-#. Type: multiselect
-#. Description
-#: ../cupsys.templates:2002
-#, fuzzy
+#.Type: multiselect
+#.Description
+#: ../cupsys.templates:3002
 msgid ""
 "Unfortunately, some backend programs are likely to cause some trouble. For "
 "example, some PPC kernels crash with the parallel backend."
-msgstr ""
-"Ráº¥t tiáº¿c lÃ  má»™t sá»‘ chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng cÃ³ gÃ¢y ra lá»—i. (Láº¥y thÃ dá»¥, háºu "
-"phÆ°Æ¡ng song song gÃ¢y ra má»™t sá»‘ háº¡t nhÃ¢n PPC bá»‹ há»ng.)"
-
-#. Type: multiselect
-#. Description
-#: ../cupsys.templates:2002
+msgstr "Ráº¥t tiáº¿c lÃ  má»™t sá»‘ chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng cÃ³ thá»ƒ gÃ¢y ra lá»—i. Cháº³ng háº¡n, má»™t sá»‘ háº¡t nhÃ¢n PPC sáº½ sá»¥p Ä‘á»• khi cháº¡y cÃ¹ng vá»›i háºu phÆ°Æ¡ng song song."
+
+#.Type: multiselect
+#.Description
+#: ../cupsys.templates:3002
 msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
-msgstr ""
-"HÃ£y chá»n chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng mÃ  pháº§n má»m CUPS sáº½ dÃ¹ng. TÃ¹y chá»n máº·c Ä‘á»‹nh "
-"nÃªn khá»›p vá»›i cÃ¡c mÃ´i trÆ°á»ng thÆ°á»ng dÃ¹ng."
+msgstr "HÃ£y chá»n chÆ°Æ¡ng trÃ¬nh háºu phÆ°Æ¡ng CUPS cáº§n dÃ¹ng. Sá»± chá»n máº·c Ä‘á»‹nh nÃªn thÃch há»£p vá»›i pháº§n lá»›n mÃ´i trÆ°á»ng thÆ°á»ng dÃ¹ng."
 
 #~ msgid ""
 #~ "If you will be accepting print jobs from Windows computers, you probably "
 #~ "want this option set, as Windows gives all IPP print jobs processed by a "
 #~ "local driver the MIME type application/octet-stream. Samba also submits "
 #~ "its print jobs this way."
-#~ msgstr ""
-#~ "Náº¿u báº¡n sáº½ cáº§n pháº£i nháºn viá»‡c in tá»« mÃ¡y tÃnh cháº¡y há»‡ Ä‘iá»u hÃ nh Windows "
+#~ msgstr "Náº¿u báº¡n sáº½ cáº§n pháº£i nháºn viá»‡c in tá»« mÃ¡y tÃnh cháº¡y há»‡ Ä‘iá»u hÃ nh Windows "
 #~ "thÃ¬ ráº¥t cÃ³ thá»ƒ lÃ  báº¡n muá»‘n láºp tÃ¹y chá»n nÃ y, vÃ¬ pháº§n má»m Windows gÃ¡n má»i "
 #~ "viá»‡c in IPP Ä‘Æ°á»£c xá» lÃ½ bá»Ÿi trÃ¬nh Ä‘iá»u khiá»ƒn Ä‘á»‹a phÆ°Æ¡ng, kiá»ƒu MIME Â« "
 #~ "application/octet-stream Â». Pháº§n má»m Samba cÅ©ng Ä‘á»‡ trÃ¬nh cÃ¡c viá»‡c in báº±ng "
@@ -181,33 +158,29 @@
 #~ msgid ""
 #~ "Please specify the port or the host name CUPS daemon will listen to. The "
 #~ "following formats are allowed:"
-#~ msgstr ""
-#~ "HÃ£y gÃµ cá»•ng hay tÃªn mÃ¡y trÃªn mÃ  trÃ¬nh ná»n CUPS sáº½ láº¯ng nghe. Cho phÃ©p "
+#~ msgstr "HÃ£y gÃµ cá»•ng hay tÃªn mÃ¡y trÃªn mÃ  trÃ¬nh ná»n CUPS sáº½ láº¯ng nghe. Cho phÃ©p "
 #~ "nhá»¯ng khuÃ´n dáº¡ng theo Ä‘Ã¢y:"
 
-#, fuzzy
 #~ msgid ""
 #~ " - Port number (631);\n"
 #~ " - Host name   (debian.example.com);\n"
 #~ " - Host:Port   (debian.example.com:631);\n"
 #~ " - File domain socket (/var/run/cups/cups.sock)."
-#~ msgstr ""
-#~ " â€¢ sá»• cá»•ng (v.d. 631)\n"
-#~ " â€¢ tÃªn mÃ¡y (v.d. vi_du.vnoss.org)\n"
-#~ " â€¢ mÃ¡y:cá»•ng (v.d. vi_du.vnoss.org:631)"
+#~ msgstr " â€¢ sá»• cá»•ng (v.d. 631)\n"
+#~ " â€¢ tÃªn mÃ¡y (v.d. vÃ_dá»¥.vnoss.org)\n"
+#~ " â€¢ mÃ¡y:cá»•ng (v.d. vÃ_dá»¥.vnoss.org:631)"
+#~ " â€¢ á»• cáº¯m miá»n táºp tin (v.d. /var/run/cups/cups.sock)"
 
 #~ msgid ""
 #~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr ""
-#~ "Báº¡n cÃ³ thá»ƒ káº¿t há»£p vÃ i khuÃ´n dáº¡ng phÃ¢n cÃ¡ch bá»Ÿi khoáº£ng tráº¯ng trong danh "
+#~ msgstr "Báº¡n cÃ³ thá»ƒ káº¿t há»£p vÃ i khuÃ´n dáº¡ng phÃ¢n cÃ¡ch bá»Ÿi khoáº£ng tráº¯ng trong danh "
 #~ "sÃ¡ch."
 
 #~ msgid ""
 #~ "The default port 631 is reserved for the Internet Printing Protocol "
 #~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
 #~ "for security reasons."
-#~ msgstr ""
-#~ "Cá»•ng máº·c Ä‘á»‹nh 631 dÃ nh cho Giao thá»©c In Máº¡ng (Internet Printing Protocol: "
+#~ msgstr "Cá»•ng máº·c Ä‘á»‹nh 631 dÃ nh cho Giao thá»©c In Máº¡ng (Internet Printing Protocol: "
 #~ "IPP). KhuyÃªn báº¡n dÃ¹ng Â« localhost:631 Â» Ä‘á»ƒ thiáº¿t láºp mÃ´i trÆ°á»ng Ä‘á»™c láºp "
 #~ "vÃ¬ lÃ½ do báº£o máºt. "
 
@@ -217,15 +190,13 @@
 #~ msgid ""
 #~ "CUPS daemon can broadcast printer information for clients on the network, "
 #~ "and detect printers on the network automatically."
-#~ msgstr ""
-#~ "TrÃ¬nh ná»n CUPS cÃ³ thá»ƒ phÃ¡t thanh thÃ´ng tin vá» mÃ¡y in cho trÃ¬nh khÃ¡ch trÃªn "
+#~ msgstr "TrÃ¬nh ná»n CUPS cÃ³ thá»ƒ phÃ¡t thanh thÃ´ng tin vá» mÃ¡y in cho trÃ¬nh khÃ¡ch trÃªn "
 #~ "máº¡ng nghe, vÃ  tá»± Ä‘á»™ng phÃ¡t hiá»‡n mÃ¡y in nÃ o trÃªn máº¡ng."
 
 #~ msgid ""
 #~ "If you choose this option, the CUPS daemon will periodically send UDP "
 #~ "broadcasts to detect printers."
-#~ msgstr ""
-#~ "Náº¿u báº¡n láºp tÃ¹y chá»n nÃ y, trÃ¬nh ná»n CUPS sáº½ gá»Ÿi Ä‘á»‹nh ká»³ viá»‡c phÃ¡t thanh "
+#~ msgstr "Náº¿u báº¡n láºp tÃ¹y chá»n nÃ y, trÃ¬nh ná»n CUPS sáº½ gá»Ÿi Ä‘á»‹nh ká»³ viá»‡c phÃ¡t thanh "
 #~ "UDP Ä‘á»ƒ phÃ¡t hiá»‡n mÃ¡y in."
 
 #~ msgid "Incorrect value entered"

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	Mon Jul 16 12:55:03 2007
@@ -23,6 +23,7 @@
 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
 
 clean::
 	rm -f man/client.conf.man packaging/cups.list

