[pkg-dspam-commits] r70 - in trunk/debian: . patches sqlfiles

Sat Feb 18 21:36:59 UTC 2006

Author: active2-guest
Date: Sat Feb 18 21:36:58 2006
New Revision: 70

Removed:
   trunk/debian/patches/dspam-extpref-plain.dpatch
Modified:
   trunk/debian/README.Debian
   trunk/debian/changelog
   trunk/debian/libdspam7-drv-mysql.install
   trunk/debian/patches/00list
   trunk/debian/patches/manpage-in-right-section.dpatch
   trunk/debian/rules
   trunk/debian/sqlfiles/pgsql
Log:
 * Removed dspam-extpref-plain.dpatch as it's in upstream now.
 * Updated manpge-in-right-section.dpatch
 * Removed parts of neural networking as it's also removed in upstream.
 * Updated changelog
 * Updated initscript to be in runlevel 21 instead of 20.
 * Updated README.Debian.


Modified: trunk/debian/README.Debian
==============================================================================

--- trunk/debian/README.Debian	(original)
+++ trunk/debian/README.Debian	Sat Feb 18 21:36:58 2006
@@ -3,16 +3,20 @@
 
 Please see http://pkg-dspam.alioth.debian.org/.
 
-The current dspam original package allows a versatile set of options, but the
-downside is that most are set at configure time (that is, before the package is
-actually compiled and built).
+The original dspam package allows a versatile set of options, however most 
+are set at configure time (that is, before the package is actually 
+compiled and built). The Debian package includes a mechanism that allows
+you to set several options and rebuild the package quickly.
 
-For that, the Debian package includes a mechanism to set several options and
-rebuild the package quickly.
+If you are not familiar with building Debian packages from source, please read:
+http://www.debian.org/doc/manuals/reference/ch-system.en.html#s-sourcebuild
 
-You should be familiar somehow to the way a package is built in a Debian environment. If not, please read ...
+In order to change the options that dspam is built with you need to change the
+DEB_BUILD_OPTIONS environment variable. For example, in bash:
 
-Possible values for DEB_BUILD_OPTIONS that the dspam Debian package accepts:
+$ export DEB_BUILD_OPTIONS="disable_virtual_users debug"
+
+The possible values for DEB_BUILD_OPTIONS are listed below.
 
  [ standard ]
    noopt - disable optimizations
@@ -22,7 +26,7 @@
    disable_virtual_users - disable storing the users in a database
    disable_preferences_extension - disable storing the users' preferences in a database
    disable_clamav - disable ClamAV antivirus support
