[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.2+dfsg-3-24-g51b4611
Thomas Preud'homme
robotux at celest.fr
Wed May 29 14:04:03 UTC 2013
The following commit has been merged in the master branch:
commit cc955171fa3c43684ef3107f7dc5a30408559293
Author: Thomas Preud'homme <robotux at celest.fr>
Date: Wed May 29 12:41:50 2013 +0200
Drop elements for upgrade from pre-wheezy systems.
diff --git a/debian/changelog b/debian/changelog
index b122135..42fc344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dspam (3.10.2+dfsg-8) UNRELEASED; urgency=low
virtual package libdspam7-drv.
+ Remove useless libdspam7-drv virtual package.
+ Wrap lines to 80 characters.
+ * Drop elements for upgrade from pre-wheezy systems.
-- Thomas Preud'homme <robotux at debian.org> Tue, 05 Mar 2013 15:53:20 +0100
diff --git a/debian/control b/debian/control
index fe9d225..b4548d7 100644
--- a/debian/control
+++ b/debian/control
@@ -93,8 +93,6 @@ Package: libdspam7-drv-hash
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version})
-Replaces: dspam (<= 3.9.1~rc1+git20110514.347379b+dfsg-1)
-Breaks: dspam (<= 3.9.1~rc1+git20110514.347379b+dfsg-1)
Description: Hash backend for DSPAM anti-spam filter
DSPAM is a dedicated statistical filter with minimal resources. It includes
many new algorithms to fight against spam including:
diff --git a/debian/dspam-webfrontend.maintscript b/debian/dspam-webfrontend.maintscript
deleted file mode 100644
index 2a57b49..0000000
--- a/debian/dspam-webfrontend.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-rm_conffile /etc/dspam/dspam-apache.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2
-rm_conffile /etc/dspam/dspam-apache2.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2
diff --git a/debian/libdspam7-drv-mysql.dirs b/debian/libdspam7-drv-mysql.dirs
index e7ee9ae..fa33ad3 100644
--- a/debian/libdspam7-drv-mysql.dirs
+++ b/debian/libdspam7-drv-mysql.dirs
@@ -1,4 +1,3 @@
etc/dspam/dspam.d
usr/share/libdspam7-drv-mysql
usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
-usr/share/dbconfig-common/data/libdspam7-drv-mysql/upgrade
diff --git a/debian/libdspam7-drv-mysql.install.in b/debian/libdspam7-drv-mysql.install.in
index 9ee43ce..cb58384 100644
--- a/debian/libdspam7-drv-mysql.install.in
+++ b/debian/libdspam7-drv-mysql.install.in
@@ -1,5 +1,4 @@
debian/sqlfiles/install/mysql usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
-debian/sqlfiles/upgrade/mysql usr/share/dbconfig-common/data/libdspam7-drv-mysql/upgrade
usr/lib/@DEB_HOST_MULTIARCH@/dspam/libmysql_drv.so*
src/mysql.conf usr/share/libdspam7-drv-mysql
src/tools.mysql_drv/mysql_objects-4.1.sql usr/share/doc/libdspam7-drv-mysql/sql/
diff --git a/debian/libdspam7-drv-mysql.maintscript b/debian/libdspam7-drv-mysql.maintscript
deleted file mode 100644
index 68708c1..0000000
--- a/debian/libdspam7-drv-mysql.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/cron.daily/libdspam7-drv-mysql 3.9.1~rc1+git20110419.29261fb+dfsg-2
diff --git a/debian/libdspam7-drv-pgsql.dirs b/debian/libdspam7-drv-pgsql.dirs
index d357d44..d0eddf0 100644
--- a/debian/libdspam7-drv-pgsql.dirs
+++ b/debian/libdspam7-drv-pgsql.dirs
@@ -1,5 +1,4 @@
etc/dspam/dspam.d
usr/share/libdspam7-drv-pgsql
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
-usr/share/dbconfig-common/data/libdspam7-drv-pgsql/upgrade
usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin
diff --git a/debian/libdspam7-drv-pgsql.install.in b/debian/libdspam7-drv-pgsql.install.in
index 315bd4a..0d9fa02 100644
--- a/debian/libdspam7-drv-pgsql.install.in
+++ b/debian/libdspam7-drv-pgsql.install.in
@@ -1,6 +1,5 @@
debian/sqlfiles/install-dbadmin/pgsql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin
debian/sqlfiles/install/pgsql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
-debian/sqlfiles/upgrade/pgsql usr/share/dbconfig-common/data/libdspam7-drv-pgsql/upgrade
usr/lib/@DEB_HOST_MULTIARCH@/dspam/libpgsql_drv.so*
src/pgsql.conf usr/share/libdspam7-drv-pgsql
src/tools.pgsql_drv/pgsql_objects.sql usr/share/doc/libdspam7-drv-pgsql/sql/
diff --git a/debian/libdspam7-drv-sqlite3.maintscript b/debian/libdspam7-drv-sqlite3.maintscript
deleted file mode 100644
index 8edce28..0000000
--- a/debian/libdspam7-drv-sqlite3.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/cron.daily/libdspam7-drv-sqlite3 3.9.1~rc1+git20110419.29261fb+dfsg-2
diff --git a/debian/sqlfiles/upgrade/mysql/3.8 b/debian/sqlfiles/upgrade/mysql/3.8
deleted file mode 100644
index 9fae8cd..0000000
--- a/debian/sqlfiles/upgrade/mysql/3.8
+++ /dev/null
@@ -1,29 +0,0 @@
-ALTER TABLE `dspam_signature_data`
- CHANGE `uid` `uid` INT UNSIGNED NOT NULL,
- CHANGE `data` `data` LONGBLOB NOT NULL,
- CHANGE `length` `length` INT UNSIGNED NOT NULL;
-ALTER TABLE `dspam_stats`
- CHANGE `uid` `uid` INT UNSIGNED NOT NULL,
- CHANGE `spam_learned` `spam_learned` BIGINT UNSIGNED NOT NULL,
- CHANGE `innocent_learned` `innocent_learned` BIGINT UNSIGNED NOT NULL,
- CHANGE `spam_misclassified` `spam_misclassified` BIGINT UNSIGNED NOT NULL,
- CHANGE `innocent_misclassified` `innocent_misclassified` BIGINT UNSIGNED NOT NULL,
- CHANGE `spam_corpusfed` `spam_corpusfed` BIGINT UNSIGNED NOT NULL,
- CHANGE `innocent_corpusfed` `innocent_corpusfed` BIGINT UNSIGNED NOT NULL,
- CHANGE `spam_classified` `spam_classified` BIGINT UNSIGNED NOT NULL,
- CHANGE `innocent_classified` `innocent_classified` BIGINT UNSIGNED NOT NULL;
-ALTER TABLE `dspam_token_data`
- CHANGE `uid` `uid` INT UNSIGNED NOT NULL,
- CHANGE `spam_hits` `spam_hits` BIGINT UNSIGNED NOT NULL,
- CHANGE `innocent_hits` `innocent_hits` BIGINT UNSIGNED NOT NULL;
-
-ALTER TABLE `dspam_preferences`
- CHANGE `uid` `uid` INT UNSIGNED NOT NULL;
-
-ALTER TABLE `dspam_virtual_uids`
- CHANGE `uid` `uid` INT UNSIGNED NOT NULL AUTO_INCREMENT;
-
-ALTER TABLE `dspam_token_data`
- ADD INDEX(`spam_hits`),
- ADD INDEX(`innocent_hits`),
- ADD INDEX(`last_hit`);
diff --git a/debian/sqlfiles/upgrade/mysql/3.9.1 b/debian/sqlfiles/upgrade/mysql/3.9.1
deleted file mode 100644
index b1ee73a..0000000
--- a/debian/sqlfiles/upgrade/mysql/3.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-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;
diff --git a/debian/sqlfiles/upgrade/pgsql/3.8 b/debian/sqlfiles/upgrade/pgsql/3.8
deleted file mode 100644
index 9741b74..0000000
--- a/debian/sqlfiles/upgrade/pgsql/3.8
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE dspam_preferences ALTER COLUMN uid TYPE integer;
-ALTER TABLE dspam_signature_data ALTER COLUMN uid TYPE integer;
-ALTER TABLE dspam_stats ALTER COLUMN uid TYPE integer;
-ALTER TABLE dspam_token_data ALTER COLUMN uid TYPE integer;
-DROP INDEX IF EXISTS id_token_data_sumhits;
-
-ALTER TABLE dspam_virtual_uids ALTER COLUMN uid TYPE integer;
diff --git a/debian/sqlfiles/upgrade/pgsql/3.9 b/debian/sqlfiles/upgrade/pgsql/3.9
deleted file mode 100644
index 4f4ce88..0000000
--- a/debian/sqlfiles/upgrade/pgsql/3.9
+++ /dev/null
@@ -1,23 +0,0 @@
-create function lookup_tokens(integer,integer,bigint[])
- returns setof dspam_token_data
- language plpgsql stable
- as '
-declare
- v_rec record;
-begin
- for v_rec in select * from dspam_token_data
- where uid=$1
- and token in (select $3[i]
- from generate_series(array_lower($3,1),array_upper($3,1)) s(i))
- loop
- return next v_rec;
- end loop;
- for v_rec in select * from dspam_token_data
- where uid=$2
- and token in (select $3[i]
- from generate_series(array_lower($3,1),array_upper($3,1)) s(i))
- loop
- return next v_rec;
- end loop;
- return;
-end;';
--
Debian packages for the DSPAM anti-spam filter
More information about the Pkg-dspam-commits
mailing list