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

[nijel at users.alioth.debian.org]

    Date: Friday, September 25, 2009 @ 11:37:44
  Author: nijel
Revision: 3835

Simplify debian/rules by using new dh support for distutils.

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

Modified: packages/sonata/trunk/debian/changelog
===================================================================
--- packages/sonata/trunk/debian/changelog	2009-09-25 11:34:23 UTC (rev 3834)
+++ packages/sonata/trunk/debian/changelog	2009-09-25 11:37:44 UTC (rev 3835)
@@ -5,8 +5,9 @@
   * Do not depend unconditionally on elementtree, newer python is enough 
     (LP: #377706).
   * Bump standards to 3.8.3.
+  * Simplify debian/rules by using new dh support for distutils.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 25 Sep 2009 13:34:12 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 25 Sep 2009 13:36:00 +0200
 
 sonata (1.6.2-1) unstable; urgency=low
 

Modified: packages/sonata/trunk/debian/control
===================================================================
--- packages/sonata/trunk/debian/control	2009-09-25 11:34:23 UTC (rev 3834)
+++ packages/sonata/trunk/debian/control	2009-09-25 11:37:44 UTC (rev 3835)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 7.3.0),
     python-support (>= 0.5.3),
     python-all-dev (>= 2.3.5-11), 
     pkg-config, 

Modified: packages/sonata/trunk/debian/rules
===================================================================
--- packages/sonata/trunk/debian/rules	2009-09-25 11:34:23 UTC (rev 3834)
+++ packages/sonata/trunk/debian/rules	2009-09-25 11:37:44 UTC (rev 3835)
@@ -1,66 +1,8 @@
 #!/usr/bin/make -f
 
--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)
-  py_setup_install_args =
-endif
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-PYVERSIONS=$(shell pyversions -v -r)
-PYDEF=$(shell pyversions -v -d)
-
-$(subst $(PYDEF),python,$*)
-
-override_dh_auto_build-%:
-	python$* setup.py build
-
-override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build-%)
-	python setup.py build
-
-override_dh_auto_install-%:
-	python$* setup.py install \
-		 --no-compile --root=$(CURDIR)/debian/tmp $(py_setup_install_args)
-
-override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install-%)
-	python setup.py install \
-		 --no-compile --root=$(CURDIR)/debian/tmp $(py_setup_install_args)
-
-build: build-stamp
-
-build-stamp:
-	dh build
-	chmod -x sonata/pixmaps/*
-	touch $@
-
-clean:
-	dh $@
-
-install: build
-	dh $@
-	# We install docs other way
+override_dh_auto_install:
+	dh_auto_install
 	rm -rf $(CURDIR)/debian/sonata/usr/share/sonata
 
-# Build architecture-independent files here.
-binary-indep: build install
+%:
 	dh $@
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh $@
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install