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

Thu Mar 30 15:04:57 UTC 2006

Author: kmuto
Date: Thu Mar 30 15:04:55 2006
New Revision: 117

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/control
   cupsys/branches/cups-1.2/debian/libcupsimage2-dev.files
   cupsys/branches/cups-1.2/debian/libcupsys2-dev.files
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch
   cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch
   cupsys/branches/cups-1.2/debian/rules
Log:
update to r5357. added dbus support.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================

--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Thu Mar 30 15:04:55 2006
@@ -1,18 +1,19 @@
-cupsys (1.1.99.b2-1) UNRELEASED-experimental; urgency=low
+cupsys (1.1.99.r5357-1) UNRELEASED-experimental; urgency=low
 
   TODO:
-    CUPS 1.2b2 and rc1 change many things. We need to solve some problems
+    CUPS rc1 change many things. We need to solve some problems
     before uploading.
     Upstream looks try to release CUPS 1.2 in a few weeks.
     Kenshi would like to use official 1.2 code as orig.tar.gz,
     because it includes many files which can't be handled by dpatch diff.
 
-  - On i386, it installs libraries to lib64 by default.
-    Some of other architectures may use other directory.
-    *.files solution becomes obsolete.
+    Source code (cupsys-1.1.99.r5357.orig.tar.gz) is at
+    http://kmuto.jp/debian/mtu/pool/main/c/cupsys/
+    Before compiling, you need to run "autoconf". (it will be unneeded
+    when cups 1.2.tar.gz is officially released)
+
   - Some Debian patches seem be rejected. We need to verify again.
-    03_manext, 04_freebsd, 06_replacepdftops, 07_removecvstag,
-    09_runasuser_fixes, 44_fixconfdirperms, 48_stdlib
+    09_runasuser_fixes, 44_fixconfdirperms
   - usb and parallel backend programs won't work when I defined lp
     as RunAsUser. root works.
   - /etc/cups/client.conf, /usr/sbin/disable, /usr/sbin/enable are
@@ -23,12 +24,13 @@
     chroot without pam info.
 
   [ Kenshi Muto ]
-  * New upstream release (1.2b2) + r5293
+  * New upstream release (1.2rc1) + r5357
   * Enable LDAP support.
   * Remove duplicated update-rc.d (closes: #356911)
   * Stopped asking admin password because it works only if user chooses
     digest authentication. The default configuration of Debian uses
     PAM and basic authentication.
+  * Enable dbus support.
 
   [ Martin Pitt ]
   * New SVN release taken from r4892.

Modified: cupsys/branches/cups-1.2/debian/control
==============================================================================
--- cupsys/branches/cups-1.2/debian/control	(original)
+++ cupsys/branches/cups-1.2/debian/control	Thu Mar 30 15:04:55 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, libldap2-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), libdbus-1-dev
 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

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	Thu Mar 30 15:04:55 2006
@@ -1,4 +1,4 @@
-usr/lib64/libcupsimage.so
-usr/lib64/libcupsimage.a
+usr/lib/libcupsimage.so
+usr/lib/libcupsimage.a
 usr/include/cups/image.h
 usr/include/cups/raster.h

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	Thu Mar 30 15:04:55 2006
@@ -1,6 +1,6 @@
 usr/bin/cups-config
-usr/lib64/libcups.so
-usr/lib64/libcups.a
+usr/lib/libcups.so
+usr/lib/libcups.a
 usr/include/cups/array.h
 usr/include/cups/cups.h
 usr/include/cups/dir.h
@@ -9,7 +9,6 @@
 usr/include/cups/ipp.h
 usr/include/cups/language.h
 usr/include/cups/md5.h
-usr/include/cups/normalize.h
 usr/include/cups/ppd.h
 usr/include/cups/transcode.h
 usr/include/cups/adminutil.h

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	Thu Mar 30 15:04:55 2006
@@ -1,8 +1,8 @@
-00_r5293.dpatch
+#00_r5293.dpatch
 01_cupsimage.dpatch
 #02_configure.dpatch
 #03_manext.dpatch
-#04_freebsd.dpatch
+04_freebsd.dpatch
 05_avoidunknowngroup.dpatch
 #06_replacepdftops.dpatch
 #07_removecvstag.dpatch

Modified: cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch	Thu Mar 30 15:04:55 2006
@@ -5,72 +5,72 @@
 ## DP: man extension is handled by dh_installman
 
 @DPATCH@
