[Pkg-cups-devel] r110 - in cupsys/branches/cups-1.2/debian: . patches

Kenshi Muto kmuto at costa.debian.org
Sat Mar 11 06:07:03 UTC 2006


Author: kmuto
Date: Sat Mar 11 06:07:00 2006
New Revision: 110

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/control
   cupsys/branches/cups-1.2/debian/cupsys-bsd.files
   cupsys/branches/cups-1.2/debian/cupsys-client.files
   cupsys/branches/cups-1.2/debian/cupsys.docs
   cupsys/branches/cups-1.2/debian/cupsys.examples
   cupsys/branches/cups-1.2/debian/cupsys.files
   cupsys/branches/cups-1.2/debian/libcupsimage2-dev.files
   cupsys/branches/cups-1.2/debian/libcupsimage2.files
   cupsys/branches/cups-1.2/debian/libcupsys2-dev.files
   cupsys/branches/cups-1.2/debian/libcupsys2.files
   cupsys/branches/cups-1.2/debian/libcupsys2.shlibs
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/rules
Log:
working against cups 1.2b2. see debian/changelog.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sat Mar 11 06:07:00 2006
@@ -1,9 +1,27 @@
-cupsys (1.1.99.b1.r4892-1) UNRELEASED-experimental; urgency=low
+cupsys (1.1.99.b2-1) UNRELEASED-experimental; urgency=low
+
+  TODO:
+    CUPS 1.2b2 changes many things. We need to solve some problems
+    before uploading.
+
+  - On i386, it installs libraries to lib64 by default.
+    Some of other architectures may use other directory.
+    *.files solution becomes obsolete.
+  - Some Debian patches seem be rejected. We need to verify again.
+    03_manext, 04_freebsd, 06_replacepdftops, 07_removecvstag,
+    09_runasuser_fixes, 44_fixconfdirperms, 47_pid, 48_stdlib
+  - At least on Kenshi's environment, backend programs won't work.
+    (usb and parallel backends return nothing.)
+  - /etc/cups/client.conf, /usr/sbin/disable, /usr/sbin/enable are
+    removed from upstream.
+  - gs-esp/other alternatives issue (although other gs needs to apply
+    CUPS patch)
+  - The administration of cupsd may not work when user is in
+    chroot without pam info.
 
   [ Kenshi Muto ]
-  * debian/postinst:
-    - Fix value extract code of $VAL.
-  * libcupsys2 should conflict with cups 1.1 series. (closes: #349341)
+  * New upstream release (1.2b2)
+  * Enable LDAP support.
 
   [ Martin Pitt ]
   * New SVN release taken from r4892.
@@ -14,7 +32,7 @@
     - Ensure that /var/run/cupsd exists; this makes the init script work with
       /var/run mounted on a tmpfs.
 
- -- Martin Pitt <mpitt at debian.org>  Fri, 13 Jan 2006 15:55:50 +0100
+ -- Kenshi Muto <kmuto at debian.org>  Sat, 11 Mar 2006 11:27:39 +0900
 
 cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/control
==============================================================================
--- cupsys/branches/cups-1.2/debian/control	(original)
+++ cupsys/branches/cups-1.2/debian/control	Sat Mar 11 06:07:00 2006
@@ -3,7 +3,7 @@
 Section: net
 Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
 Standards-Version: 3.6.1
-Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, debhelper (>= 4.0), po-debconf, cdbs, sharutils, dpatch (>= 1.11)
+Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 4.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: cupsys
@@ -55,7 +55,7 @@
 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), cupsys (<< 1.1.99.b1)
+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 

Modified: cupsys/branches/cups-1.2/debian/cupsys-bsd.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys-bsd.files	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys-bsd.files	Sat Mar 11 06:07:00 2006
@@ -3,8 +3,8 @@
 usr/bin/lpr
 usr/bin/lprm
 usr/lib/cups/daemon/cups-lpd
-usr/share/man/man1/lpr.1
-usr/share/man/man1/lprm.1
-usr/share/man/man1/lpq.1
-usr/share/man/man8/cups-lpd.8
-usr/share/man/man8/lpc.8
+usr/share/man/man1/lpr.1.gz
+usr/share/man/man1/lprm.1.gz
+usr/share/man/man1/lpq.1.gz
+usr/share/man/man8/cups-lpd.8.gz
+usr/share/man/man8/lpc.8.gz

Modified: cupsys/branches/cups-1.2/debian/cupsys-client.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys-client.files	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys-client.files	Sat Mar 11 06:07:00 2006
@@ -4,25 +4,26 @@
 usr/bin/lpoptions
 usr/bin/lppasswd
 usr/bin/lpstat
