[24366] in Source-Commits
/svn/athena r23964 - in trunk/debathena/config: . ldap-cups-config ldap-cups-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Fri Aug 14 01:47:00 2009
Date: Fri, 14 Aug 2009 01:46:44 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200908140546.n7E5kirX002467@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-08-14 01:46:44 -0400 (Fri, 14 Aug 2009)
New Revision: 23964
Added:
trunk/debathena/config/ldap-cups-config/
Modified:
trunk/debathena/config/ldap-cups-config/debian/changelog
trunk/debathena/config/ldap-cups-config/debian/control.in
trunk/debathena/config/ldap-cups-config/debian/copyright
trunk/debathena/config/ldap-cups-config/debian/postinst
trunk/debathena/config/ldap-cups-config/debian/rules
trunk/debathena/config/ldap-cups-config/debian/transform_cupsd.conf.debathena
Log:
In ldap-cups-config:
* Fork debathena-cupsys-config for testing of Server Operations' new
LDAP-based CUPS queue discovery.
Copied: trunk/debathena/config/ldap-cups-config (from rev 23962, trunk/debathena/config/cupsys-config)
Property changes on: trunk/debathena/config/ldap-cups-config
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/debathena/config/ldap-cups-config/debian/changelog
===================================================================
--- trunk/debathena/config/cupsys-config/debian/changelog 2009-08-13 06:03:10 UTC (rev 23962)
+++ trunk/debathena/config/ldap-cups-config/debian/changelog 2009-08-14 05:46:44 UTC (rev 23964)
@@ -1,3 +1,10 @@
+debathena-ldap-cups-config (1.0) unstable; urgency=low
+
+ * Fork debathena-cupsys-config for testing of Server Operations' new
+ LDAP-based CUPS queue discovery.
+
+ -- Evan Broder <broder@mit.edu> Thu, 13 Aug 2009 22:33:54 -0700
+
debathena-cupsys-config (1.6) unstable; urgency=low
* Revert version 1.5. Browsing is, in fact, needed to make BrowsePoll
Modified: trunk/debathena/config/ldap-cups-config/debian/control.in
===================================================================
--- trunk/debathena/config/cupsys-config/debian/control.in 2009-08-13 06:03:10 UTC (rev 23962)
+++ trunk/debathena/config/ldap-cups-config/debian/control.in 2009-08-14 05:46:44 UTC (rev 23964)
@@ -1,14 +1,15 @@
-Source: debathena-cupsys-config
+Source: debathena-ldap-cups-config
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: @cdbs@, debathena-cups, debathena-cupsys-hack
Standards-Version: 3.7.2
-Package: debathena-cupsys-config
+Package: debathena-ldap-cups-config
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, cups | cupsys, cups-bsd | cupsys-bsd
-Provides: ${diverted-files}
-Conflicts: ${diverted-files}
-Description: CUPS configuration for Debathena
- This package configures CUPS to use the cups.mit.edu CUPS server
+Provides: ${diverted-files}, debathena-cupsys-config
+Conflicts: ${diverted-files}, debathena-cupsys-config
+Description: LDAP-based CUPS configuration for Debathena
+ This package configures CUPS to use LDAP-based printer discovery with
+ printers.mit.edu.
Modified: trunk/debathena/config/ldap-cups-config/debian/copyright
===================================================================
--- trunk/debathena/config/cupsys-config/debian/copyright 2009-08-13 06:03:10 UTC (rev 23962)
+++ trunk/debathena/config/ldap-cups-config/debian/copyright 2009-08-14 05:46:44 UTC (rev 23964)
@@ -5,7 +5,7 @@
The source code was obtained from the Athena SVN repository at
<svn://debathena.mit.edu/athena/trunk>, and is licensed as follows:
- Copyright © 2008 Evan Broder
+ Copyright © 2009 Evan Broder
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -27,5 +27,5 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-The Debian packaging is Copyright © 2007-2008 Tim Abbott and Anders
-Kaseorg, and has the same license as the original software.
+The Debian packaging is Copyright © 2009 Evan Broder, and has the same
+license as the original software.
Modified: trunk/debathena/config/ldap-cups-config/debian/postinst
===================================================================
--- trunk/debathena/config/cupsys-config/debian/postinst 2009-08-13 06:03:10 UTC (rev 23962)
+++ trunk/debathena/config/ldap-cups-config/debian/postinst 2009-08-14 05:46:44 UTC (rev 23964)
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for debathena-cupsys-config
+# postinst script for debathena-ldap-cups-config
#
# see: dh_installdeb(1)
Modified: trunk/debathena/config/ldap-cups-config/debian/rules
===================================================================
--- trunk/debathena/config/cupsys-config/debian/rules 2009-08-13 06:03:10 UTC (rev 23962)
+++ trunk/debathena/config/ldap-cups-config/debian/rules 2009-08-14 05:46:44 UTC (rev 23964)
@@ -2,7 +2,7 @@
DEB_DIVERT_EXTENSION = .debathena
-DEB_TRANSFORM_FILES_debathena-cupsys-config += \
+DEB_TRANSFORM_FILES_debathena-ldap-cups-config += \
/etc/cups/cupsd.conf.debathena
ifneq ($(wildcard /etc/cups/cupsd.conf.default),)
DEB_CHECK_FILES_SOURCE_/etc/cups/cupsd.conf.debathena = \
Modified: trunk/debathena/config/ldap-cups-config/debian/transform_cupsd.conf.debathena
===================================================================
--- trunk/debathena/config/cupsys-config/debian/transform_cupsd.conf.debathena 2009-08-13 06:03:10 UTC (rev 23962)
+++ trunk/debathena/config/ldap-cups-config/debian/transform_cupsd.conf.debathena 2009-08-14 05:46:44 UTC (rev 23964)
@@ -1,7 +1,13 @@
#!/usr/bin/perl -0p
s/^\s*#?\s*Browsing.*$//m;
s/$/\nBrowsing On/ or die;
-s/^\s*#?\s*BrowseProtocols.*$//m;
-s/$/\nBrowseProtocols cups/ or die;
-s/^\s*#?\s*BrowsePoll.*$//m;
-s/$/\nBrowsePoll cups.mit.edu/ or die;
+
+END {
+ print <<EOF;
+BrowseRemoteProtocols LDAP
+BrowseLDAPServer ldap://printers.mit.edu:389
+BrowseLDAPDN dc=MIT, dc=EDU
+BrowseInterval 600
+BrowseTimeout 1200
+EOF
+}