-diff -urNad cupsys-1.1.99.b1.r4885~/backend/parallel.c cupsys-1.1.99.b1.r4885/backend/parallel.c
---- cupsys-1.1.99.b1.r4885~/backend/parallel.c	2005-12-18 12:40:26.000000000 +0900
-+++ cupsys-1.1.99.b1.r4885/backend/parallel.c	2005-12-18 12:40:34.000000000 +0900
-@@ -683,7 +683,7 @@
+diff -urNad cupsys-1.1.99.r5357~/backend/parallel.c cupsys-1.1.99.r5357/backend/parallel.c
+--- cupsys-1.1.99.r5357~/backend/parallel.c	2006-03-30 14:15:57.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/parallel.c	2006-03-30 14:23:59.000000000 +0000
+@@ -695,7 +695,7 @@
        printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
      }
    }
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
    int	i;			/* Looping var */
    int	fd;			/* File descriptor */
    char	device[255];		/* Device filename */
-diff -urNad cupsys-1.1.99.b1.r4885~/backend/serial.c cupsys-1.1.99.b1.r4885/backend/serial.c
---- cupsys-1.1.99.b1.r4885~/backend/serial.c	2005-12-18 12:40:26.000000000 +0900
-+++ cupsys-1.1.99.b1.r4885/backend/serial.c	2005-12-18 12:40:34.000000000 +0900
-@@ -650,10 +650,10 @@
+diff -urNad cupsys-1.1.99.r5357~/backend/serial.c cupsys-1.1.99.r5357/backend/serial.c
+--- cupsys-1.1.99.r5357~/backend/serial.c	2006-03-07 22:07:44.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/serial.c	2006-03-30 14:24:53.000000000 +0000
+@@ -661,10 +661,10 @@
  void
  list_devices(void)
  {
--#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
    static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
  				/* Funky hex numbering used for some devices */
 -#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
 +#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
  
  #if defined(__linux) || defined(linux) || defined(__linux__)
-   int	i;		/* Looping var */
-@@ -900,7 +900,7 @@
+   int	i, j;		/* Looping vars */
+@@ -926,7 +926,7 @@
        printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
               device, i + 1);
    }
--#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
    int	i, j;		/* Looping vars */
    int	fd;		/* File descriptor */
    char	device[255];	/* Device filename */
-diff -urNad cupsys-1.1.99.b1.r4885~/backend/usb-unix.c cupsys-1.1.99.b1.r4885/backend/usb-unix.c
---- cupsys-1.1.99.b1.r4885~/backend/usb-unix.c	2005-12-18 12:40:26.000000000 +0900
-+++ cupsys-1.1.99.b1.r4885/backend/usb-unix.c	2005-12-18 12:40:34.000000000 +0900
-@@ -394,7 +394,7 @@
+diff -urNad cupsys-1.1.99.r5357~/backend/usb-unix.c cupsys-1.1.99.r5357/backend/usb-unix.c
+--- cupsys-1.1.99.r5357~/backend/usb-unix.c	2006-03-09 19:22:36.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/usb-unix.c	2006-03-30 14:25:13.000000000 +0000
+@@ -397,7 +397,7 @@
    }
  #elif defined(__hpux)
  #elif defined(__osf)
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
    int   i;                      /* Looping var */
    char  device[255];            /* Device filename */
  
-diff -urNad cupsys-1.1.99.b1.r4885~/backend/usb.c cupsys-1.1.99.b1.r4885/backend/usb.c
---- cupsys-1.1.99.b1.r4885~/backend/usb.c	2005-12-18 12:40:26.000000000 +0900
-+++ cupsys-1.1.99.b1.r4885/backend/usb.c	2005-12-18 12:40:34.000000000 +0900
+diff -urNad cupsys-1.1.99.r5357~/backend/usb.c cupsys-1.1.99.r5357/backend/usb.c
+--- cupsys-1.1.99.r5357~/backend/usb.c	2006-02-24 03:15:13.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/usb.c	2006-03-30 14:25:27.000000000 +0000
 @@ -72,7 +72,7 @@
  
  #ifdef __APPLE__
  #  include "usb-darwin.c"
