[Python-apps-commits] r10154 - in packages/pylint/trunk/debian (changelog control rules)

[noskcaj-guest at users.alioth.debian.org]

    Date: Tuesday, November 5, 2013 @ 05:37:54
  Author: noskcaj-guest
Revision: 10154

* debian/control: 
  - Bump debhelper to 9
  - Change XS-Python to X-Python
  - Drop B-dep on python-support
* debian/rules: Switch to dh and dh_python2. Closes: #702128

Modified:
  packages/pylint/trunk/debian/changelog
  packages/pylint/trunk/debian/control
  packages/pylint/trunk/debian/rules

Modified: packages/pylint/trunk/debian/changelog
===================================================================
--- packages/pylint/trunk/debian/changelog	2013-11-04 21:23:36 UTC (rev 10153)
+++ packages/pylint/trunk/debian/changelog	2013-11-05 05:37:54 UTC (rev 10154)
@@ -7,7 +7,11 @@
   * New upstream release. Closes: #720533, #689172
   * debian/source/format: Set as 3.0 (quilt)
   * debian/compat: Set as 9
-  * debian/control: Bump debhelper to 9
+  * debian/control: 
+    - Bump debhelper to 9
+    - Change XS-Python to X-Python
+    - Drop B-dep on python-support
+  * debian/rules: Switch to dh and dh_python2. Closes: #702128
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Tue, 05 Nov 2013 08:11:38 +1100
 

Modified: packages/pylint/trunk/debian/control
===================================================================
--- packages/pylint/trunk/debian/control	2013-11-04 21:23:36 UTC (rev 10153)
+++ packages/pylint/trunk/debian/control	2013-11-05 05:37:54 UTC (rev 10154)
@@ -4,9 +4,9 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Sylvain Thénault <sylvain.thenault at logilab.fr>, Alexandre Fayolle <afayolle at debian.org>, Sandro Tosi <morph at debian.org>
 Build-Depends: debhelper (>= 9), python (>= 2.5.4-1~)
-Build-Depends-Indep: python-support, python-logilab-common (>= 0.53.0), python-logilab-astng (>= 0.21.1), python-unittest2
+Build-Depends-Indep: python-logilab-common (>= 0.53.0), python-logilab-astng (>= 0.21.1), python-unittest2
 Standards-Version: 3.9.3
-XS-Python-Version: >= 2.6
+X-Python-Version: >= 2.6
 Homepage: http://www.pylint.org/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pylint/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pylint/trunk/

Modified: packages/pylint/trunk/debian/rules
===================================================================
--- packages/pylint/trunk/debian/rules	2013-11-04 21:23:36 UTC (rev 10153)
+++ packages/pylint/trunk/debian/rules	2013-11-05 05:37:54 UTC (rev 10154)
@@ -11,48 +11,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PYVERS := $(shell pyversions -s -v)
+%:
+	dh $@ --with python2
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-	NO_SETUPTOOLS=1 python setup.py -q build
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	# use the default python version to select the script dir to run the tests
+override_dh_auto_test:
+	dh_auto_test
 	-./test/fulltest.sh $(PYVERS)
-endif
 
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	NO_SETUPTOOLS=1 python setup.py clean
-
+override_dh_auto_clean:
 	find . -name "*.pyc" -delete
 	find . -name "*.pyo" -delete
+	dh_auto_clean
 
-	rm -rf build
-
-	dh_clean build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	NO_SETUPTOOLS=1 python setup.py -q install --no-compile \
-			--root=$(CURDIR)/debian/pylint \
-			--install-layout=deb
-
-	rm -rf debian/pylint/usr/lib/python*/*-packages/pylint/test
-
+override_dh_install:
 	# fixes shebangs
 	for exec in pylint pylint-gui symilar ; do \
 	  if head -1 debian/pylint/usr/bin/$$exec | grep "^#! */usr/bin" | grep "python" >/dev/null ; then \
@@ -60,32 +31,14 @@
 	  fi ; \
 	  chmod a+x debian/pylint/usr/bin/$$exec; \
 	done
-
 	install -m 644 elisp/pylint.el debian/pylint/usr/share/emacs/site-lisp/pylint/
+	dh_install
 
 	# install tests
 	#(cd test && find . -type f -not \( -path '*/CVS/*' -or -name '*.pyc' \) -exec install -D --mode=644 {} ../debian/pylint/usr/share/doc/pylint/test/{} \;)
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir 
-	dh_testroot 
-	dh_install -i
-	dh_pysupport -i
+override_dh_installchangelogs:
 	dh_installchangelogs -i ChangeLog
-	dh_installexamples -i
-	dh_installdocs -i
-	dh_installman -i
-	dh_installemacsen
-	dh_link -i
-	dh_compress -i -X.py -X.ini -X.xml -Xtest
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i 
-	dh_md5sums -i
-	dh_builddeb -i
 
-binary-arch:
-
-binary: binary-indep
-.PHONY: build clean binary binary-indep binary-arch
+override_dh_compress:
+	dh_compress -i -X.py -X.ini -X.xml -Xtest
\ No newline at end of file