-usr/sbin/disable
-usr/sbin/enable
 usr/sbin/cupsaddsmb
 usr/sbin/accept
 usr/sbin/lpadmin
 usr/sbin/lpinfo
 usr/sbin/lpmove
 usr/sbin/reject
-usr/share/man/man1/cupstestppd.1
-usr/share/man/man1/lp.1
-usr/share/man/man1/lpoptions.1
-usr/share/man/man1/lppasswd.1
-usr/share/man/man1/lpstat.1
-usr/share/man/man1/cancel.1
-usr/share/man/man8/cupsaddsmb.8
-usr/share/man/man8/cupsenable.8
-usr/share/man/man8/lpadmin.8
-usr/share/man/man8/lpinfo.8
-usr/share/man/man8/lpmove.8
-usr/share/man/man8/reject.8
-usr/share/man/man8/cupsdisable.8
-usr/share/man/man8/accept.8
+usr/sbin/cupsdisable
+usr/sbin/cupsenable
+usr/share/man/man1/cupstestppd.1.gz
+usr/share/man/man1/lp.1.gz
+usr/share/man/man1/lpoptions.1.gz
+usr/share/man/man1/lppasswd.1.gz
+usr/share/man/man1/lpstat.1.gz
+usr/share/man/man1/cancel.1.gz
+usr/share/man/man5/client.conf.5.gz
+usr/share/man/man8/cupsaddsmb.8.gz
+usr/share/man/man8/cupsenable.8.gz
+usr/share/man/man8/lpadmin.8.gz
+usr/share/man/man8/lpinfo.8.gz
+usr/share/man/man8/lpmove.8.gz
+usr/share/man/man8/reject.8.gz
+usr/share/man/man8/cupsdisable.8.gz
+usr/share/man/man8/accept.8.gz

Modified: cupsys/branches/cups-1.2/debian/cupsys.docs
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.docs	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.docs	Sat Mar 11 06:07:00 2006
@@ -1,6 +1,4 @@
-CGI.txt
 CHANGES.txt
 CREDITS.txt
-ENCRYPTION.txt
 README.txt
 debian/HOWTO_BUGREPORT.txt

Modified: cupsys/branches/cups-1.2/debian/cupsys.examples
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.examples	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.examples	Sat Mar 11 06:07:00 2006
@@ -1,4 +1 @@
-conf/printers.conf
-conf/classes.conf
-conf/printcap
 debian/filters

Modified: cupsys/branches/cups-1.2/debian/cupsys.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.files	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.files	Sat Mar 11 06:07:00 2006
@@ -5,6 +5,7 @@
 etc/cups/mime.*
 usr/lib/cups/backend
 usr/lib/cups/cgi-bin
+usr/lib/cups/monitor
 usr/lib/cups/daemon/cups-polld
 usr/lib/cups/daemon/cups-deviced
 usr/lib/cups/daemon/cups-driverd
@@ -29,12 +30,14 @@
 usr/share/cups/model
 usr/share/cups/templates
 usr/share/locale
-usr/share/man/man1/backend.1
-usr/share/man/man1/filter.1
-usr/share/man/man5/classes.conf.5
-usr/share/man/man5/cupsd.conf.5
-usr/share/man/man5/mime.convs.5
-usr/share/man/man5/mime.types.5
-usr/share/man/man5/printers.conf.5
-usr/share/man/man8/cups-polld.8
-usr/share/man/man8/cupsd.8
+usr/share/man/man7/backend.7.gz
+usr/share/man/man7/filter.7.gz
+usr/share/man/man5/classes.conf.5.gz
+usr/share/man/man5/cupsd.conf.5.gz
+usr/share/man/man5/mime.convs.5.gz
+usr/share/man/man5/mime.types.5.gz
+usr/share/man/man5/printers.conf.5.gz
+usr/share/man/man8/cups-polld.8.gz
+usr/share/man/man8/cupsd.8.gz
+usr/share/man/man8/cups-deviced.8.gz
+usr/share/man/man8/cups-driverd.8.gz

Modified: cupsys/branches/cups-1.2/debian/libcupsimage2-dev.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/libcupsimage2-dev.files	(original)
+++ cupsys/branches/cups-1.2/debian/libcupsimage2-dev.files	Sat Mar 11 06:07:00 2006
@@ -1,4 +1,4 @@
-usr/lib/libcupsimage.a
-usr/lib/libcupsimage.so
+usr/lib64/libcupsimage.so
+usr/lib64/libcupsimage.a
 usr/include/cups/image.h
 usr/include/cups/raster.h