--#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
  #  include "usb-unix.c"
  #else
  /*
-diff -urNad cupsys-1.1.99.b1.r4885~/config-scripts/cups-directories.m4 cupsys-1.1.99.b1.r4885/config-scripts/cups-directories.m4
---- cupsys-1.1.99.b1.r4885~/config-scripts/cups-directories.m4	2005-12-18 12:40:26.000000000 +0900
-+++ cupsys-1.1.99.b1.r4885/config-scripts/cups-directories.m4	2005-12-18 12:40:34.000000000 +0900
-@@ -125,7 +125,7 @@
- 			INITDDIR="/System/Library/StartupItems/PrintingServices"
+diff -urNad cupsys-1.1.99.r5357~/config-scripts/cups-directories.m4 cupsys-1.1.99.r5357/config-scripts/cups-directories.m4
+--- cupsys-1.1.99.r5357~/config-scripts/cups-directories.m4	2006-03-20 19:06:50.000000000 +0000
++++ cupsys-1.1.99.r5357/config-scripts/cups-directories.m4	2006-03-30 14:22:34.000000000 +0000
+@@ -135,7 +135,7 @@
+ 				"/System/Library/StartupItems/PrintingServices")
  			;;
  
 -		Linux | GNU)
@@ -78,11 +78,11 @@
  			# Linux/HURD seems to choose an init.d directory at random...
  			if test -d /sbin/init.d; then
  				# SuSE
-diff -urNad cupsys-1.1.99.b1.r4885~/configure cupsys-1.1.99.b1.r4885/configure
---- cupsys-1.1.99.b1.r4885~/configure	2005-12-18 12:40:34.000000000 +0900
-+++ cupsys-1.1.99.b1.r4885/configure	2005-12-18 12:40:50.000000000 +0900
-@@ -6884,7 +6884,7 @@
- 			INITDDIR="/System/Library/StartupItems/PrintingServices"
+diff -urNad cupsys-1.1.99.r5357~/configure cupsys-1.1.99.r5357/configure
+--- cupsys-1.1.99.r5357~/configure	2006-03-30 11:37:48.000000000 +0000
++++ cupsys-1.1.99.r5357/configure	2006-03-30 14:26:17.000000000 +0000
+@@ -8264,7 +8264,7 @@
+ 
  			;;
  
 -		Linux | GNU)

Modified: cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch	Thu Mar 30 15:04:55 2006
@@ -5,24 +5,62 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys-1.1.99.b1.r4748~/conf/Makefile cupsys-1.1.99.b1.r4748/conf/Makefile
---- cupsys-1.1.99.b1.r4748~/conf/Makefile	2005-09-17 22:56:56.000000000 +0000
-+++ cupsys-1.1.99.b1.r4748/conf/Makefile	2005-10-05 12:09:11.220014091 +0000
-@@ -57,6 +57,8 @@
- 			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
+diff -urNad cupsys-1.1.99.r5357~/conf/Makefile cupsys-1.1.99.r5357/conf/Makefile
+--- cupsys-1.1.99.r5357~/conf/Makefile	2006-03-05 16:48:12.000000000 +0000
++++ cupsys-1.1.99.r5357/conf/Makefile	2006-03-30 14:31:30.000000000 +0000
+@@ -65,6 +65,8 @@
+ 			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
  		else \
- 			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+ 			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
 +			grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
 +			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
  		fi ; \
  	done
- 	for file in $(REPLACE); do \
-@@ -64,6 +66,8 @@
+@@ -75,6 +77,8 @@
  			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
  		fi ; \
- 		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+ 		$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
 +		grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
 +		mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
  	done
- 	-if test x$(PAMDIR) != x$(BUILDROOT); then \
- 		$(INSTALL_DIR) $(PAMDIR); \
+ 	-if test x$(PAMDIR) != x; then \
+diff -urNad cupsys-1.1.99.r5357~/conf/Makefile.rej cupsys-1.1.99.r5357/conf/Makefile.rej
+--- cupsys-1.1.99.r5357~/conf/Makefile.rej	1970-01-01 00:00:00.000000000 +0000
++++ cupsys-1.1.99.r5357/conf/Makefile.rej	2006-03-30 14:28:23.000000000 +0000
+@@ -0,0 +1,34 @@
++***************
++*** 57,62 ****
++  			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
++  		else \
++  			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
++  		fi ; \
++  	done
++  	for file in $(REPLACE); do \
++--- 57,64 ----
++  			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
++  		else \
++  			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+++ 			grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+++ 			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
++  		fi ; \
++  	done
++  	for file in $(REPLACE); do \
++***************
++*** 64,69 ****
++  			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
++  		fi ; \
++  		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
++  	done
++  	-if test x$(PAMDIR) != x$(BUILDROOT); then \
++  		$(INSTALL_DIR) $(PAMDIR); \
++--- 66,73 ----
++  			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
++  		fi ; \
++  		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+++ 		grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+++ 		mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
++  	done
++  	-if test x$(PAMDIR) != x$(BUILDROOT); then \
++  		$(INSTALL_DIR) $(PAMDIR); \

Modified: cupsys/branches/cups-1.2/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2/debian/rules	(original)
+++ cupsys/branches/cups-1.2/debian/rules	Thu Mar 30 15:04:55 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 --enable-install_static
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --with-cups-group=lpadmin --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --disable-pdftops --disable-launchd --with-cups-user=lp --with-cups-group=nogroup --with-system-groups=lp
 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)
 

