[Pkg-citadel-commit] r351 - in citadel: tags/7.50-2~bpo50+1/debian trunk/debian

[Michael Meskes]

Author: meskes
Date: 2009-04-29 13:39:10 +0000 (Wed, 29 Apr 2009)
New Revision: 351

Modified:
   citadel/tags/7.50-2~bpo50+1/debian/changelog
   citadel/tags/7.50-2~bpo50+1/debian/citadel-server.config
   citadel/trunk/debian/changelog
   citadel/trunk/debian/citadel-server.config
Log:
Changed reconfigure detection in debconf config script


Modified: citadel/tags/7.50-2~bpo50+1/debian/changelog
===================================================================
--- citadel/tags/7.50-2~bpo50+1/debian/changelog	2009-04-29 11:18:51 UTC (rev 350)
+++ citadel/tags/7.50-2~bpo50+1/debian/changelog	2009-04-29 13:39:10 UTC (rev 351)
@@ -1,6 +1,8 @@
 citadel (7.50-2~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
+  * Fixed query in citadel-server.config that got confused by our bpo version
+    number.
 
  -- Michael Meskes <meskes at debian.org>  Wed, 29 Apr 2009 11:52:56 +0200
 

Modified: citadel/tags/7.50-2~bpo50+1/debian/citadel-server.config
===================================================================
--- citadel/tags/7.50-2~bpo50+1/debian/citadel-server.config	2009-04-29 11:18:51 UTC (rev 350)
+++ citadel/tags/7.50-2~bpo50+1/debian/citadel-server.config	2009-04-29 13:39:10 UTC (rev 351)
@@ -12,9 +12,7 @@
 
 if test -n "$2"; then
 # do we want to reconfigure?
-    if test "`echo $2 | sed -e 's/[.-]//g' -e 's;ubuntu;;'`" -lt 127 \
-	-o "$1" = reconfigure
-	then
+    if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
 	DO_CONFIGURE=yes
     fi
 else 

Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2009-04-29 11:18:51 UTC (rev 350)
+++ citadel/trunk/debian/changelog	2009-04-29 13:39:10 UTC (rev 351)
@@ -1,3 +1,9 @@
+citadel (7.50-3) UNRELEASED; urgency=low
+
+  * Integrated fixed debconf config from backport.
+
+ -- Michael Meskes <meskes at debian.org>  Wed, 29 Apr 2009 15:38:05 +0200
+
 citadel (7.50-2) unstable; urgency=low
 
   [ Michael Meskes ]

Modified: citadel/trunk/debian/citadel-server.config
===================================================================
--- citadel/trunk/debian/citadel-server.config	2009-04-29 11:18:51 UTC (rev 350)
+++ citadel/trunk/debian/citadel-server.config	2009-04-29 13:39:10 UTC (rev 351)
@@ -12,9 +12,7 @@
 
 if test -n "$2"; then
 # do we want to reconfigure?
-    if test "`echo $2 | sed -e 's/[.-]//g' -e 's;ubuntu;;'`" -lt 127 \
-	-o "$1" = reconfigure
-	then
+    if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
 	DO_CONFIGURE=yes
     fi
 else