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

[Kenshi Muto]

Author: kmuto
Date: Sat Oct 21 03:09:30 2006
New Revision: 400

Added:
   cupsys/branches/cups-1.2/debian/patches/00_r6052.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/rules

Log:
apply r6052 to pass compile

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sat Oct 21 03:09:30 2006
@@ -3,6 +3,7 @@
   * New upstream release
 
   [ Kenshi Muto ]
+  * 00_r6052: Apply SVN r6052 to pass the compile with libpaper.
   * provides /etc/pam.d/cupsys correctly. (closes: #392142)
     (renamed debian/pam to debian/cupsys.pam)
 

Added: cupsys/branches/cups-1.2/debian/patches/00_r6052.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/00_r6052.dpatch	Sat Oct 21 03:09:30 2006
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_r6052.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.5~/CHANGES.txt cupsys-1.2.5/CHANGES.txt
+--- cupsys-1.2.5~/CHANGES.txt	2006-10-20 15:07:21.000000000 +0000
++++ cupsys-1.2.5/CHANGES.txt	2006-10-21 01:54:16.000000000 +0000
+@@ -1,6 +1,11 @@
+ CHANGES.txt - 2006-10-20
+ ------------------------
+ 
++CHANGES IN CUPS V1.2.6
++
++	- Fixed a compile error when using libpaper.
++
++
+ CHANGES IN CUPS V1.2.5
+ 
+ 	- Documentation updates (STR #2038)
+diff -urNad cupsys-1.2.5~/config-scripts/cups-common.m4 cupsys-1.2.5/config-scripts/cups-common.m4
+--- cupsys-1.2.5~/config-scripts/cups-common.m4	2006-10-20 15:11:40.000000000 +0000
++++ cupsys-1.2.5/config-scripts/cups-common.m4	2006-10-21 01:54:40.000000000 +0000
+@@ -29,7 +29,7 @@
+ AC_CONFIG_HEADER(config.h)
+ 
+ dnl Versio number information...
+-CUPS_VERSION=1.2.5
++CUPS_VERSION=1.2.6
+ CUPS_REVISION=
+ if test -z "$CUPS_REVISION" -a -d .svn; then
+ 	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+diff -urNad cupsys-1.2.5~/cups/cups.h cupsys-1.2.5/cups/cups.h
+--- cupsys-1.2.5~/cups/cups.h	2006-09-29 12:57:31.000000000 +0000
++++ cupsys-1.2.5/cups/cups.h	2006-10-21 01:54:16.000000000 +0000
+@@ -61,10 +61,10 @@
+  * Constants...
+  */
+ 
+-#  define CUPS_VERSION		1.0205
++#  define CUPS_VERSION		1.0206
+ #  define CUPS_VERSION_MAJOR	1
+ #  define CUPS_VERSION_MINOR	2
+-#  define CUPS_VERSION_PATCH	5
++#  define CUPS_VERSION_PATCH	6
+ #  define CUPS_DATE_ANY		-1
+ 
+ 
+diff -urNad cupsys-1.2.5~/scheduler/ipp.c cupsys-1.2.5/scheduler/ipp.c
+--- cupsys-1.2.5~/scheduler/ipp.c	2006-10-12 19:19:47.000000000 +0000
++++ cupsys-1.2.5/scheduler/ipp.c	2006-10-21 01:54:16.000000000 +0000
+@@ -4020,14 +4020,14 @@
+     if ((!strcmp(system_paper, "Letter") && have_letter) ||
+         (!strcmp(system_paper, "A4") && have_a4))
+     {
+-      num_defaults = ppd_add_default("PageSize", system_paper, 
+-				     num_defaults, &defaults);
+-      num_defaults = ppd_add_default("PageRegion", system_paper, 
+-				     num_defaults, &defaults);
+-      num_defaults = ppd_add_default("PaperDimension", system_paper, 
+-				     num_defaults, &defaults);
+-      num_defaults = ppd_add_default("ImageableArea", system_paper, 
+-				     num_defaults, &defaults);
++      num_defaults = cupsAddOption("PageSize", system_paper, 
++				   num_defaults, &defaults);
++      num_defaults = cupsAddOption("PageRegion", system_paper, 
++				   num_defaults, &defaults);
++      num_defaults = cupsAddOption("PaperDimension", system_paper, 
++				   num_defaults, &defaults);
++      num_defaults = cupsAddOption("ImageableArea", system_paper, 
++				   num_defaults, &defaults);
+     }
+   }
+ #endif /* HAVE_LIBPAPER */

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 Oct 21 03:09:30 2006
@@ -1,3 +1,4 @@
+00_r6052.dpatch
 02_configure.dpatch
 #03_manext.dpatch
 03_clean.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 Oct 21 03:09:30 2006
@@ -42,7 +42,11 @@
 	-rm cups-config cups.list conf/cupsd.conf conf/pam.conf
 	-rm config.log config.h config.cache config.status Makedefs cups.sh
 	-rmdir --ignore-fail-on-non-empty debian/patched
-	-rm -f doc/es/index.html doc/ja/index.html man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man man/cupsd.conf.man man/lpoptions.man templates/ja/header.tmpl templates/es/header.tmpl templates/header.tmpl init/cups.sh init/cups-lpd
+	-rm -f man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man man/cupsd.conf.man man/lpoptions.man templates/header.tmpl templates/edit-config.tmpl init/cups.sh init/cups-lpd
+	-for l in de es et ja pl sv; do \
+	  rm -f doc/$l/index.html; \
+	  rm -f templates/$l/header.tmpl templates/$l/edit-config.tmpl; \
+	done
 
 common-install-prehook-impl::
 	(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))