Modified: cupsys/branches/cups-1.2/debian/libcupsimage2.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/libcupsimage2.files	(original)
+++ cupsys/branches/cups-1.2/debian/libcupsimage2.files	Sat Mar 11 06:07:00 2006
@@ -1 +1,2 @@
 usr/lib/libcupsimage.so.*
+usr/lib64/libcupsimage.so.*

Modified: cupsys/branches/cups-1.2/debian/libcupsys2-dev.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/libcupsys2-dev.files	(original)
+++ cupsys/branches/cups-1.2/debian/libcupsys2-dev.files	Sat Mar 11 06:07:00 2006
@@ -1,6 +1,6 @@
 usr/bin/cups-config
-usr/lib/libcups.a
-usr/lib/libcups.so
+usr/lib64/libcups.so
+usr/lib64/libcups.a
 usr/include/cups/array.h
 usr/include/cups/cups.h
 usr/include/cups/dir.h
@@ -12,4 +12,6 @@
 usr/include/cups/normalize.h
 usr/include/cups/ppd.h
 usr/include/cups/transcode.h
-usr/share/man/man1/cups-config.1
+usr/include/cups/adminutil.h
+usr/include/cups/i18n.h
+usr/share/man/man1/cups-config.1.gz

Modified: cupsys/branches/cups-1.2/debian/libcupsys2.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/libcupsys2.files	(original)
+++ cupsys/branches/cups-1.2/debian/libcupsys2.files	Sat Mar 11 06:07:00 2006
@@ -1,2 +1,2 @@
 usr/lib/libcups.so.*
-etc/cups/client.conf
+usr/lib64/libcups.so.*

Modified: cupsys/branches/cups-1.2/debian/libcupsys2.shlibs
==============================================================================
--- cupsys/branches/cups-1.2/debian/libcupsys2.shlibs	(original)
+++ cupsys/branches/cups-1.2/debian/libcupsys2.shlibs	Sat Mar 11 06:07:00 2006
@@ -1 +1 @@
-libcups 2 libcupsys2 (>= 1.1.99.b1.r4748-1)
+libcups 2 libcupsys2 (>= 1.1.99.b2-1)

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Sat Mar 11 06:07:00 2006
@@ -1,15 +1,15 @@
 01_cupsimage.dpatch
-02_configure.dpatch
-03_manext.dpatch
-04_freebsd.dpatch
+#02_configure.dpatch
+#03_manext.dpatch
+#04_freebsd.dpatch
 05_avoidunknowngroup.dpatch
-06_replacepdftops.dpatch
-07_removecvstag.dpatch
+#06_replacepdftops.dpatch
+#07_removecvstag.dpatch
 08_cupsd.conf.conf.d.dpatch
-09_runasuser_fixes.dpatch
+#09_runasuser_fixes.dpatch
 11_pam.dpatch
 19_cupsaccept.dpatch
 26_modprobe.dpatch
-44_fixconfdirperms.dpatch
-47_pid.dpatch
-48_stdlib.dpatch
+#44_fixconfdirperms.dpatch
+#47_pid.dpatch
+#48_stdlib.dpatch

Modified: cupsys/branches/cups-1.2/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2/debian/rules	(original)
+++ cupsys/branches/cups-1.2/debian/rules	Sat Mar 11 06:07:00 2006
@@ -18,7 +18,7 @@
 
 unpatch: deapply-dpatches
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --with-cups-group=lpadmin --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --with-cups-group=lpadmin --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-install_static
 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)
 
@@ -54,7 +54,7 @@
 	(cd $(DEB_DESTDIR)/../cupsys/etc/cups && ln -sf /var/lib/cups/certs certs)
 	(cd $(DEB_DESTDIR) && mv etc/cups/interfaces etc/cups/ppd $(DEB_DESTDIR)/../cupsys/etc/cups)
 	(cd $(DEB_DESTDIR)/../cupsys/usr/share/doc/cupsys && ln -sf /usr/share/cups/doc-root online-docs)
-	(cd $(DEB_DESTDIR)/../cupsys/usr/share/man && mv man1/backend.1 man1/cups-backend.1 && mv man1/filter.1 man1/cups-filter.1)
+	#(cd $(DEB_DESTDIR)/../cupsys/usr/share/man && mv man1/backend.1 man1/cups-backend.1 && mv man1/filter.1 man1/cups-filter.1)
 	(cd $(DEB_DESTDIR)/../cupsys/etc/cups && ln -s ../xpdf/xpdfrc pdftops.conf)
 	(install -m 755 -o root -g root $(DEB_DESTDIR)/../pdftops $(DEB_DESTDIR)/../cupsys/usr/lib/cups/filter/)
 	install -o root -g root -m 644 debian/cupsys.default debian/cupsys/etc/default/cupsys



More information about the Pkg-cups-devel mailing list