-   verbose_debug - enable extensive debug (EXTREME DISCOURAGED in production systems)
-   debug - enable debug (right now, enabled by default)
+   verbose_debug - enable extensive debug (EXTREMELY DISCOURAGED for production systems)
+   debug - enable debug (currently enabled by default)
 
  -- Debian DSPAM Maintainers Maintainer: <pkg-dspam-misc at lists.alioth.debian.org>, Thu, 13 Oct 2005 11:53:46 +0000

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sat Feb 18 21:36:58 2006
@@ -1,4 +1,4 @@
-dspam (3.6.3-1) experimental; urgency=low
+dspam (3.6.4-1) experimental; urgency=low
 
   * New upstream release.
   * Fix path to purge-3.sql in libdspam7-drv-sqlite3 (Closes: #347168)
@@ -9,8 +9,14 @@
     running with the hash backend)
   * Improved add-config-dir patch to prevent a segfault. (Closes: #347852)
   * Add a free() call to fix a memleak.
+  * Move dspam init script from 20 to 21. It doesn't handle reconnects of the
+    several databases.
+  * Removed patch dspam-extpref-plain. Upstream has fixed it.
+  * Updated patch manpage-in-right-section.
+  * Applied patch to README.Debian from Jamie L. Penman-Smithson
+    (Closes: #352105)
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Wed, 25 Jan 2006 11:09:18 +0100
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sat, 18 Feb 2006 21:55:58 +0100
 
 dspam (3.6.2-2) experimental; urgency=low
 

Modified: trunk/debian/libdspam7-drv-mysql.install
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.install	(original)
+++ trunk/debian/libdspam7-drv-mysql.install	Sat Feb 18 21:36:58 2006
@@ -3,7 +3,6 @@
 src/tools.mysql_drv/mysql_objects-4.1.sql usr/share/doc/libdspam7-drv-mysql/
 src/tools.mysql_drv/mysql_objects-space.sql usr/share/doc/libdspam7-drv-mysql/
 src/tools.mysql_drv/mysql_objects-speed.sql usr/share/doc/libdspam7-drv-mysql/
-src/tools.mysql_drv/neural.sql usr/share/doc/libdspam7-drv-mysql/
 src/tools.mysql_drv/virtual_user_aliases.sql usr/share/doc/libdspam7-drv-mysql/
 src/tools.mysql_drv/virtual_users.sql usr/share/doc/libdspam7-drv-mysql/
 src/tools.mysql_drv/purge-4.1.sql usr/share/doc/libdspam7-drv-mysql/

Modified: trunk/debian/patches/00list
==============================================================================
--- trunk/debian/patches/00list	(original)
+++ trunk/debian/patches/00list	Sat Feb 18 21:36:58 2006
@@ -4,7 +4,6 @@
 drivers-in-usr_lib_dspam.dpatch
 dspam-webfrontend-config-debian.dpatch
 update-dspam.conf.dpatch
-dspam-extpref-plain.dpatch
 dspam-default.prefs-in_etc.dpatch
 where-to-find-txt-files.dpatch
 add-config-dir.dpatch

Modified: trunk/debian/patches/manpage-in-right-section.dpatch
==============================================================================
--- trunk/debian/patches/manpage-in-right-section.dpatch	(original)
+++ trunk/debian/patches/manpage-in-right-section.dpatch	Sat Feb 18 21:36:58 2006
@@ -6,24 +6,6 @@
 ## DP: Fix manpage errors.
 
 @DPATCH@
-diff -urNad trunk~/man/dspam_corpus.1 trunk/man/dspam_corpus.1
---- trunk~/man/dspam_corpus.1	2005-10-13 19:00:38.000000000 +0200
-+++ trunk/man/dspam_corpus.1	2005-10-18 23:25:26.859520920 +0200
-@@ -52,12 +52,12 @@
- 
- .n3 3
- .TP
--.BI \[username]\c
-+.BI [username]\c
- Specifies the user to train.
- 
- .n3 3
- .TP
--.BI \[filename]\c
-+.BI [filename]\c
- Specifies the pathname to the mailbox file containing the corpus mail.
- 
- .SH EXIT VALUE
 diff -urNad trunk~/man/dspam_stats.1 trunk/man/dspam_stats.1
 --- trunk~/man/dspam_stats.1	2005-10-13 19:00:38.000000000 +0200
 +++ trunk/man/dspam_stats.1	2005-10-18 23:25:11.697825848 +0200

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sat Feb 18 21:36:58 2006
@@ -149,7 +149,7 @@
 	dh_installcron -a
 	dh_installlogrotate -a
 	dh_installman -a
-	dh_installinit -a
+	dh_installinit -a -- start 21 2 3 4 5 . stop 21 0 1 6 .
 	dh_installdebconf -a
 	dh_makeshlibs -a -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-db4 -Nlibdspam7-drv-sqlite3 -Ndspam
 	dh_link -a

Modified: trunk/debian/sqlfiles/pgsql
==============================================================================
--- trunk/debian/sqlfiles/pgsql	(original)
+++ trunk/debian/sqlfiles/pgsql	Sat Feb 18 21:36:58 2006
@@ -28,25 +28,6 @@
   innocent_classified int
 ) WITHOUT OIDS;
 
-CREATE TABLE dspam_neural_data (
-  uid smallint,
-  node smallint,
-  total_correct int,
-  total_incorrect int,
-  UNIQUE (node, uid)
-) WITHOUT OIDS;
-
-CREATE INDEX id_neural_data_01 ON dspam_neural_data(uid);
-
-CREATE TABLE dspam_neural_decisions (
-  uid smallint,
-  signature varchar(128),
-  data bytea,
-  length int,
-  created_on date,
-  UNIQUE (signature, uid)
-) WITHOUT OIDS;
-
 CREATE TABLE dspam_preferences (
   uid smallint,
   preference varchar(128),

