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

[Kenshi Muto]

Author: kmuto
Date: Tue Apr 11 11:35:23 2006
New Revision: 128

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/44_fixconfdirperms.dpatch
Log:
targets 1.2rc2

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Tue Apr 11 11:35:23 2006
@@ -1,20 +1,11 @@
-cupsys (1.1.99.rc1-1) UNRELEASED-experimental; urgency=low
+cupsys (1.1.99.rc2-1) UNRELEASED-experimental; urgency=low
 
   TODO:
-    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.
-
   - /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.
+    removed from upstream. Should we care them?
 
   [ Kenshi Muto ]
+  * New upstream release 1.2RC2.
   * Enable LDAP support.
   * Remove duplicated update-rc.d (closes: #356911)
   * Stopped asking admin password because it works only if user chooses
@@ -22,9 +13,9 @@
     PAM and basic authentication.
   * Enable dbus support.
   * 03_clean.dpatch: Remove produced and remained files during build.
+  * Use 'lp' for CUPS system group instead of 'lpadmin'.
 
   [ Martin Pitt ]
-  * New upstream release 1.2RC1.
   * debian/patches/48_stdlib.dpatch: Adapted to new upstream version.
   * debian/cupsys.init.d:
     - Fix arguments of start-stop-daemon and remove the hideous kill
@@ -43,7 +34,7 @@
   * debian/patches/09_runasuser_fixes.dpatch: Remove group handling bits,
     since RunAsUser was dropped upstream.
 
- -- Martin Pitt <mpitt at debian.org>  Wed,  5 Apr 2006 16:16:06 +0200
+ -- Kenshi Muto <kmuto at debian.org>  Tue, 11 Apr 2006 11:25:45 +0000
 
 cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/patches/44_fixconfdirperms.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/44_fixconfdirperms.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/44_fixconfdirperms.dpatch	Tue Apr 11 11:35:23 2006
@@ -5,23 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys~/scheduler/conf.c cupsys/scheduler/conf.c
---- cupsys~/scheduler/conf.c	2006-04-05 12:36:09.000000000 +0200
-+++ cupsys/scheduler/conf.c	2006-04-05 12:40:14.000000000 +0200
-@@ -338,10 +338,10 @@
-   endpwent();
- 
-  /*
--  * Find the default group (nobody)...
-+  * Find the default group...
-   */
- 
--  group = getgrnam("nobody");
-+  group = getgrnam(CUPS_DEFAULT_GROUP);
-   endgrent();
- 
-   if (group != NULL)
-@@ -518,22 +518,10 @@
+diff -urNad cupsys-1.1.99.rc2~/scheduler/conf.c cupsys-1.1.99.rc2/scheduler/conf.c
+--- cupsys-1.1.99.rc2~/scheduler/conf.c	2006-04-06 20:03:32.000000000 +0000
++++ cupsys-1.1.99.rc2/scheduler/conf.c	2006-04-11 10:35:14.000000000 +0000
+@@ -531,22 +531,10 @@
  
        cupsdLogMessage(CUPSD_LOG_NOTICE,
                        "Group and SystemGroup cannot use the same groups!");
@@ -46,7 +33,7 @@
      }
    }
  
-@@ -617,11 +605,13 @@
+@@ -630,11 +618,13 @@
    check_permissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
                      SystemGroupIDs[0], 1, 1);