[Pkg-cups-devel] r261 - in cupsys/branches/cups-1.2-ubuntu/debian:
. filters patches
Martin Pitt
mpitt at costa.debian.org
Thu Jun 15 18:41:20 UTC 2006
Author: mpitt
Date: Thu Jun 15 18:41:19 2006
New Revision: 261
Added:
cupsys/branches/cups-1.2-ubuntu/debian/filters/dvipipetops.INSTALL
- copied unchanged from r260, /cupsys/branches/cups-1.2/debian/filters/dvipipetops.INSTALL
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_r5643.dpatch
- copied unchanged from r260, /cupsys/branches/cups-1.2/debian/patches/00_r5643.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/56_dirsvc.dpatch
- copied unchanged from r260, /cupsys/branches/cups-1.2/debian/patches/56_dirsvc.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/po/it.po
- copied unchanged from r260, /cupsys/branches/cups-1.2/debian/po/it.po
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/NEWS
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/control
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
cupsys/branches/cups-1.2-ubuntu/debian/docs
cupsys/branches/cups-1.2-ubuntu/debian/libcupsimage2.shlibs
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/po/da.po
cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po
cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po
cupsys/branches/cups-1.2-ubuntu/debian/rules
Log:
merge Debian changes
Modified: cupsys/branches/cups-1.2-ubuntu/debian/NEWS
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/NEWS (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/NEWS Thu Jun 15 18:41:19 2006
@@ -1,11 +1,23 @@
-cupsys (1.1.99.rc2-0exp1) experimental; urgency=low
+cupsys (1.2.1-1) unstable; urgency=low
- * This is EXPERIMENTAL version.
- - By ABI incompatibility, KDE control center will complain.
- * 'enable' and 'disable' commands are removed.
- Use 'cupsenable' and 'cupsdisable' instead of them.
- * /etc/cups/client.conf has been removed upstream. Now it becomes
- obsolete.
+ * New upstream release 1.2.1.
+ This is major version up of CUPS and has several changes from
+ 1.1 series.
+ Although CUPS 1.2 provides a backward compatibility, your
+ old configuration won't work in some cases.
+ * 'enable' / 'disable' commands are removed. Use 'cupsenable' /
+ 'cupsdisable'.
+ * Port/Listen and Browsing parameters have been split off of
+ /etc/cups/cupsd.conf into separate files. You can modify
+ /etc/cups/cups.d/ports.conf and
+ /etc/cups/cups.d/browsing.conf by runing
+ 'dpkg-reconfigure cupsys' or by hand.
+ If you'd like to use these features, then replace the lines
+ 'Port/Listen' inside /etc/cups/cupsd.conf with
+ 'Include /etc/cups/cups.d/ports.conf' and 'Browsing' with
+ 'Include /etc/cups/cups.d/browse.conf'.
+ (These settings are being moved automatically from the old
+ /etc/cups/cupsd.conf config file to the new files
+ /etc/cups/cups.d/ports.conf and /etc/cups/cups.d/browse.conf)
-
- -- Kenshi Muto <kmuto at debian.org> Sun, 16 Apr 2006 17:39:36 +0900
+ -- Kenshi Muto <kmuto at debian.org> Sun, 4 Jun 2006 07:43:22 +0000
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 Thu Jun 15 18:41:19 2006
@@ -1,8 +1,53 @@
-cupsys (1.2.0-0ubuntu6) dapper; urgency=low
+cupsys (1.2.1-2ubuntu1) UNRELEASED-edgy; urgency=low
- *
+ * Merge to current SVN head of Debian.
+ * Removed debian/patches/svn*.dpatch, these were backported from 1.2.1 in
+ 1.2.0-0ubuntu3.
- -- Martin Pitt <martin.pitt at ubuntu.com> Wed, 17 May 2006 13:27:25 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com> Thu, 15 Jun 2006 20:11:02 +0200
+
+cupsys (1.2.1-3) UNRELEASED-unstable; urgency=low
+
+ [Kenshi Muto]
+ * Apply upstream svn change r5643.
+ * Remove unnecessary %s from dirsvc.c and will solve a mysterious
+ cupsd crash. Thanks Neil. (closes: #372696)
+ * Improve the wording of NEWS file, thanks Tomas (closes: #372256)
+ * Update debconf translations:
+ - Danish (closes: #371170)
+ - French (closes: #372714)
+ - Italian (closes: #372198)
+
+ -- Kenshi Muto <kmuto at debian.org> Sun, 11 Jun 2006 11:51:01 +0000
+
+cupsys (1.2.1-2) unstable; urgency=low
+
+ [Kenshi Muto]
+ * Provides /etc/cups/ssl directory for SSL. (closes: #370407, #370450)
+ * Add an newline after 'Starting ...' message by appending log_end_msg
+ to /etc/init.d/cupsys. (closes: #370460)
+
+ -- Kenshi Muto <kmuto at debian.org> Mon, 5 Jun 2006 22:44:55 +0900
+
+cupsys (1.2.1-1) unstable; urgency=low
+
+ [Kenshi Muto]
+ * New upstream release 1.2.1 for Debian unstable/testing.
+ * 00_r5610: Apply patches from upstream r5610.
+ * Re-update Dutch debconf translation (closes: #369004)
+ * Pump up shlibs to >=1.2.1 for compatibility safe.
+
+ -- Kenshi Muto <kmuto at debian.org> Wed, 31 May 2006 13:17:16 +0000
+
+cupsys (1.2.1-0exp1) experimental; urgency=low
+
+ [Kenshi Muto]
+ * New upstream release 1.2.1.
+ * Update Dutch debconf translation (closes: #369004)
+ * Update Italian debconf translation (closes: #367943)
+ * Includes the installation guide of dvi filter to /usr/share/doc/
+ cupsys/examples/filters/dvipipetops.INSTALL is contributed by
+ Francesco Potort. This is partial fix for Bug#368450.
cupsys (1.2.0-0ubuntu5) dapper; urgency=low
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 Thu Jun 15 18:41:19 2006
@@ -2,10 +2,49 @@
Priority: optional
Section: net
Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>> 4.1.0), po-debconf, cdbs, sharutils, dpatch (>= 1.11)
Uploaders: Kenshi Muto <kmuto at debian.org>, Masayuki Hatta <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>, Martin-Éric Racine <q-funk at iki.fi>
+Package: libcupsys2
+Priority: optional
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Provides: libcupsys2-gnutls10
+Replaces: cupsys-client (<= 1.1.10-2), libcupsys2-gnutls10 (<= 1.1.23-11)
+Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2-gnutls10 (<= 1.1.23-11)
+Description: Common UNIX Printing System(tm) - libs
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpd and the like. It supports the Internet
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides the base shared libraries for CUPS.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: libcupsimage2
+Priority: optional
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libcupsys2 (<= 1.1.18-2)
+Description: Common UNIX Printing System(tm) - image libs
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpd and the like. It supports the Internet
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides the image libraries for handling the CUPS
+ raster format.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
Package: cupsys
Priority: optional
Section: net
@@ -48,26 +87,6 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: libcupsys2
-Priority: optional
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Provides: libcupsys2-gnutls10
-Replaces: cupsys-client (<= 1.1.10-2), libcupsys2-gnutls10 (<= 1.1.23-11)
-Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2-gnutls10 (<= 1.1.23-11)
-Description: Common UNIX Printing System(tm) - libs
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like. It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides the base shared libraries for CUPS.
- .
- The terms "Common UNIX Printing System" and "CUPS" are trademarks of
- Easy Software Products (www.easysw.com), and refer to the original
- source packages from which these packages are made.
-
Package: libcupsys2-gnutls10
Priority: optional
Section: libs
@@ -106,25 +125,6 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: libcupsimage2
-Priority: optional
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: libcupsys2 (<= 1.1.18-2)
-Description: Common UNIX Printing System(tm) - image libs
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like. It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides the image libraries for handling the CUPS
- raster format.
- .
- The terms "Common UNIX Printing System" and "CUPS" are trademarks of
- Easy Software Products (www.easysw.com), and refer to the original
- source packages from which these packages are made.
-
Package: libcupsimage2-dev
Priority: optional
Section: libdevel
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs Thu Jun 15 18:41:19 2006
@@ -2,6 +2,7 @@
usr/share/doc/cupsys
etc/default
etc/cups/cups.d
+etc/cups/ssl
usr/lib/cups/backend-available
var/cache/cups/ppd
usr/share/ppd/cups-included
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d Thu Jun 15 18:41:19 2006
@@ -43,6 +43,7 @@
modprobe ppdev 2>/dev/null || true # for ISO-1284 device name detection
start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --exec $DAEMON
+ log_end_msg $?
;;
stop)
log_begin_msg "Stopping $DESC: $NAME"
Modified: cupsys/branches/cups-1.2-ubuntu/debian/docs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/docs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/docs Thu Jun 15 18:41:19 2006
@@ -1,8 +1,4 @@
-CGI.txt
CHANGES.txt
CREDITS.txt
-ENCRYPTION.txt
-INSTALL.txt
-INSTALL_fr.txt
LICENSE.txt
README.txt
Modified: cupsys/branches/cups-1.2-ubuntu/debian/libcupsimage2.shlibs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/libcupsimage2.shlibs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsimage2.shlibs Thu Jun 15 18:41:19 2006
@@ -1 +1 @@
-libcupsimage 2 libcupsimage2 (>= 1.1.19final-1)
+libcupsimage 2 libcupsimage2 (>= 1.2.1)
Modified: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs Thu Jun 15 18:41:19 2006
@@ -1 +1 @@
-libcups 2 libcupsys2 (>= 1.1.99.rc2)
+libcups 2 libcupsys2 (>= 1.2.1)
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 Thu Jun 15 18:41:19 2006
@@ -1,8 +1,9 @@
+00_r5643.dpatch
02_configure.dpatch
#03_manext.dpatch
03_clean.dpatch
04_freebsd.dpatch
-05_avoidunknowngroup.dpatch
+#05_avoidunknowngroup.dpatch
06_disable_backend_setuid.dpatch
07_removecvstag.dpatch
08_cupsd.conf.conf.d.dpatch
@@ -18,14 +19,6 @@
47_pid.dpatch
#48_stdlib.dpatch
55_ppd_okidata_name.dpatch
+56_dirsvc.dpatch
58_cupsd.conf-AllowLocal.dpatch
ubuntu-nowebadmin.dpatch
-svn5512_KCMYcm_fix.dpatch
-svn5518_12bitraster.dpatch
-svn5523_1_2_4bit_raster.dpatch
-svn5526_str1676_stopped_jobs_active.dpatch
-svn5527_LDAP_define.dpatch
-svn5527_str1683_lpstaterror.dpatch
-svn5527_str1689_printeroptions.dpatch
-svn5528_str1680_load_custom_options.dpatch
-svn5530_str1667_octet_stream.dpatch
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch Thu Jun 15 18:41:19 2006
@@ -5,19 +5,23 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.1.99.rc2~/configure cupsys-1.1.99.rc2/configure
---- cupsys-1.1.99.rc2~/configure 2006-04-11 11:31:17.000000000 +0000
-+++ cupsys-1.1.99.rc2/configure 2006-04-11 12:30:43.000000000 +0000
-@@ -7869,9 +7869,9 @@
- ;;
- Linux | GNU)
- # Linux and HURD
-- DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
-- LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
-- EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
-+ DSOFLAGS="$DSOFLAGS"
-+ LDFLAGS="$LDFLAGS"
-+ EXPORT_LDFLAGS=""
- ;;
+diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
+--- cupsys-1.2.1~/configure 2006-05-22 20:01:55.000000000 +0000
++++ cupsys-1.2.1/configure 2006-05-28 13:11:46.000000000 +0000
+@@ -7856,11 +7856,11 @@
+ IRIX | Linux | GNU)
+ # IRIX, Linux, and HURD...
+ if test $exec_prefix != /usr; then
+- DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
+- DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
+- DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
+- LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
+- EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
++ DSOFLAGS="$DSOFLAGS"
++ DSO32FLAGS="$DSO32FLAGS"
++ DSO64FLAGS="$DSO64FLAGS"
++ LDFLAGS="$LDFLAGS"
++ EXPORT_LDFLAGS=""
+ fi
+ ;;
esac
- else
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 Thu Jun 15 18:41:19 2006
@@ -5,15 +5,15 @@
## DP: No description.
@DPATCH@
-diff -urNad cups-1.2~/configure cups-1.2/configure
---- cups-1.2~/configure 2006-05-10 11:32:34.000000000 +0200
-+++ cups-1.2/configure 2006-05-10 11:35:08.000000000 +0200
+diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
+--- cupsys-1.2.1~/configure 2006-05-28 13:12:28.000000000 +0000
++++ cupsys-1.2.1/configure 2006-05-28 13:13:47.000000000 +0000
@@ -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 INITDDIR INITDIR 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 DSO DSOFLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP 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 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 INITDDIR INITDIR 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 DSO DSOFLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP 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 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 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 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 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 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 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 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 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 LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -25,7 +25,7 @@
--enable-pdftops build pdftops filter, default=auto
Optional Packages:
-@@ -13289,6 +13290,26 @@
+@@ -13147,6 +13148,26 @@
_ACEOF
@@ -52,7 +52,7 @@
# Check whether --with-printcap or --without-printcap was given.
if test "${with_printcap+set}" = set; then
-@@ -14554,6 +14575,7 @@
+@@ -14415,6 +14436,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
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 Thu Jun 15 18:41:19 2006
@@ -9,7 +9,7 @@
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-03-29 14:05+0000\n"
-"PO-Revision-Date: 2006-03-20 15:58+0100\n"
+"PO-Revision-Date: 2006-06-07 18:05+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
"Language-Team: Danish <dansk at klid.dk>\n"
"MIME-Version: 1.0\n"
@@ -138,8 +138,7 @@
#. Type: multiselect
#. Description
#: ../cupsys.templates:24
-msgid ""
-"CUPS uses backend programs for communication with printer device or port."
+msgid "CUPS uses backend programs for communication with printer device or port."
msgstr ""
"CUPS bruger bagvedliggende programmer til at kommunikere med printerenheden "
"eller -porten."
@@ -183,7 +182,6 @@
#. Type: string
#. Description
#: ../cupsys.templates:36
-#, fuzzy
msgid ""
" - Port number (631);\n"
" - Host name (debian.example.com);\n"
@@ -191,8 +189,9 @@
" - File domain socket (/var/run/cups/cups.sock)."
msgstr ""
" - Portnummer (631);\n"
-" - værtsnavn (debian.example.com);\n"
-" - Vært:Port (debian.example.com:631)."
+" - værtsnavn (debian.eksempel.dk);\n"
+" - Vært:Port (debian.eksempel.dk:631);\n"
+" - Fildomænesokkel (/var/run/cups/cups.sock)."
#. Type: string
#. Description
@@ -261,3 +260,4 @@
#~ msgid "Select the backends you want."
#~ msgstr "Vælg det bagvedliggende program, du ønsker."
+
Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/fr.po Thu Jun 15 18:41:19 2006
@@ -10,20 +10,20 @@
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
# Developers do not need to manually edit POT or PO files.
-# Christian Perrier <bubulle at debian.org>, 2004, 2005.
#
+# Christian Perrier <bubulle at debian.org>, 2004, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-03-29 14:05+0000\n"
-"PO-Revision-Date: 2005-12-17 18:48+0100\n"
+"PO-Revision-Date: 2006-06-07 11:50+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
#. Type: boolean
@@ -192,23 +192,22 @@
#. Type: string
#. Description
#: ../cupsys.templates:36
-#, 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 ""
-" - numéro de port seul (p. ex. 631) ;\n"
-" - nom d'hôte seul (p. ex. debian.asso.fr) ;\n"
-" - hôte:port (p. ex. debian.asso.fr:631)."
+" - numéro de port (p. ex. 631) ;\n"
+" - nom d'hôte (p. ex. debian.asso.fr) ;\n"
+" - hôte:port (p. ex. debian.asso.fr:631) ;\n"
+" - fichier « socket » (/var/run/cups/cups.sock)."
#. Type: string
#. Description
#: ../cupsys.templates:36
msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-"Ces trois formats peuvent être combinés ensemble, séparés par des espaces."
+msgstr "Ces formats peuvent être combinés ensemble, séparés par des espaces."
#. Type: string
#. Description
@@ -269,11 +268,3 @@
#: ../cupsys.templates:63
msgid "Please correct your input."
msgstr "Veuillez corriger votre saisie."
-
-#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
-#~ msgstr ""
-#~ "IPP (Protocole d'impression Internet), LPD (« Line Printer Daemon »), "
-#~ "Parallèle, SCSI, Série, Socket, USB"
-
-#~ msgid "Select the backends you want."
-#~ msgstr "Méthode de communication avec l'imprimante :"
Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/nl.po Thu Jun 15 18:41:19 2006
@@ -1,22 +1,22 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
msgid ""
msgstr ""
"Project-Id-Version: cupsys 1.1.20candidate6\n"
"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-03-29 14:05+0000\n"
-"PO-Revision-Date: 2004-03-30 12:28+0100\n"
+"PO-Revision-Date: 2006-05-29 17:10+0100\n"
"Last-Translator: Tim Dijkstra <tim at famdijkstra.org>\n"
"Language-Team: Debian Dutch <debian-l10n-dutch at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -99,49 +99,49 @@
#. Choices
#: ../cupsys.templates:22
msgid "ipp"
-msgstr ""
+msgstr "ipp"
#. Type: multiselect
#. Choices
#: ../cupsys.templates:22
msgid "lpd"
-msgstr ""
+msgstr "lpd"
#. Type: multiselect
#. Choices
#: ../cupsys.templates:22
msgid "parallel"
-msgstr ""
+msgstr "parallel"
#. Type: multiselect
#. Choices
#: ../cupsys.templates:22
msgid "scsi"
-msgstr ""
+msgstr "scsi"
#. Type: multiselect
#. Choices
#: ../cupsys.templates:22
msgid "serial"
-msgstr ""
+msgstr "serieel"
#. Type: multiselect
#. Choices
#: ../cupsys.templates:22
msgid "socket"
-msgstr ""
+msgstr "socket"
#. Type: multiselect
#. Choices
#: ../cupsys.templates:22
msgid "usb"
-msgstr ""
+msgstr "usb"
#. Type: multiselect
#. Description
#: ../cupsys.templates:24
msgid "Printer communication backends:"
-msgstr ""
+msgstr "Backends voor printercommunicatie:"
#. Type: multiselect
#. Description
@@ -169,14 +169,14 @@
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
msgstr ""
-"Kies een backend-programma dat door CUPS gebruikt moet worden. De standaard "
-"keuze zou voor de meest voorkomende omgevingen moeten voldoen."
+"Kies een backend-programma dat door CUPS moet worden gebruikt. De "
+"standaardkeuze zou voor de meest voorkomende omgevingen moeten voldoen."
#. Type: string
#. Description
#: ../cupsys.templates:36
msgid "Port or/and host name where CUPS will listen to:"
-msgstr ""
+msgstr "Poort en/of domeinnaam waarnaar CUPS moet luisteren:"
#. Type: string
#. Description
@@ -185,6 +185,8 @@
"Please specify the port or the host name CUPS daemon will listen to. The "
"following formats are allowed:"
msgstr ""
+"Gelieve de poort of domeinnaam te specificeren waarnaar de CUPS-"
+"achtergronddienst moet luisteren. Volgende formaten zijn toegestaan:"
#. Type: string
#. Description
@@ -195,12 +197,17 @@
" - Host:Port (debian.example.com:631);\n"
" - File domain socket (/var/run/cups/cups.sock)."
msgstr ""
+" - Poortnummer (631);\n"
+" - Domeinnaam (debian.example.com);\n"
+" - Domeinnaam:Poort (debian.example.com:631)."
#. Type: string
#. Description
#: ../cupsys.templates:36
msgid "You can combine any of these by delimiting in a space-separated list."
msgstr ""
+"U kunt om het even welk hiervan combineren door deze met een spatie te "
+"scheiden."
#. Type: string
#. Description
@@ -210,12 +217,15 @@
"\"localhost:631\" is recommended to setup a standalone environment for "
"security reasons."
msgstr ""
+"Standaardpoort 631 is gereserveerd voor het Internet Printing Protocol "
+"(IPP). Om veiligheidsredenen is \"localhost:631\" aangewezen om in een "
+"afzonderlijke omgeving te installeren."
#. Type: boolean
#. Description
#: ../cupsys.templates:54
msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
+msgstr "Uitzenden en/of luisteren naar CUPS-printerinformatie op het netwerk?"
#. Type: boolean
#. Description
@@ -224,6 +234,8 @@
"CUPS daemon can broadcast printer information for clients on the network, "
"and detect printers on the network automatically."
msgstr ""
+"De CUPS-achtergronddienst kan voor clients op het netwerk automatisch, "
+"printerinformatie uitzenden en printers detecteren."
#. Type: boolean
#. Description
@@ -232,24 +244,28 @@
"If you choose this option, the CUPS daemon will periodically send UDP "
"broadcasts to detect printers."
msgstr ""
+"Indien u deze optie kiest, zal de CUPS-achtergronddienst periodiek UDP-"
+"uitzendingen verzenden om printers te detecteren."
#. Type: note
#. Description
#: ../cupsys.templates:63
msgid "Incorrect value entered"
-msgstr ""
+msgstr "Ongeldige waarde ingevoerd"
#. Type: note
#. Description
#: ../cupsys.templates:63
msgid "an error occurred while parsing the port number or the host name."
msgstr ""
+"Er is een fout voorgekomen tijdens het inlezen van het poortnummer of de "
+"domeinnaam"
#. Type: note
#. Description
#: ../cupsys.templates:63
msgid "Please correct your input."
-msgstr ""
+msgstr "U dient uw ingevoerde gegevens te verbeteren."
#~ msgid "Select the backends you want."
-#~ msgstr "Selecteer het backend dat u wilt."
+#~ msgstr "Selecteer de backends die u wilt."
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 Thu Jun 15 18:41:19 2006
@@ -20,7 +20,6 @@
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 --disable-pdftops --disable-launchd --with-cups-user=cupsys --with-cups-group=lp --with-system-groups=lpadmin --enable-privilege-dropping
DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
-#DESTDIR=$(DEB_DESTDIR) BINDIR=$(DEB_DESTDIR)/usr/bin SBINDIR=$(DEB_DESTDIR)/usr/sbin INCLUDEDIR=$(DEB_DESTDIR)/usr/include LIBDIR=$(DEB_DESTDIR)/usr/lib SERVERBIN=$(DEB_DESTDIR)/usr/lib/cups SERVERROOT=$(DEB_DESTDIR)/etc/cups BUILDROOT=$(DEB_DESTDIR)
DEB_DH_INSTALLINIT_ARGS := -u'defaults 19'
clean::
@@ -36,7 +35,7 @@
-rm pdftops/libxpdf.a
-rm scheduler/testdirsvc scheduler/testdirsvc.o
-rm cups/testfile cups/testfile.o cups/http-addrlist.o
- -rm backend/http
+ -rm backend/http backend/runloop.o backend/ieee1284.o
-rm systemv/disable systemv/enable systemv/reject
-rm cups-config cups.list conf/cupsd.conf conf/pam.conf
-rm config.log config.h config.cache config.status Makedefs cups.sh
@@ -73,9 +72,9 @@
binary-post-install/libcupsimage2-dev::
rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
ln -s libcupsimage2 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
-binary-post-install/libcupsys2-gnutls10::
- rm -r debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
- ln -s libcupsys2 debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
+#binary-post-install/libcupsys2-gnutls10::
+# rm -r debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
+# ln -s libcupsys2 debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
binary-post-install/cupsys-bsd::
rm -r debian/cupsys-bsd/usr/share/doc/cupsys-bsd
ln -s libcupsys2 debian/cupsys-bsd/usr/share/doc/cupsys-bsd
More information about the Pkg-cups-devel
mailing list