[Pkg-dspam-commits] [pkg-dspam-commits] r154 - trunk/debian

[Kurt B. Kaiser]

Author: kbk-guest
Date: Sun Jul 13 03:15:59 2008
New Revision: 154

Log:
1. Build correctly in non-cross environment
2. dpkg now handles CFLAGS
3. debhelper compat leve 7
4. db4 driver has been gone from upstream since 3.6.6! Eliminate pkg.

M    debian/control
M    debian/compat
M    debian/changelog
M    debian/rules


Modified:
   trunk/debian/changelog
   trunk/debian/compat
   trunk/debian/control
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sun Jul 13 03:15:59 2008
@@ -1,3 +1,13 @@
+dspam (3.6.8-9) unstable; UNRELEASED
+
+  [ Kurt B. Kaiser ]
+  * debian/rules: don't use --build config option if host equals target.
+  * debian/rules: dpkg-dev now handles CFLAGS
+  * Set debhelper combatibility level to 7
+  * Eliminate libdspam7-drv-db4 package, db4 support not included since 3.6.6
+
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sat, 12 Jul 2008 21:10:24 -0400
+
 dspam (3.6.8-8) unstable; urgency=high
 
   [ Matthijs Mohlmann ]

Modified: trunk/debian/compat
==============================================================================
--- trunk/debian/compat	(original)
+++ trunk/debian/compat	Sun Jul 13 03:15:59 2008
@@ -1 +1 @@
-4
+7

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Sun Jul 13 03:15:59 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
 Uploaders: Matthijs Mohlmann <matthijs at cacholong.nl>, Christoph Haas <haas at debian.org>, Kurt B. Kaiser <kbk at shore.net>, Jesus Climent <mooch at debian.org>, Rudolf Weber <rudolf at faveve.uni-stuttgart.de>, Aurelien Labrosse <aurelien.labrosse at free.fr>
 XS-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 4.0), libpq-dev, dpatch (>= 2.0.0), libtool, automake1.9, autotools-dev, libmysqlclient15-dev, libdb4.5-dev, libsqlite3-dev, libldap2-dev
+Build-Depends: debhelper (>= 7), libpq-dev, dpatch (>= 2.0.0), libtool, automake1.9, autotools-dev, libmysqlclient15-dev, libsqlite3-dev, libldap2-dev
 Standards-Version: 3.7.3
 
 Package: dspam
@@ -97,20 +97,6 @@
  .
  This package contains the MySQL backend.
 
-Package: libdspam7-drv-db4
-Architecture: any
-Depends: ${shlibs:Depends}, libdspam7 (= ${binary:Version})
-Provides: libdspam7-drv
-Description: DSPAM is a scalable and statistical anti-spam filter
- DSPAM is a dedicated statistical filter with minimal resources. It includes
- many new algorithms to fight against spam including:
-  * Concept Identification
-  * Message Inoculation
-  * Advanced de-obfuscation techniques
-  * Bayesian Noise Reduction
- .
- This package contains the Berkerley 4 backend.
-
 Package: libdspam7-drv-sqlite3
 Architecture: any
 Depends: ${shlibs:Depends}, sqlite3, libdspam7 (= ${binary:Version})

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sun Jul 13 03:15:59 2008
@@ -4,7 +4,7 @@
 # Debian DSPAM maintainers team.
 
 # Uncomment this to turn on verbose mode.
-# deprecated export DH_COMPAT=5
+
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
@@ -14,11 +14,15 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CROSS = --build $(DEB_HOST_GNU_TYPE)
+else
+  CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
 
-CFLAGS = -Wall -g
-STORAGE = "libdb4_drv,mysql_drv,pgsql_drv,sqlite3_drv,hash_drv"
-CONFIGURE	= --host=$(DEB_HOST_GNU_TYPE) \
-		  --build=$(DEB_BUILD_GNU_TYPE) \
+STORAGE = "mysql_drv,pgsql_drv,sqlite3_drv,hash_drv"
+
+CONFIGURE	= $(CROSS) \
 		  --prefix=/usr \
 		  --includedir=/usr/include \
 		  --mandir=/usr/share/man \
@@ -39,11 +43,6 @@
 		  --enable-ldap \
 		  --enable-debug
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -149,7 +148,8 @@
 	dh_installman -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_makeshlibs -a -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql \
+                         -Nlibdspam7-drv-sqlite3 -Ndspam
 	dh_link -a
 	dh_strip -a
 	dh_compress -a