[25980] in Source-Commits
/svn/athena r25332 - trunk/debathena/config/cupsys-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Jul 30 16:47:40 2011
Date: Sat, 30 Jul 2011 16:47:34 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107302047.p6UKlYgo026321@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-30 16:47:34 -0400 (Sat, 30 Jul 2011)
New Revision: 25332
Modified:
trunk/debathena/config/cupsys-config/debian/changelog
trunk/debathena/config/cupsys-config/debian/control.in
trunk/debathena/config/cupsys-config/debian/prerm
Log:
In cupsys-config:
* Bump Conflicts statement for new cluster-cups-config
* Fix prerm syntax
Modified: trunk/debathena/config/cupsys-config/debian/changelog
===================================================================
--- trunk/debathena/config/cupsys-config/debian/changelog 2011-07-30 20:13:43 UTC (rev 25331)
+++ trunk/debathena/config/cupsys-config/debian/changelog 2011-07-30 20:47:34 UTC (rev 25332)
@@ -1,3 +1,10 @@
+debathena-cupsys-config (1.15) unstable; urgency=low
+
+ * Bump Conflicts statement for new cluster-cups-config
+ * Fix prerm syntax
+
+ -- Jonathan Reed <jdreed@mit.edu> Sat, 30 Jul 2011 16:47:19 -0400
+
debathena-cupsys-config (1.14) unstable; urgency=low
[ Geoffrey Thomas ]
Modified: trunk/debathena/config/cupsys-config/debian/control.in
===================================================================
--- trunk/debathena/config/cupsys-config/debian/control.in 2011-07-30 20:13:43 UTC (rev 25331)
+++ trunk/debathena/config/cupsys-config/debian/control.in 2011-07-30 20:47:34 UTC (rev 25332)
@@ -9,8 +9,8 @@
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, cups | cupsys, cups-bsd | cupsys-bsd, hpijs
Provides: ${diverted-files}, debathena-cluster-cups-config
-Conflicts: ${diverted-files}, debathena-cluster-cups-config (<= 2.0.3)
-Replaces: debathena-cluster-cups-config (<= 2.0.3)
+Conflicts: ${diverted-files}, debathena-cluster-cups-config (<= 2.0.4)
+Replaces: debathena-cluster-cups-config (<= 2.0.4)
Description: CUPS configuration for Debathena
This package configures centralized MIT printing. It doesn't
actually change the CUPS configuration anymore; the name is
Modified: trunk/debathena/config/cupsys-config/debian/prerm
===================================================================
--- trunk/debathena/config/cupsys-config/debian/prerm 2011-07-30 20:13:43 UTC (rev 25331)
+++ trunk/debathena/config/cupsys-config/debian/prerm 2011-07-30 20:47:34 UTC (rev 25332)
@@ -24,9 +24,7 @@
case "$1" in
remove|deconfigure)
- if [ -z "$2" ]; then
- /usr/lib/debathena-cupsys-config/configure-athena-printers remove
- fi
+ /usr/lib/debathena-cupsys-config/configure-athena-printers remove
;;
upgrade)
