[Python-modules-commits] r12897 - in packages/pythonmagick/trunk/debian (4 files)

Wed May 12 21:06:18 UTC 2010

Date: Wednesday, May 12, 2010 @ 21:06:10
  Author: bzed
Revision: 12897

Update patches to include python2.6 properly. 

Modified:
  packages/pythonmagick/trunk/debian/changelog
  packages/pythonmagick/trunk/debian/control
  packages/pythonmagick/trunk/debian/patches/999_autohell.diff
  packages/pythonmagick/trunk/debian/rules

Modified: packages/pythonmagick/trunk/debian/changelog
===================================================================

--- packages/pythonmagick/trunk/debian/changelog	2010-05-12 20:55:45 UTC (rev 12896)
+++ packages/pythonmagick/trunk/debian/changelog	2010-05-12 21:06:10 UTC (rev 12897)
@@ -3,10 +3,9 @@
   * Add pkg-config as build-dependency. 
   * Bumping Standards-Version to 3.8.4.
   * Add debian/README.source. 
-  * Build-depend on python-all-dev and python-all-dbg.
-  * Rewrite debian/rules to build for all Python versions. 
+  * Update patches to include python2.6 properly. 
 
- -- Bernd Zeimetz <bzed at debian.org>  Wed, 12 May 2010 21:49:53 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Wed, 12 May 2010 23:05:38 +0200
 
 pythonmagick (0.9.1-2) unstable; urgency=low
 

Modified: packages/pythonmagick/trunk/debian/control
===================================================================
--- packages/pythonmagick/trunk/debian/control	2010-05-12 20:55:45 UTC (rev 12896)
+++ packages/pythonmagick/trunk/debian/control	2010-05-12 21:06:10 UTC (rev 12897)
@@ -11,8 +11,7 @@
  libtool (>= 1.5),
  libboost-python-dev (>= 1.34.1-8),
  python-support,
- python-all-dev (>= 2.5),
- python-all-dbg,
+ python-dev (>= 2.5),
  autotools-dev,
  quilt,
  pkg-config

Modified: packages/pythonmagick/trunk/debian/patches/999_autohell.diff
===================================================================
--- packages/pythonmagick/trunk/debian/patches/999_autohell.diff	2010-05-12 20:55:45 UTC (rev 12896)
+++ packages/pythonmagick/trunk/debian/patches/999_autohell.diff	2010-05-12 21:06:10 UTC (rev 12897)
@@ -541,7 +541,7 @@
    m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
 -                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
 -python2.1 python2.0 python1.6 python1.5])
-+                    [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
++                    [python python2 python3 python3.0 python3.1 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
 +python2.1 python2.0])
  
    m4_if([$1],[],[
@@ -10739,7 +10739,7 @@
  else
  
 -	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-+	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
++	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python3.1 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
  	  test "$am_cv_pathless_PYTHON" = none && break
 -	  prog="import sys, string
 +	  prog="import sys

Modified: packages/pythonmagick/trunk/debian/rules
===================================================================
--- packages/pythonmagick/trunk/debian/rules	2010-05-12 20:55:45 UTC (rev 12896)
+++ packages/pythonmagick/trunk/debian/rules	2010-05-12 21:06:10 UTC (rev 12897)
@@ -1,109 +1,8 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
+%:
+	dh --with python-support --with quilt $@;
 
-include /usr/share/quilt/quilt.make
-PYTHONS := $(shell pyversions -rv)
-PACKAGE=python-pythonmagick
-
-#let's help configure to figure out our host/build system
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
-else
-  CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-#where our files go
-PREFIX = /usr
-MANDIR = $(PREFIX)/share/man
-INFODIR = $(PREFIX)/share/info
-CONFFLAGS += --prefix=$(PREFIX) --mandir=$(MANDIR) --infodir=$(INFODIR)
-
-#let's take care of optimization + debug builds
-CFLAGS += -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-CONFENV += LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)"
-
-autotools-dev-stamp:
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	touch $@
-
-
-configure: $(PYTHONS:%=configure-%-stamp) $(PYTHONS:%=configure-%-dbg-stamp)
-configure-%-stamp: $(QUILT_STAMPFN) autotools-dev-stamp
-	dh_testdir
-	mkdir $(CURDIR)/$*
-	cd $(CURDIR)/$* ;\
-	  PYTHON_BIN=/usr/bin/python$* $(CONFENV) $(CURDIR)/configure $(CONFFLAGS)
-	touch $@
-
-build: $(PYTHONS:%=build-%-stamp) $(PYTHONS:%=build-%-dbg-stamp)
-build-%-stamp: configure-%-stamp
-	dh_testdir
-
-	cd $(CURDIR)/$* ;\
-	  $(MAKE)
-	touch $@
-
-clean: $(PYTHONS:%=clean-%) $(PYTHONS:%=clean-%-dbg) unpatch
-	dh_clean
-	rm -f config.sub config.guess
-
-clean-%:
-	dh_testdir
-	dh_testroot
-	rm -rf $(CURDIR)/$*
-
-install-pre: install-pre-stamp
-install-pre-stamp:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	
-	touch $@
-
-install: $(PYTHONS:%=install-%-stamp) $(PYTHONS:%=install-%-dbg-stamp)
-install-%-stamp: build-%-stamp install-pre-stamp
-	cd $(CURDIR)/$* ;\
-	  case $* in *-dbg) $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE)-dbg;; \
-	                 *) $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE);; \
-	  esac
-
-
-# Build architecture-independent files here.
-binary-indep:
-	#nothing to do here.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installman -a
-	dh_pysupport -a
-	dh_strip -a --dbg-package=$(PACKAGE)-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# TODO extra clean needed?
+#clean::
+#	find . -name '*\.py[co]' -delete


