[Python-modules-commits] [python-clamav] 01/01: Overall packaging modernization:

Scott Kitterman kitterman at moszumanska.debian.org
Sat Feb 6 00:49:09 UTC 2016


This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch master
in repository python-clamav.

commit 61b7b09d65a62526f3cbd0c0cc64f9536afa2a74
Author: Scott Kitterman <scott at kitterman.com>
Date:   Fri Feb 5 19:34:29 2016 -0500

    Overall packaging modernization:
    
    * Bump standards version to 3.9.7 without further change
    * Use https: vice git: for Git-Vcs in debian/control
    * Remove obsolete python-clamav transitional package
    * Clean up ancient Breaks/Replaces/Provides
    * Delete gpl.txt from debian/docs to eliminate shipping duplicate license
      file
    * Update Homepage field in debian/control
    * Update debian watch to explain upstream situation and override
      debian-watch-file-missing-version lintian warning
    * Update debian/rules to use dh 7 format and bump compat/debhelper version
      to 9
    * Add explicit build depends on dh-python
    * Use pybuild
---
 debian/changelog                | 20 ++++++++++--
 debian/compat                   |  2 +-
 debian/control                  | 23 +++-----------
 debian/docs                     |  2 --
 debian/rules                    | 69 ++---------------------------------------
 debian/source/lintian-overrides |  1 +
 debian/watch                    |  7 ++---
 7 files changed, 29 insertions(+), 95 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bec2fe..0a27be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,24 @@
-python-clamav (0.4.1-8) UNRELEASED; urgency=low
+python-clamav (0.4.1-8) unstable; urgency=medium
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:13 +0200
+  [ Scott Kitterman ]
+  * Bump standards version to 3.9.7 without further change
+  * Use https: vice git: for Git-Vcs in debian/control
+  * Remove obsolete python-clamav transitional package
+  * Clean up ancient Breaks/Replaces/Provides
+  * Delete gpl.txt from debian/docs to eliminate shipping duplicate license
+    file
+  * Update Homepage field in debian/control
+  * Update debian watch to explain upstream situation and override
+    debian-watch-file-missing-version lintian warning
+  * Update debian/rules to use dh 7 format and bump compat/debhelper version
+    to 9
+  * Add explicit build depends on dh-python
+  * Use pybuild
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 05 Feb 2016 19:26:10 -0500
 
 python-clamav (0.4.1-7) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index f05a7d8..1a862a1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,33 +3,18 @@ Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 5.0.37.2), libclamav-dev (>= 0.95), python-all-dev (>= 2.6.5-2~)
+Build-Depends: debhelper (>= 9), libclamav-dev (>= 0.95), python-all-dev (>= 2.6.5-2~), dh-python
 X-Python-Version: >= 2.3
-Standards-Version: 3.9.3
-Homepage: http://xael.org/norman/python/pyclamav/index.html
-Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-clamav.git
+Standards-Version: 3.9.7
+Homepage: http://xael.org/pages/projects.html
+Vcs-Git: https://anonscm.debian.org/python-modules/packages/python-clamav.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-clamav.git
 
 Package: python-pyclamav
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, clamav-freshclam
-Provides: python-clamav
-Replaces: python-clamav (<< 0.4.1-4~)
-Breaks: ${python:Breaks}, python-clamav (<< 0.4.1-4~)
 Description: Python bindings to ClamAV
  This package adds virus detection capabilities to Python software, thanks to
  the ClamAV antivirus toolkit without the need for running clamav-daemon. For
  virus scanning with clamav-daemon, python-pyclamd is an available
  alternative.
-
-Package: python-clamav
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: ${misc:Depends}, python-pyclamav
-Description: Python bindings to ClamAV - transitional package
- This package adds virus detection capabilities to Python software, thanks to
- the ClamAV antivirus toolkit.
- .
- This is a transitional package to support upgrades to python-pyclamav. It is
- safe to remove it once that is installed.
diff --git a/debian/docs b/debian/docs
index dab5b79..71dfd5b 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1 @@
-gpl.txt
-README.txt
 README.txt
diff --git a/debian/rules b/debian/rules
index a24fa91..8f86be7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,3 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS = -Wall -g -O0 -g
-	CPPFLAGS =
-else
-	CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
-	CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-	LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-endif
-
-PYVERS=$(shell pyversions -vs)
-
-
-build: build-arch build-indep
-build-arch: $(PYVERS:%=build-python%)
-	touch $@
-build-python%:
-	CFLAGS="$(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" python$* setup.py build
-	touch $@
-
-install-arch: build $(PYVERS:%=install-python%)
-install-python%:
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	python$* setup.py install --install-layout=deb --root $(CURDIR)/debian/python-pyclamav
-
-clean: $(PYVERS:%=clean-python%)
-clean-python%:
-	dh_testdir
-	python$* setup.py clean
-	dh_testroot
-	rm -fr build build-python$*
-	dh_clean 
-
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGELOG
-	dh_installdocs
-	dh_installexamples
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_python2
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture-dependent files here.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-indep binary-arch
-.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install-indep install-arch install configure
+%:
+	dh $@ --with python2 --buildsystem=pybuild
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..46c0bf6
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1 @@
+python-clamav source: debian-watch-file-missing-version
diff --git a/debian/watch b/debian/watch
index b39c39e..21817c4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
-version=3
-
-http://xael.org/norman/python/pyclamav/pyclamav-(.*)\.tar\.gz
-
+No watch file is provided since upstream development has ceased and the
+current location is not amenable to tracking via watch file.  The code
+can be downloaded from http://xael.org/pages/projects.html

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-clamav.git



More information about the Python-modules-commits mailing list