[PATCH 1 of 2 logilab-mtconverter] Update Debian packaging

Jérémy Bobbio jeremy.bobbio at irq7.fr
Wed Jun 5 15:01:05 CEST 2019


# HG changeset patch
# User Jérémy Bobbio <jeremy.bobbio at irq7.fr>
# Date 1559736762 -7200
#      Wed Jun 05 14:12:42 2019 +0200
# Node ID fad960015fd7e9108483c23b590c03326efbce07
# Parent  9ad8571111d41592bd028eb52791cc601813e79b
Update Debian packaging

Update Debian packaging to current best practices:

    - Use dh-python and pybuild buildsystem and simplify debian/rules
      accordingly.
    - Use PYBUILD_NAME instead of debian/*.install files.
    - Update minimum Python versions to supported ones.
    - Update Standards-Version to 4.3.0.

Tests are currently disabled as they are not shipped in source package.

diff -r 9ad8571111d4 -r fad960015fd7 debian/changelog
--- a/debian/changelog	Mon Oct 12 11:04:29 2015 +0200
+++ b/debian/changelog	Wed Jun 05 14:12:42 2019 +0200
@@ -1,3 +1,14 @@
+logilab-mtconverter (0.9.0-2) UNRELEASED; urgency=medium
+
+  * Update Debian packaging:
+    - Use dh-python and pybuild buildsystem and simplify debian/rules
+      accordingly.
+    - Use PYBUILD_NAME instead of debian/*.install files.
+    - Update minimum Python versions to supported ones.
+    - Update Standards-Version to 4.3.0.
+
+ -- Jérémy Bobbio <jeremy.bobbio at irq7.fr>  Wed, 05 Jun 2019 14:07:32 +0200
+
 logilab-mtconverter (0.9.0-1) unstable; urgency=medium
 
   * new upstream release
diff -r 9ad8571111d4 -r fad960015fd7 debian/control
--- a/debian/control	Mon Oct 12 11:04:29 2015 +0200
+++ b/debian/control	Wed Jun 05 14:12:42 2019 +0200
@@ -5,13 +5,14 @@
 Uploaders: Sylvain Thenault <sylvain.thenault at logilab.fr>
 Build-Depends:
  debhelper (>= 9),
- python (>= 2.6.5),
+ dh-python,
+ python,
  python3-all,
  python-setuptools,
  python3-setuptools,
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.3
-Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.4
+Standards-Version: 4.3.0
 Homepage: https://www.logilab.org/project/logilab-mtconverter
 Vcs-Hg: http://hg.logilab.org/master/logilab/mtconverter
 Vcs-Browser: http://hg.logilab.org/master/logilab/mtconverter
diff -r 9ad8571111d4 -r fad960015fd7 debian/python-logilab-mtconverter.install
--- a/debian/python-logilab-mtconverter.install	Mon Oct 12 11:04:29 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-usr/lib/python2*
diff -r 9ad8571111d4 -r fad960015fd7 debian/python3-logilab-mtconverter.install
--- a/debian/python3-logilab-mtconverter.install	Mon Oct 12 11:04:29 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-usr/lib/python3*
diff -r 9ad8571111d4 -r fad960015fd7 debian/rules
--- a/debian/rules	Mon Oct 12 11:04:29 2015 +0200
+++ b/debian/rules	Wed Jun 05 14:12:42 2019 +0200
@@ -1,36 +1,7 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# adapted by Logilab for automatic generation by debianize
-# (part of the devtools project, http://www.logilab.org/projects/devtools)
-#
-# Copyright (c) 2003-2011 LOGILAB S.A. (Paris, FRANCE).
-# http://www.logilab.fr/ -- mailto:contact at logilab.fr
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
-include /usr/share/python/python.mk
-# don't build the python3 package if python3 is < 3.3
-py3k = $(subst python3.,,$(shell py3versions -d))
-build_py3k = $(shell test "$(py3k)" -gt 2 && echo 1)
-
-ifeq (,$(build_py3k))
-    DH_OPTIONS += -Npython3-logilab-mtconverter
-    export DH_OPTIONS
-endif
-
-install-python%:
-	python$* setup.py install --root=$(CURDIR)/debian/tmp --prefix=/usr
-
-override_dh_auto_install: $(foreach python, $(shell py3versions -r), install-$(python))
-	dh_auto_install
-	rm -f debian/tmp/usr/lib/python*/*/logilab/__init__.py
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf *.egg-info build
+export PYBUILD_NAME = logilab-mtconverter
+export PYBUILD_DISABLE = test
 
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3 --buildsystem=pybuild
diff -r 9ad8571111d4 -r fad960015fd7 debian/source/format
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/source/format	Wed Jun 05 14:12:42 2019 +0200
@@ -0,0 +1,1 @@
+3.0 (quilt)
diff -r 9ad8571111d4 -r fad960015fd7 debian/source/options
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/source/options	Wed Jun 05 14:12:42 2019 +0200
@@ -0,0 +1,1 @@
+extend-diff-ignore = "^(.hg(/|ignore$|tags$)|[^/]*\.spec$|announce\.txt|doc/makefile|test/)"


More information about the cubicweb-devel mailing list