Add new Debian branches which use modern dh and source format 3.0

debian/control

@@ -2,7 +2,7 @@ Source: wcs-au-quotidien
 Section: web
 Priority: optional
 Maintainer: Frederic Peters <fpeters@entrouvert.com>
-Build-Depends: debhelper (>= 5.0.37.2), python
+Build-Depends: debhelper (>= 8.0.0), python
 Build-Depends-Indep: python-support (>= 0.4), gettext, python-quixote
 Standards-Version: 3.8.0.1
 X-Python-Version: current

debian/rules

@@ -4,59 +4,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PYTHON=/usr/bin/python
 DESTDIR=$(CURDIR)/debian/wcs-au-quotidien
 
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	rm -f po/*.mo
-	python setup.py clean
-	rm -rf build
+%:
+	dh $@ --with python2
 
+override_dh_clean:
 	dh_clean
+	rm -rf po/*.mo
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(PYTHON) setup.py install --prefix=$(DESTDIR)/usr --no-compile
+override_dh_install:
+	dh_install
 	for i in $(CURDIR)/debian/wcs-au-quotidien/usr/lib/python2.*; do \
-		mv $$i/site-packages/extra \
-			$$i/site-packages/extra-wcs-au-quotidien; done
-	cd po && make install prefix=$(CURDIR)/debian/wcs-au-quotidien/
+		mv $$i/dist-packages/extra \
+			$$i/dist-packages/extra-wcs-au-quotidien; done
+	cd po && make install prefix=$(DESTDIR)
 	install -d -m 755 $(DESTDIR)/var/lib/wcs-au-quotidien $(DESTDIR)/etc/wcs
 	install -m 644 wcs-au-quotidien.cfg-sample $(DESTDIR)/etc/wcs/wcs-au-quotidien.cfg
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_installinit
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/wcs-au-quotidien.init

@@ -15,9 +15,7 @@ NAME=wcs-auquotidien
 DAEMON=/usr/sbin/wcsctl
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-PYTHON_VERSION=`/usr/bin/env python -c \
-    "import sys; print '%d.%d' % (sys.version_info[0], sys.version_info[1])"`
-OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/extra-wcs-au-quotidien/"
+OPTIONS="--extra /usr/share/pyshared/extra-wcs-au-quotidien/"
 WCS_USER=wcs-au-quotidien
 WCS_GROUP=wcs-au-quotidien
 CONFIG_FILE=/etc/wcs/wcs-au-quotidien.cfg