[23363] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r23017 - trunk/debathena/third/lprng

daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Mon Jun 9 13:16:36 2008

Date: Mon, 9 Jun 2008 13:11:37 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200806091711.NAA01594@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: ghudson
Date: 2008-06-09 13:11:36 -0400 (Mon, 09 Jun 2008)
New Revision: 23017

Modified:
   trunk/debathena/third/lprng/debathenify-lprng
Log:
In debathenify-lprng, remove the provides and conflicts for "lpr";
otherwise we will still have a conflict with cupsys-bsd.


Modified: trunk/debathena/third/lprng/debathenify-lprng
===================================================================
--- trunk/debathena/third/lprng/debathenify-lprng	2008-06-09 16:01:29 UTC (rev 23016)
+++ trunk/debathena/third/lprng/debathenify-lprng	2008-06-09 17:11:36 UTC (rev 23017)
@@ -2,13 +2,15 @@
 set -e
 
 name=lprng
-daversionappend=debathena2
+daversionappend=debathena3
 
 hack_package () {
-    # Rename the package and make it not conflict with cupsys-bsd.
+    # Rename the package and make it not conflict with lpr or cupsys-bsd.
     perl -pe 's/^Package: lprng$/Package: debathena-lprng/' -i debian/control
+    perl -ne '/^Provides: lpr$/ || print;' -i debian/control
+    perl -pe '/^Conflicts/ && s/lpr, //' -i debian/control
     perl -pe '/^Conflicts/ && s/cupsys-bsd/lprng/' -i debian/control
-    perl -pe '/^Replaces/ && s/$/, lprng/' -i debian/control
+    perl -pe '/^Replaces/ && s/lpr/lprng/' -i debian/control
 
     perl -n -i - debian/rules << 'EOS'
 	if (/^build:/) {


home help back first fref pref prev next nref lref last post