[Pkg-dspam-commits] [pkg-dspam-commits] r254 - in branches/development/debian: . manpages patches sqlfiles/upgrade/mysql

Julien Valroff julien-guest at alioth.debian.org
Sat Jul 17 06:20:13 UTC 2010 

Author: julien-guest
Date: Sat Jul 17 06:20:11 2010
New Revision: 254

Log:
Prepare for 3.9.1

Added:
   branches/development/debian/sqlfiles/upgrade/mysql/3.9.1
Deleted:
   branches/development/debian/manpages/dspam_maintenance.1
Modified:
   branches/development/debian/changelog
   branches/development/debian/control
   branches/development/debian/dspam.default
   branches/development/debian/dspam.manpages
   branches/development/debian/libdspam7-drv-mysql.postinst
   branches/development/debian/patches/002_dspam-webfrontend-config-debian.diff
   branches/development/debian/patches/008_where-to-find-txt-files.diff
   branches/development/debian/rules
   branches/development/debian/split-config.sh

Modified: branches/development/debian/changelog
==============================================================================
--- branches/development/debian/changelog	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/changelog	Sat Jul 17 06:20:11 2010	(r254)
@@ -1,4 +1,4 @@
-dspam (3.9.0+git20100420-1) experimental; urgency=low
+dspam (3.9.0+git20100615-4) stable; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.
@@ -25,7 +25,7 @@
   * New upstream release
     (Closes: #418736, #491387, #505010, #514498, #577661)
   * Acknowledge NMU's (Closes: #541982, #517279, #522645)
-  * Bump Standards to 3.8.4:
+  * Bump Standards to 3.9.0:
     - Add README.source, as per Debian Policy Manual 4.14
   * Bump debhelper compatibility to 7
   * Update/remove patches for new release
@@ -87,7 +87,7 @@
   * Only ships SQL files for MySQL >= 4.1 as no older version is available
     in Debian
 
- -- Julien Valroff <julien at kirya.net>  Tue, 20 Apr 2010 18:43:04 +0200
+ -- Julien Valroff <julien at kirya.net>  Sun, 09 May 2010 09:19:18 +0200
 
 dspam (3.6.8-9.3) unstable; urgency=low
 

Modified: branches/development/debian/control
==============================================================================
--- branches/development/debian/control	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/control	Sat Jul 17 06:20:11 2010	(r254)
@@ -17,7 +17,7 @@
                libmysqlclient-dev,
                libsqlite3-dev,
                libldap2-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://dspam.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/pkg-dspam/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-dspam/

Modified: branches/development/debian/dspam.default
==============================================================================
--- branches/development/debian/dspam.default	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/dspam.default	Sat Jul 17 06:20:11 2010	(r254)
@@ -11,4 +11,4 @@
 
 # Options for dspam_maintenance script (daily cronjob)
 # See dspam_maintenance(1) for possible options
-MAINTENANCE_OPTIONS="--with-sql-optimization"
+MAINTENANCE_OPTIONS="--with-sql-autoupdate --with-sql-optimization"

Modified: branches/development/debian/dspam.manpages
==============================================================================
--- branches/development/debian/dspam.manpages	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/dspam.manpages	Sat Jul 17 06:20:11 2010	(r254)
@@ -1,6 +1,5 @@
 debian/manpages/dspam_2sql.1
 debian/manpages/dspamc.1
-debian/manpages/dspam_maintenance.1
 debian/manpages/cssclean.1
 debian/manpages/csscompress.1
 debian/manpages/cssconvert.1
@@ -14,3 +13,4 @@
 man/dspam_merge.1
 man/dspam_stats.1
 man/dspam_train.1
+contrib/dspam_maintenance/dspam_maintenance.1

Modified: branches/development/debian/libdspam7-drv-mysql.postinst
==============================================================================
--- branches/development/debian/libdspam7-drv-mysql.postinst	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/libdspam7-drv-mysql.postinst	Sat Jul 17 06:20:11 2010	(r254)
@@ -14,7 +14,7 @@
 dbc_generate_include=template:/etc/dspam/dspam.d/mysql.conf
 dbc_generate_include_owner="dspam"
 dbc_generate_include_perms="640"
-dbc_generate_include_args="-U -o template_infile='/usr/share/doc/libdspam7-drv-mysql/mysql.conf'"
+dbc_generate_include_args="-U -o template_infile='/etc/dspam/dspam.d/mysql.conf'"
 
 # Run dbconfig
 dbc_go libdspam7-drv-mysql $@

Modified: branches/development/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- branches/development/debian/patches/002_dspam-webfrontend-config-debian.diff	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/patches/002_dspam-webfrontend-config-debian.diff	Sat Jul 17 06:20:11 2010	(r254)
@@ -164,7 +164,7 @@
    while(<FILE>) {
      chomp;
      if ($_ !~ /^\s*#/) {
-@@ -1814,6 +1814,7 @@
+@@ -1821,6 +1821,7 @@
    my(%PREFS);
  
    my($FILE) = "$USER.prefs";
@@ -172,7 +172,7 @@
  
    if ($CONFIG{'PREFERENCES_EXTENSION'} == 1) {
      my $PREF_USER = $CURRENT_USER;
-@@ -1829,10 +1830,10 @@
+@@ -1836,10 +1837,10 @@
  
    if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
  

Modified: branches/development/debian/patches/008_where-to-find-txt-files.diff
==============================================================================
--- branches/development/debian/patches/008_where-to-find-txt-files.diff	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/patches/008_where-to-find-txt-files.diff	Sat Jul 17 06:20:11 2010	(r254)
@@ -4,7 +4,7 @@
 
 --- a/src/dspam.c
 +++ b/src/dspam.c
-@@ -1532,7 +1532,7 @@
+@@ -1534,7 +1534,7 @@
  
    time(&now);
  

Modified: branches/development/debian/rules
==============================================================================
--- branches/development/debian/rules	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/rules	Sat Jul 17 06:20:11 2010	(r254)
@@ -78,12 +78,9 @@
 	# dh_install does not support renaming
 	mv contrib/dspam_maintenance/dspam_maintenance.sh contrib/dspam_maintenance/dspam_maintenance
 
+	# split the main configuration file into snippets 
+	cp src/dspam.conf.in src/dspam.conf.in.orig
 	./debian/split-config.sh
-	#for foo in Hash=hash ExtLookup=extlookup SQLite=sqlite MySQL=mysql PostgreSQL=pgsql; do \
-	#	( shell sed -n -e "/^#[\t ]\{1,99\}\-\{2,3\}[\t ]\{1,99\}${foo%=*}[\t ]\{1,99\}\-\{2,3\}[\t ]*$/,/^#[\t ]\{1,99\}\-\{2,3\}[\t ]\{1,99\}[^-]\{1,99\}\-\{2,3\}[\t ]*$/p" src/dspam.conf.in > debian/config/${foo#*=}.conf ); \
-	#	( shell sed -i -e '$d' debian/config/${foo#*=}.conf ); \
-	#done;
-
 
 # Build target.
 build: build-stamp
@@ -104,11 +101,14 @@
 	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) maintainer-clean
 
+	[ ! -f contrib/dspam_maintenance/dspam_maintenance ] || mv contrib/dspam_maintenance/dspam_maintenance contrib/dspam_maintenance/dspam_maintenance.sh
+
 	# Remove DB schemas
 	rm -f debian/sqlfiles/pgsql debian/sqlfiles/mysql
 
 	# Remove splitted configuration files
 	rm -rf debian/config/*
+	[ ! -f src/dspam.conf.in.orig ] || mv src/dspam.conf.in.orig src/dspam.conf.in
 
 	dh_clean 
 

Modified: branches/development/debian/split-config.sh
==============================================================================
--- branches/development/debian/split-config.sh	Tue Apr 20 17:08:47 2010	(r253)
+++ branches/development/debian/split-config.sh	Sat Jul 17 06:20:11 2010	(r254)
@@ -1,7 +1,13 @@
 #!/bin/sh
+# Thanks to Stevan Bajić <stevan at bajic.ch> and Milan Straka <fox at ucw.cz>
+# for their great help on writing this script
+
+CONFIG_FILE="src/dspam.conf.in"
 
 for foo in Hash=hash ExtLookup=extlookup SQLite=sqlite MySQL=mysql PostgreSQL=pgsql;
 do
-        sed -n -e "/^#[\t ]\{1,99\}\-\{2,3\}[\t ]\{1,99\}${foo%=*}[\t ]\{1,99\}\-\{2,3\}[\t ]*$/,/^#[\t ]\{1,99\}\-\{2,3\}[\t ]\{1,99\}[^-]\{1,99\}\-\{2,3\}[\t ]*$/p" src/dspam.conf.in > debian/config/${foo#*=}.conf;
-        sed -i -e '$d' debian/config/${foo#*=}.conf;
+  first_line="/^#[\t ]\{1,\}-\{2,3\}[\t ]\{1,\}${foo%=*}[\t ]\{1,\}-\{2,3\}[\t ]*$/"
+  one_line_below="/^#[\t ]\{1,\}-\{2,3\}[\t ]\{1,\}[^-]\{1,\}-\{2,3\}[\t ]*$/"
+  sed -n -e "$first_line,$one_line_below {$one_line_below {$first_line!d}; p}" $CONFIG_FILE > debian/config/${foo#*=}.conf;
+  sed -i -e "$first_line,$one_line_below {$one_line_below {$first_line!p}; d}" $CONFIG_FILE
 done;

Added: branches/development/debian/sqlfiles/upgrade/mysql/3.9.1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/development/debian/sqlfiles/upgrade/mysql/3.9.1	Sat Jul 17 06:20:11 2010	(r254)
@@ -0,0 +1,12 @@
+ALTER TABLE `dspam_signature_data` CHANGE `signature` `signature` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
+ALTER TABLE `dspam_signature_data` DEFAULT CHARACTER SET latin1 COLLATE latin1_general_ci;
+ALTER TABLE `dspam_stats` DEFAULT CHARACTER SET latin1 COLLATE latin1_general_ci;
+ALTER TABLE `dspam_token_data` DEFAULT CHARACTER SET latin1 COLLATE latin1_general_ci;
+
+ALTER TABLE `dspam_preferences` CHANGE `preference` `preference` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
+ALTER TABLE `dspam_preferences` CHANGE `value` `value` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
+ALTER TABLE `dspam_preferences` DEFAULT CHARACTER SET latin1 COLLATE latin1_general_ci;
+
+ALTER TABLE `dspam_virtual_uids` CHANGE `username` `username` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;
+ALTER TABLE `dspam_virtual_uids` DEFAULT CHARACTER SET latin1 COLLATE latin1_general_ci;
+

More information about the Pkg-dspam-commits mailing list