[23405] in Source-Commits
/svn/athena r23059 - in trunk/debathena/config: cupsys-config/debian cupsys-hack/debian printing-config/debian
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Sun Jul 6 22:19:01 2008
Date: Sun, 6 Jul 2008 22:18:26 -0400 (EDT)
From: broder@MIT.EDU
Message-Id: <200807070218.WAA28027@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2008-07-06 22:18:25 -0400 (Sun, 06 Jul 2008)
New Revision: 23059
Modified:
trunk/debathena/config/cupsys-config/debian/changelog
trunk/debathena/config/cupsys-config/debian/control
trunk/debathena/config/cupsys-config/debian/control.in
trunk/debathena/config/cupsys-hack/debian/changelog
trunk/debathena/config/cupsys-hack/debian/control
trunk/debathena/config/cupsys-hack/debian/control.in
trunk/debathena/config/printing-config/debian/changelog
trunk/debathena/config/printing-config/debian/control
trunk/debathena/config/printing-config/debian/control.in
Log:
Handle the rename of cupsys to cups in all CUPS-related Debian packages in
debathena-cupsys-config, debathena-cupsys-hack, and debathena-printing-config.
Modified: trunk/debathena/config/cupsys-config/debian/changelog
===================================================================
--- trunk/debathena/config/cupsys-config/debian/changelog 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/cupsys-config/debian/changelog 2008-07-07 02:18:25 UTC (rev 23059)
@@ -1,3 +1,9 @@
+debathena-cupsys-config (1.3) unstable; urgency=low
+
+ * More changes to handle the rename of cupsys to cups in Lenny.
+
+ -- Evan Broder <broder@mit.edu> Sun, 06 Jul 2008 22:14:24 -0400
+
debathena-cupsys-config (1.2) unstable; urgency=low
* Handle rename of cupsys to cups in Debian sid.
Modified: trunk/debathena/config/cupsys-config/debian/control
===================================================================
--- trunk/debathena/config/cupsys-config/debian/control 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/cupsys-config/debian/control 2008-07-07 02:18:25 UTC (rev 23059)
@@ -2,12 +2,12 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~), cupsys, debathena-cupsys-hack
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~), cups | cupsys, debathena-cupsys-hack
Standards-Version: 3.7.2
Package: debathena-cupsys-config
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, cupsys, cupsys-bsd
+Depends: ${shlibs:Depends}, ${misc:Depends}, cups | cupsys, cups-bsd | cupsys-bsd
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: CUPS configuration for Debian-Athena
Modified: trunk/debathena/config/cupsys-config/debian/control.in
===================================================================
--- trunk/debathena/config/cupsys-config/debian/control.in 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/cupsys-config/debian/control.in 2008-07-07 02:18:25 UTC (rev 23059)
@@ -2,12 +2,12 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, cupsys, debathena-cupsys-hack
+Build-Depends: @cdbs@, cups | cupsys, debathena-cupsys-hack
Standards-Version: 3.7.2
Package: debathena-cupsys-config
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, cupsys, cupsys-bsd
+Depends: ${shlibs:Depends}, ${misc:Depends}, cups | cupsys, cups-bsd | cupsys-bsd
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: CUPS configuration for Debian-Athena
Modified: trunk/debathena/config/cupsys-hack/debian/changelog
===================================================================
--- trunk/debathena/config/cupsys-hack/debian/changelog 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/cupsys-hack/debian/changelog 2008-07-07 02:18:25 UTC (rev 23059)
@@ -1,3 +1,9 @@
+debathena-cupsys-hack (1.1) unstable; urgency=low
+
+ * Handle rename of cupsys to cups in Debian sid.
+
+ -- Evan Broder <broder@mit.edu> Sun, 06 Jul 2008 22:17:09 -0400
+
debathena-cupsys-hack (1.0) unstable; urgency=low
* Initial Release.
Modified: trunk/debathena/config/cupsys-hack/debian/control
===================================================================
--- trunk/debathena/config/cupsys-hack/debian/control 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/cupsys-hack/debian/control 2008-07-07 02:18:25 UTC (rev 23059)
@@ -7,7 +7,7 @@
Package: debathena-cupsys-hack
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, cupsys
+Depends: ${shlibs:Depends}, ${misc:Depends}, cups | cupsys
Description: Make /etc/cups/cupsd.conf world-readable
This package makes /etc/cups/cupsd.conf world-readable so that it can be used
for other packages.
Modified: trunk/debathena/config/cupsys-hack/debian/control.in
===================================================================
--- trunk/debathena/config/cupsys-hack/debian/control.in 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/cupsys-hack/debian/control.in 2008-07-07 02:18:25 UTC (rev 23059)
@@ -7,7 +7,7 @@
Package: debathena-cupsys-hack
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, cupsys
+Depends: ${shlibs:Depends}, ${misc:Depends}, cups | cupsys
Description: Make /etc/cups/cupsd.conf world-readable
This package makes /etc/cups/cupsd.conf world-readable so that it can be used
for other packages.
Modified: trunk/debathena/config/printing-config/debian/changelog
===================================================================
--- trunk/debathena/config/printing-config/debian/changelog 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/printing-config/debian/changelog 2008-07-07 02:18:25 UTC (rev 23059)
@@ -1,3 +1,9 @@
+debathena-printing-config (1.1) unstable; urgency=low
+
+ * Handle rename of cupsys to cups in Debian sid.
+
+ -- Evan Broder <broder@mit.edu> Sun, 06 Jul 2008 22:15:17 -0400
+
debathena-printing-config (1.0) unstable; urgency=low
* Initial Release.
Modified: trunk/debathena/config/printing-config/debian/control
===================================================================
--- trunk/debathena/config/printing-config/debian/control 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/printing-config/debian/control 2008-07-07 02:18:25 UTC (rev 23059)
@@ -7,7 +7,7 @@
Package: debathena-printing-config
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-cupsys-config, debathena-hesiod-config, debathena-lprng-config, debathena-lprng, cupsys-bsd, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-cupsys-config, debathena-hesiod-config, debathena-lprng-config, debathena-lprng, cups-bsd | cupsys-bsd, python
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Printing configuration for Debian-Athena
Modified: trunk/debathena/config/printing-config/debian/control.in
===================================================================
--- trunk/debathena/config/printing-config/debian/control.in 2008-07-06 18:53:22 UTC (rev 23058)
+++ trunk/debathena/config/printing-config/debian/control.in 2008-07-07 02:18:25 UTC (rev 23059)
@@ -7,7 +7,7 @@
Package: debathena-printing-config
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-cupsys-config, debathena-hesiod-config, debathena-lprng-config, debathena-lprng, cupsys-bsd, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-cupsys-config, debathena-hesiod-config, debathena-lprng-config, debathena-lprng, cups-bsd | cupsys-bsd, python
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Printing configuration for Debian-Athena
