[Python-apps-commits] r10156 - in packages/pylint/trunk/debian (6 files)

morph at users.alioth.debian.org morph at users.alioth.debian.org
Wed Nov 6 06:47:35 UTC 2013 

    Date: Wednesday, November 6, 2013 @ 06:47:34
  Author: morph
Revision: 10156

revert uncohordinated changes

Modified:
  packages/pylint/trunk/debian/changelog
  packages/pylint/trunk/debian/compat
  packages/pylint/trunk/debian/control
  packages/pylint/trunk/debian/rules
  packages/pylint/trunk/debian/source/format
  packages/pylint/trunk/debian/watch

Modified: packages/pylint/trunk/debian/changelog
===================================================================
--- packages/pylint/trunk/debian/changelog	2013-11-05 05:41:12 UTC (rev 10155)
+++ packages/pylint/trunk/debian/changelog	2013-11-06 06:47:34 UTC (rev 10156)
@@ -1,21 +1,9 @@
-pylint (1.0.0-1) UNRELEASED; urgency=low
+pylint (0.27.0-2) UNRELEASED; urgency=low
 
-  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
-  [ Jackson Doak ]
-  * 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
-    - Change XS-Python to X-Python
-    - Drop B-dep on python-support
-  * debian/rules: Switch to dh and dh_python2. Closes: #702128
-  * Update debian/watch
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:05:34 +0200
 
- -- Jackson Doak <noskcaj at ubuntu.com>  Tue, 05 Nov 2013 08:11:38 +1100
-
 pylint (0.27.0-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/pylint/trunk/debian/compat
===================================================================
--- packages/pylint/trunk/debian/compat	2013-11-05 05:41:12 UTC (rev 10155)
+++ packages/pylint/trunk/debian/compat	2013-11-06 06:47:34 UTC (rev 10156)
@@ -1 +1 @@
-9
\ No newline at end of file
+5

Modified: packages/pylint/trunk/debian/control
===================================================================
--- packages/pylint/trunk/debian/control	2013-11-05 05:41:12 UTC (rev 10155)
+++ packages/pylint/trunk/debian/control	2013-11-06 06:47:34 UTC (rev 10156)
@@ -3,10 +3,10 @@
 Priority: optional
 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-logilab-common (>= 0.53.0), python-logilab-astng (>= 0.21.1), python-unittest2
+Build-Depends: debhelper (>= 5.0.38), python (>= 2.5.4-1~)
+Build-Depends-Indep: python-support, python-logilab-common (>= 0.53.0), python-logilab-astng (>= 0.21.1), python-unittest2
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.6
+XS-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-05 05:41:12 UTC (rev 10155)
+++ packages/pylint/trunk/debian/rules	2013-11-06 06:47:34 UTC (rev 10156)
@@ -11,19 +11,48 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-%:
-	dh $@ --with python2
+PYVERS := $(shell pyversions -s -v)
 
-override_dh_auto_test:
-	dh_auto_test
+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
 	-./test/fulltest.sh $(PYVERS)
+endif
 
-override_dh_auto_clean:
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	NO_SETUPTOOLS=1 python setup.py clean
+
 	find . -name "*.pyc" -delete
 	find . -name "*.pyo" -delete
-	dh_auto_clean
 
-override_dh_install:
+	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
+
 	# 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 \
@@ -31,14 +60,32 @@
 	  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/{} \;)
 
-override_dh_installchangelogs:
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir 
+	dh_testroot 
+	dh_install -i
+	dh_pysupport -i
 	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
 
-override_dh_compress:
-	dh_compress -i -X.py -X.ini -X.xml -Xtest
\ No newline at end of file
+binary-arch:
+
+binary: binary-indep
+.PHONY: build clean binary binary-indep binary-arch

Modified: packages/pylint/trunk/debian/source/format
===================================================================
--- packages/pylint/trunk/debian/source/format	2013-11-05 05:41:12 UTC (rev 10155)
+++ packages/pylint/trunk/debian/source/format	2013-11-06 06:47:34 UTC (rev 10156)
@@ -1 +1 @@
-3.0 (quilt)
\ No newline at end of file
+1.0

Modified: packages/pylint/trunk/debian/watch
===================================================================
--- packages/pylint/trunk/debian/watch	2013-11-05 05:41:12 UTC (rev 10155)
+++ packages/pylint/trunk/debian/watch	2013-11-06 06:47:34 UTC (rev 10156)
@@ -1,2 +1,2 @@
 version=3
-http://pypi.python.org/packages/source/p/pylint/pylint-(.*).tar.gz
+http://download.logilab.org/pub/pylint/pylint-(.*)\.tar.gz

More information about the Python-apps-commits mailing list