[Python-apps-commits] r14041 - in packages/spambayes/trunk/debian (4 files)

[hle at users.alioth.debian.org]

    Date: Wednesday, May 24, 2017 @ 13:59:38
  Author: hle
Revision: 14041

Fix changelog entry, finish to import last NMU and fix spambayes.docs

Modified:
  packages/spambayes/trunk/debian/changelog
  packages/spambayes/trunk/debian/rules
  packages/spambayes/trunk/debian/spambayes.docs
  packages/spambayes/trunk/debian/spambayes.postinst

Modified: packages/spambayes/trunk/debian/changelog
===================================================================
--- packages/spambayes/trunk/debian/changelog	2017-05-24 13:29:36 UTC (rev 14040)
+++ packages/spambayes/trunk/debian/changelog	2017-05-24 13:59:38 UTC (rev 14041)
@@ -3,14 +3,16 @@
   * Acknowledge NMU (Closes: #857531). Thanks Marcio !
   * debian/control:
     - Update Hugo Lefeuvre's e-mail address.
-    - Depend on debhelper 10 instead of 7.
+    - Depend on debhelper 10 instead of 5.
     - Bump Standards-Version to 3.9.8. 
     - Remove useless version indication in the python dependency.
   * Bump debian/compat to 10.
+  * Port debian/rules to pybuild.
   * debian/copyright:
     - Make debian/copyright DEP5 compliant.
     - Re-license debian/* to GPL-3+ (Approved by Alexandre Fayolle).
     - Update Hugo Lefeuvre's e-mail address.
+  * Install CHANGELOG.txt instead of changelog in spambayes.docs.
   * Remove debian/TODO, not up-to-date anymore.
 
  -- Hugo Lefeuvre <hle at debian.org>  Wed, 24 May 2017 15:09:12 +0200

Modified: packages/spambayes/trunk/debian/rules
===================================================================
--- packages/spambayes/trunk/debian/rules	2017-05-24 13:29:36 UTC (rev 14040)
+++ packages/spambayes/trunk/debian/rules	2017-05-24 13:59:38 UTC (rev 14041)
@@ -1,66 +1,7 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include /usr/share/python/python.mk
+export PYBUILD_NAME=spamassassin
 
-SB=debian/spambayes
+%:
+	dh $@ --with python2 --buildsystem=pybuild
 
-build-arch: build
-build-indep: build
-
-build: build-stamp
-build-stamp: 
-	dh_testdir
-
-	## Build for all python versions
-	python setup.py build
-	cp CHANGELOG.txt changelog
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	rm -f build-stamp install-stamp
-	rm -rf build $(SB)
-	python setup.py clean
-	rm -f *.pyc */*.pyc */*/*.pyc
-	rm -f changelog
-	rm -rf spambayes.egg-info
-	dh_clean
-
-install: install-stamp
-install-stamp: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -A
-
-	# Install Python modules
-	python setup.py -q install --root=$(SB) --no-compile ${py_setup_install_args}
-	rm $(SB)/usr/bin/sb_notesfilter.py
-	prename "s/.py//" $(SB)/usr/bin/*.py
-	rm -f $(SB)/usr/bin/sb_pop3dnd 
-	dh_install -A
-	touch install-stamp
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installman -i
-	dh_installchangelogs -i
-	dh_python2 -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch:
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install binary-arch
-

Modified: packages/spambayes/trunk/debian/spambayes.docs
===================================================================
--- packages/spambayes/trunk/debian/spambayes.docs	2017-05-24 13:29:36 UTC (rev 14040)
+++ packages/spambayes/trunk/debian/spambayes.docs	2017-05-24 13:59:38 UTC (rev 14041)
@@ -1,4 +1,4 @@
-changelog
+CHANGELOG.txt
 NEWTRICKS.txt
 POP3PROXY.txt
 README-DEVEL.txt

Modified: packages/spambayes/trunk/debian/spambayes.postinst
===================================================================
--- packages/spambayes/trunk/debian/spambayes.postinst	2017-05-24 13:29:36 UTC (rev 14040)
+++ packages/spambayes/trunk/debian/spambayes.postinst	2017-05-24 13:59:38 UTC (rev 14041)
@@ -6,7 +6,7 @@
 SCRIPTS="sb_xmlrpcserver sb_server sb_bnfilter sb_mailsort \
         sb_unheader sb_client sb_filter sb_mboxtrain sb_bnserver \
         sb_chkopts sb_upload sb_dbexpimp sb_imapfilter \
-        sb_notesfilter sb_evoscore"
+        sb_evoscore"
 
 
 if [ "$1" = configure ] ; then