[Pkg-cups-devel] r431 - in cupsys/branches/cups-1.2-ubuntu/debian: . local

[Martin Pitt]

Author: mpitt
Date: Wed Feb  7 13:17:03 2007
New Revision: 431

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing
Log:
* debian/local/enable_sharing: Fix regex to find both 127.0.0.1 and
  'localhost' to fix enabling sharing the second time. Closes: LP#75903

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Wed Feb  7 13:17:03 2007
@@ -1,3 +1,10 @@
+cupsys (1.2.7-4ubuntu2) feisty; urgency=low
+
+  * debian/local/enable_sharing: Fix regex to find both 127.0.0.1 and
+    'localhost' to fix enabling sharing the second time. Closes: LP#75903
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Wed,  7 Feb 2007 13:15:45 +0100
+
 cupsys (1.2.7-4ubuntu1) feisty; urgency=low
 
   * Merge from debian unstable, remaining changes:

Modified: cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing	Wed Feb  7 13:17:03 2007
@@ -50,7 +50,7 @@
 if [ $1 = 0 ]; then
 	sed -ri "s/^[[:space:]]*(Port|Listen)[[:space:]]+631\\>/Listen 127.0.0.1:631/i" $CONF
 else
-	sed -ri "s/^[[:space:]]*Listen[[:space:]]+localhost:631\\>/Listen 631/i" $CONF
+	sed -ri "s/^[[:space:]]*Listen[[:space:]]+(127.0.0.1|localhost):631\\>/Listen 631/i" $CONF
 fi