[Python-apps-commits] r12546 - in packages/rubber/trunk/debian (3 files)

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

    Date: Thursday, October 29, 2015 @ 17:37:42
  Author: hilmar-guest
Revision: 12546

Completely rewritten debian/rules, use dh now.

Modified:
  packages/rubber/trunk/debian/changelog
  packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff
  packages/rubber/trunk/debian/rules

Modified: packages/rubber/trunk/debian/changelog
===================================================================
--- packages/rubber/trunk/debian/changelog	2015-10-29 07:56:58 UTC (rev 12545)
+++ packages/rubber/trunk/debian/changelog	2015-10-29 17:37:42 UTC (rev 12546)
@@ -5,10 +5,12 @@
     --> removed
 
   A few suggestions from Nicolas Boulenguez <nicolas at debian.org>
+  (Closes: #797517)
   * switch compat to 9 (no changes).
-  * add some packages to Suggests, document why they are needed
+  * add some packages to Suggests, document why they are needed.
   * switch copyright to machine-readable format.
   * package is again lintian-clean without override.
+  * completely overhauled debian/rules, use dh now. Thanks!
 
   Upstream thinks that a specific command line parser is not necessary
   and no reaction from submitter for about 5 months. (Closes: #336323).

Modified: packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff
===================================================================
--- packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff	2015-10-29 07:56:58 UTC (rev 12545)
+++ packages/rubber/trunk/debian/patches/11_modify_root_makefile_in.diff	2015-10-29 17:37:42 UTC (rev 12546)
@@ -16,7 +16,7 @@
  
  install:
 -	@python@ setup.py inst @prefix@
-+	@python@ setup.py inst ${prefix}
++	@python@ setup.py inst @prefix@
  
  tar:
  	git archive --format=tar HEAD | gzip -9 > rubber- at version@.tar.gz

Modified: packages/rubber/trunk/debian/rules
===================================================================
--- packages/rubber/trunk/debian/rules	2015-10-29 07:56:58 UTC (rev 12545)
+++ packages/rubber/trunk/debian/rules	2015-10-29 17:37:42 UTC (rev 12546)
@@ -3,52 +3,27 @@
 # original file: GNU copyright 1997 to 1999 by Joey Hess.
 # adaptation: (c) 2002--2006 by Emmanuel Beffara.
 
-settings.py: configure
-	dh_testdir
+POLICY_TARGETS := binary binary-arch binary-indep build build-arch \
+  build-indep clean
+.PHONY: $(POLICY_TARGETS)
+$(POLICY_TARGETS):
+	dh $@ --with python2
+
+# Don't replace /usr/bin/python by /usr/bin/python2 in python scripts
+override_dh_auto_configure:
 	./configure --python=python --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-build-arch:
-build-indep: build
-build: build-stamp
+# Ignore setup.py even if there is no Makefile yet.
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	dh_auto_clean --buildsystem=autoconf
 
-build-stamp:  settings.py
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
+# Circumvent Makefile that does not allow to set DESTDIR.
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	dh_auto_install --buildsystem=python_distutils
 
-clean:
-	dh_testdir
-	dh_testroot
-	if test -f Makefile; then $(MAKE) distclean; fi
-	#cd doc; make clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) install prefix=$(CURDIR)/debian/rubber/usr
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_python2
-	dh_installdocs
-	dh_installman
-	#dh_installinfo doc/rubber.info
-	dh_installinfo
+# Install NEWS as upstream changelog.
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
 	dh_installchangelogs NEWS
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch:
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install