r1432 - in van.pydeb/trunk/debian (5 files)

Brian Sutherland jinty-guest at alioth.debian.org
Wed Jun 3 16:43:23 UTC 2009


    Date: Wednesday, June 3, 2009 @ 16:43:23
  Author: jinty-guest
Revision: 1432

* Add a default rules template to
  /usr/share/python-van.pydeb/rules_templates/rules.1.mk This template can
  be included in debian/rules for simple python packages making the rules file
  a oneliner. Makefile targets post-install-python% and
  dependencies-python% can be overridden for slightly more complex
  situations.
* Use riles template to simplify our own rules file.

Added:
  van.pydeb/trunk/debian/python-van.pydeb.install
  van.pydeb/trunk/debian/rules_templates/
  van.pydeb/trunk/debian/rules_templates/rules.1.mk
Modified:
  van.pydeb/trunk/debian/changelog
  van.pydeb/trunk/debian/rules

Modified: van.pydeb/trunk/debian/changelog
===================================================================
--- van.pydeb/trunk/debian/changelog	2009-06-03 14:48:23 UTC (rev 1431)
+++ van.pydeb/trunk/debian/changelog	2009-06-03 16:43:23 UTC (rev 1432)
@@ -1,3 +1,15 @@
+van.pydeb (1.2.0-2) unstable; urgency=low
+
+  * Add a default rules template to
+    /usr/share/python-van.pydeb/rules_templates/rules.1.mk This template can
+    be included in debian/rules for simple python packages making the rules file
+    a oneliner. Makefile targets post-install-python% and
+    dependencies-python% can be overridden for slightly more complex
+    situations.
+  * Use riles template to simplify our own rules file.
+
+ -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Jun 2009 09:02:06 +0200
+
 van.pydeb (1.2.0-1) unstable; urgency=low
 
   * New upstream release

Added: van.pydeb/trunk/debian/python-van.pydeb.install
===================================================================
--- van.pydeb/trunk/debian/python-van.pydeb.install	                        (rev 0)
+++ van.pydeb/trunk/debian/python-van.pydeb.install	2009-06-03 16:43:23 UTC (rev 1432)
@@ -0,0 +1 @@
+debian/rules_templates usr/share/python-van.pydeb

Modified: van.pydeb/trunk/debian/rules
===================================================================
--- van.pydeb/trunk/debian/rules	2009-06-03 14:48:23 UTC (rev 1431)
+++ van.pydeb/trunk/debian/rules	2009-06-03 16:43:23 UTC (rev 1432)
@@ -3,75 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Values lifted from setup.py and control file
-PYVERS=$(shell pyversions -vr debian/control)
+include debian/rules_templates/rules.1.mk
 
-build: $(PYVERS:%=build-python%)
-	touch $@
-build-python%:
-	dh_testdir
-	python$* setup.py build
-	touch $@
-
-.PHONY: clean
-clean:
-	dh_testdir
-	dh_testroot
-	$(MAKE) -f debian/rules $(PYVERS:%=clean-python%)
-	rm -f build-python?.?
-	rm -rf build
-	rm -rf dist
-	find -iname '*.pyc' -exec rm -f {} \;
-	dh_clean
-
-clean-python%:
-	python$* setup.py clean
-
-.PHONY: install
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) -f debian/rules $(PYVERS:%=install-python%)
-
-install-python%:
-	python$* setup.py install --no-compile --single-version-externally-managed --root=debian/python-van.pydeb --install-data=usr/lib/python-van.pydeb
-	mv debian/python-van.pydeb/usr/lib/python$*/site-packages/van.pydeb-*-py$*.egg-info \
-	   debian/python-van.pydeb/usr/lib/python$*/site-packages/van.pydeb.egg-info 
-	find debian/python-van.pydeb/usr/lib/python$*/site-packages -name "van.pydeb-*-nspkg.pth" -exec \
-	   mv {} debian/python-van.pydeb/usr/lib/python$*/site-packages/van.pydeb-nspkg.pth \;
+post-install-python%:
 	install -D -m 644 van/__init__.py \
-	    debian/python-van.pydeb/usr/lib/python$*/site-packages/van/__init__.py
-
-	
-.PHONY: binary-common
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pycentral
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: binary-indep
-binary-indep: install
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-.PHONY: binary-arch
-binary-arch: install
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-.PHONY: binary
-binary: binary-indep binary-arch
+	    debian/$(package)$(call py_libdir,$*)/van/__init__.py

Added: van.pydeb/trunk/debian/rules_templates/rules.1.mk
===================================================================
--- van.pydeb/trunk/debian/rules_templates/rules.1.mk	                        (rev 0)
+++ van.pydeb/trunk/debian/rules_templates/rules.1.mk	2009-06-03 16:43:23 UTC (rev 1432)
@@ -0,0 +1,98 @@
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# Values lifted from setup.py and control file
+PYVERS=$(shell pyversions -vr debian/control)
+
+ifeq ($(origin py_package), undefined)
+  py_package=$(shell van-pydeb src_to_py `dpkg-parsechangelog -c1 -ldebian/changelog | grep 'Source: ' | sed 's/Source: //'`)
+endif
+
+ifeq ($(origin package), undefined)
+  package=$(shell van-pydeb py_to_bin $(py_package))
+endif
+
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+  py_sitename_sh = $(py_sitename)
+  py_libdir_sh = $(py_libdir)
+endif
+
+build: $(PYVERS:%=build-python%)
+	touch $@
+build-python%:
+	dh_testdir
+	python$* setup.py build
+	touch $@
+
+.PHONY: clean
+clean:
+	dh_testdir
+	dh_testroot
+	$(MAKE) -f debian/rules $(PYVERS:%=clean-python%)
+	rm -f build-python?.?
+	rm -rf build
+	rm -rf dist
+	find -iname '*.pyc' -exec rm -f {} \;
+	dh_clean
+
+clean-python%:
+	python$* setup.py clean
+
+.PHONY: install
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) -f debian/rules $(PYVERS:%=install-python%)
+
+install-python%:
+	python$* setup.py install --no-compile --single-version-externally-managed $(py_setup_install_args) --root=debian/$(package) --install-data=usr/lib/$(package)
+	mv debian/$(package)$(call py_libdir,$*)/$(py_package)-*-py$*.egg-info \
+	   debian/$(package)$(call py_libdir,$*)/$(py_package).egg-info 
+	find debian/$(package)$(call py_libdir,$*) -name "$(py_package)-*-nspkg.pth" -exec \
+	   mv {} debian/$(package)$(call py_libdir,$*)/$(py_package)-nspkg.pth \;
+	$(MAKE) -f debian/rules dependencies-python$*
+	$(MAKE) -f debian/rules post-install-python$*
+
+post-install-python%:
+	echo
+
+dependencies-python%:
+	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)$(call py_libdir,$*)/$(py_package).egg-info) >> debian/$(package).substvars
+	(echo -n 'setuptools:Provides=' && van-pydeb provides --egg-info debian/$(package)$(call py_libdir,$*)/$(py_package).egg-info) >> debian/$(package).substvars
+
+.PHONY: binary-common
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_pycentral
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+.PHONY: binary-indep
+binary-indep: install
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+.PHONY: binary-arch
+binary-arch: install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+.PHONY: binary
+binary: binary-indep binary-arch




More information about the pkg-zope-commits mailing list