[SVN] r504 - in /trunk/cyrus-imapd-2.2.13/debian: changelog rules

[debian at incase.de]

Author: sven
Date: Wed Jul 19 23:36:59 2006
New Revision: 504

URL: https://mail.incase.de/viewcvs?rev=504&root=cyrus22&view=rev
Log:
Generate a meaningful cyrus-db-types.txt again

Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/rules

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=504&root=cyrus22&r1=503&r2=504&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Wed Jul 19 23:36:59 2006
@@ -4,8 +4,10 @@
     (Closes: #378519)
   * Add --no-create-home to adduser arguments in cyrus-common2.2's
     postinst script. (Closes: #378518)
-
- -- Sven Mueller <sven at debian.org>  Tue, 18 Jul 2006 15:45:49 +0200
+  * Modify debian/rules to once again create a meaningful
+    cyrus-db-types.txt file (Closes: #366957)
+
+ -- Sven Mueller <sven at debian.org>  Wed, 19 Jul 2006 23:01:58 +0200
 
 cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
 

Modified: trunk/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/rules?rev=504&root=cyrus22&r1=503&r2=504&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/rules (original)
+++ trunk/cyrus-imapd-2.2.13/debian/rules Wed Jul 19 23:36:59 2006
@@ -122,9 +122,11 @@
 	# store database configuration for possible automatic
 	# upgrading later
 	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
-	grep -E 'CONFIG_DB_[A-Z]+[[:space:]]+[(]' config.h |\
-	  sed -e 's/&cyrusdb_//' -e 's/.*CONFIG_DB_//' -e 's/(//' -e 's/)//' \
-	  >>debian/cyrus-db-types.txt
+	grep _db lib/imapoptions \
+	| cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$//' \
+	| sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\
+	| awk '{printf("%s %s\n",toupper($1),$2);}' \
+	>>debian/cyrus-db-types.txt
 	mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \
 	&& sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \
 	&& rm debian/cyrus-db-types.txt.old