[Python-modules-commits] r7966 - in packages/pycairo/trunk/debian (13 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Mon Mar 23 23:25:38 UTC 2009
Date: Monday, March 23, 2009 @ 23:25:37
Author: shlomme
Revision: 7966
prepare new upstream release
Added:
packages/pycairo/trunk/debian/patches/
packages/pycairo/trunk/debian/patches/00list
packages/pycairo/trunk/debian/patches/01_no_py26_dependency.dpatch
packages/pycairo/trunk/debian/patches/02_toyfontface_type_base.dpatch
packages/pycairo/trunk/debian/python-cairo-dbg.install
packages/pycairo/trunk/debian/python-cairo-dev.install
packages/pycairo/trunk/debian/python-cairo.install
packages/pycairo/trunk/debian/pyversions
Modified:
packages/pycairo/trunk/debian/changelog
packages/pycairo/trunk/debian/compat
packages/pycairo/trunk/debian/control
packages/pycairo/trunk/debian/rules
Deleted:
packages/pycairo/trunk/debian/cairo.pth
Deleted: packages/pycairo/trunk/debian/cairo.pth
===================================================================
--- packages/pycairo/trunk/debian/cairo.pth 2009-03-23 19:29:25 UTC (rev 7965)
+++ packages/pycairo/trunk/debian/cairo.pth 2009-03-23 23:25:37 UTC (rev 7966)
@@ -1 +0,0 @@
-cairo
Modified: packages/pycairo/trunk/debian/changelog
===================================================================
--- packages/pycairo/trunk/debian/changelog 2009-03-23 19:29:25 UTC (rev 7965)
+++ packages/pycairo/trunk/debian/changelog 2009-03-23 23:25:37 UTC (rev 7966)
@@ -1,3 +1,21 @@
+pycairo (1.8.4-1) unstable; urgency=low
+
+ * New upstream release for unstable (Closes: #497055)
+ * debian/rules
+ - Switch to cdbs and python-support
+ * debian/control
+ - Bumped standards version to 3.8.1, no changes necessary
+ - Bumped debhelper compatibility level to 7, no changes
+ - Switch to cdbs and python-support
+ - Build-depend on dpatch
+ - Added ${misc:Depends} to all packages, fixes lintian warnings
+ * debian/patches/01_no_py26_dependency.dpatch
+ - do not require Python 2.6
+ * debian/patches/02_toyfontface_type_base.dpatch
+ - set correct base type for ToyFontFace
+
+ -- Torsten Marek <shlomme at debian.org> Sun, 22 Mar 2009 13:37:43 +0100
+
pycairo (1.8.2-1) experimental; urgency=low
* New upstream release, uploaded to experimental
Modified: packages/pycairo/trunk/debian/compat
===================================================================
--- packages/pycairo/trunk/debian/compat 2009-03-23 19:29:25 UTC (rev 7965)
+++ packages/pycairo/trunk/debian/compat 2009-03-23 23:25:37 UTC (rev 7966)
@@ -1 +1 @@
-5
+7
Modified: packages/pycairo/trunk/debian/control
===================================================================
--- packages/pycairo/trunk/debian/control 2009-03-23 19:29:25 UTC (rev 7965)
+++ packages/pycairo/trunk/debian/control 2009-03-23 23:25:37 UTC (rev 7966)
@@ -3,14 +3,13 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Dave Beckett <dajobe at debian.org>, Torsten Marek <shlomme at debian.org>
-Build-Depends: debhelper (>= 5.0.38), autotools-dev, pkg-config, python-all-dev (>= 2.4.0), python-all-dbg (>= 2.4.0), python-central (>= 0.5.6), libcairo2-dev (>= 1.8.6)
-XS-Python-Version: >= 2.5
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.49), python-all-dev (>= 2.4.0), python-all-dbg (>= 2.4.0), python-support (>= 0.8.7), libcairo2-dev (>= 1.8.6), dpatch, patchutils
+Standards-Version: 3.8.1
Homepage: http://cairographics.org/pycairo/
Package: python-cairo
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings for the Cairo vector graphics library
@@ -20,7 +19,9 @@
Package: python-cairo-dbg
Priority: extra
Architecture: any
-Depends: python-cairo (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Depends: python-cairo (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
Description: Python bindings for the Cairo vector graphics library (debug extension)
This package contains modules that allow you to use the cairo vector
graphics library in Python programs.
@@ -29,7 +30,7 @@
Package: python-cairo-dev
Architecture: all
-Depends: ${python:Depends}, python-cairo (>= ${binary:Version})
+Depends: python-cairo (>= ${binary:Version}), ${misc:Depends}
Description: Python cairo bindings: development files
This package contains files that allow you to compile wrappers
that interoperate with python-cairo (pycairo).
Added: packages/pycairo/trunk/debian/patches/00list
===================================================================
--- packages/pycairo/trunk/debian/patches/00list (rev 0)
+++ packages/pycairo/trunk/debian/patches/00list 2009-03-23 23:25:37 UTC (rev 7966)
@@ -0,0 +1,2 @@
+01_no_py26_dependency
+02_toyfontface_type_base
Added: packages/pycairo/trunk/debian/patches/01_no_py26_dependency.dpatch
===================================================================
--- packages/pycairo/trunk/debian/patches/01_no_py26_dependency.dpatch (rev 0)
+++ packages/pycairo/trunk/debian/patches/01_no_py26_dependency.dpatch 2009-03-23 23:25:37 UTC (rev 7966)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_no_py26_dependency.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: Do not require Python 2.6, Python 2.5 still works just fine
+
+ at DPATCH@
+diff -urNad pycairo-1.8.4~/setup.py pycairo-1.8.4/setup.py
+--- pycairo-1.8.4~/setup.py 2009-03-19 09:44:29.000000000 +0100
++++ pycairo-1.8.4/setup.py 2009-03-23 22:56:08.000000000 +0100
+@@ -32,8 +32,8 @@
+ return [x.lstrip(opt) for x in output.split()]
+
+
+-if sys.version_info < (2,6):
+- raise SystemExit('Error: Python >= 2.6 is required')
++#if sys.version_info < (2,6):
++# raise SystemExit('Error: Python >= 2.6 is required')
+
+ pkg_config_version_check ('cairo', cairo_version_required)
+ if sys.platform == 'win32':
Property changes on: packages/pycairo/trunk/debian/patches/01_no_py26_dependency.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/pycairo/trunk/debian/patches/02_toyfontface_type_base.dpatch
===================================================================
--- packages/pycairo/trunk/debian/patches/02_toyfontface_type_base.dpatch (rev 0)
+++ packages/pycairo/trunk/debian/patches/02_toyfontface_type_base.dpatch 2009-03-23 23:25:37 UTC (rev 7966)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_toyfontface_type_base.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: Set base type of ToyFontFace correctly.
+
+ at DPATCH@
+diff -urNad pycairo-1.8.4~/cairo/cairomodule.c pycairo-1.8.4/cairo/cairomodule.c
+--- pycairo-1.8.4~/cairo/cairomodule.c 2009-03-19 09:43:58.000000000 +0100
++++ pycairo-1.8.4/cairo/cairomodule.c 2009-03-24 00:14:50.000000000 +0100
+@@ -173,7 +173,7 @@
+ PycairoFontFace_Type.tp_base = &PyBaseObject_Type;
+ if (PyType_Ready(&PycairoFontFace_Type) < 0)
+ return;
+- PycairoToyFontFace_Type.tp_base = &PyBaseObject_Type;
++ PycairoToyFontFace_Type.tp_base = &PycairoFontFace_Type;
+ if (PyType_Ready(&PycairoToyFontFace_Type) < 0)
+ return;
+ PycairoFontOptions_Type.tp_base = &PyBaseObject_Type;
Property changes on: packages/pycairo/trunk/debian/patches/02_toyfontface_type_base.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/pycairo/trunk/debian/python-cairo-dbg.install
===================================================================
--- packages/pycairo/trunk/debian/python-cairo-dbg.install (rev 0)
+++ packages/pycairo/trunk/debian/python-cairo-dbg.install 2009-03-23 23:25:37 UTC (rev 7966)
@@ -0,0 +1 @@
+usr/lib/python*/site-packages/cairo/_cairo_d.so
Added: packages/pycairo/trunk/debian/python-cairo-dev.install
===================================================================
--- packages/pycairo/trunk/debian/python-cairo-dev.install (rev 0)
+++ packages/pycairo/trunk/debian/python-cairo-dev.install 2009-03-23 23:25:37 UTC (rev 7966)
@@ -0,0 +1,2 @@
+/usr/include/pycairo/pycairo.h
+/usr/lib/pkgconfig/pycairo.pc
Added: packages/pycairo/trunk/debian/python-cairo.install
===================================================================
--- packages/pycairo/trunk/debian/python-cairo.install (rev 0)
+++ packages/pycairo/trunk/debian/python-cairo.install 2009-03-23 23:25:37 UTC (rev 7966)
@@ -0,0 +1,2 @@
+/usr/lib/python*/site-packages/cairo/__init__.py
+/usr/lib/python*/site-packages/cairo/_cairo.so
Added: packages/pycairo/trunk/debian/pyversions
===================================================================
--- packages/pycairo/trunk/debian/pyversions (rev 0)
+++ packages/pycairo/trunk/debian/pyversions 2009-03-23 23:25:37 UTC (rev 7966)
@@ -0,0 +1 @@
+2.5-
Modified: packages/pycairo/trunk/debian/rules
===================================================================
--- packages/pycairo/trunk/debian/rules 2009-03-23 19:29:25 UTC (rev 7965)
+++ packages/pycairo/trunk/debian/rules 2009-03-23 23:25:37 UTC (rev 7966)
@@ -1,187 +1,28 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+DEB_PYTHON_SYSTEM=pysupport
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/dpatch/dpatch.make
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# needed for Python 2.6 test builds, installs into /usr/local
+DEB_PYTHON_INSTALL_ARGS_ALL += --prefix=/usr
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+install/python-cairo-dev::
+ python setup.py install_data --install-dir=$(CURDIR)/debian/tmp/usr
-# For autoconf 2.13 only
-CONFFLAGS=
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- CONFFLAGS += $(DEB_HOST_GNU_TYPE)
-else
- CONFFLAGS += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
-endif
-
-package := tmp
-prefix := /usr
-share := $(prefix)/share
-
-# Python versions from constraints in XS-Python-Version in debian/control
-PYVERS := $(shell pyversions -vr debian/control)
-# Default python version (this is what python-cairo-dev uses)
-PYDEF := $(shell pyversions -vd)
-
-configure-stamp:
- dh_testdir
-
-# Copy in fresh copies of config.{sub,guess}
-# (these are from autotools-dev, so must Build-Depend on it)
- for i in config.guess config.sub; do \
- if test -e $(share)/misc/$$i ; then \
- if ! test -e $$i.debian-orig ; then \
- mv $$i $$i.debian-orig ; \
- cp --remove-destination $(share)/misc/$$i $$i ; \
- fi ; \
- fi ; \
+build/python-cairo-dbg::
+ set -e; \
+ for i in $(cdbs_python_build_versions); do \
+ python$$i-dbg ./setup.py build; \
done
-# handle timestamp skew; advice from autotools-dev README.Debian
- touch configure.ac && \
- touch aclocal.m4 && \
- touch config.h.in && \
- touch configure && \
- touch Makefile.in
-
- touch $@
-
-build-%/configure-stamp: configure-stamp
- dh_testdir
- mkdir -p build-$*
- cd build-$* && PYTHON=/usr/bin/python$* ../configure $(CONFFLAGS) \
- --prefix=$(prefix) \
- --mandir=$(share)/man \
- --infodir=$(share)/info
- touch $@
-
-dbg-build-%/configure-stamp: configure-stamp
- dh_testdir
- mkdir -p dbg-build-$*
- cd dbg-build-$* && CFLAGS="$(CFLAGS) -O0" PYTHON=/usr/bin/python$*-dbg ../configure $(CONFFLAGS) \
- --prefix=$(prefix) \
- --mandir=$(share)/man \
- --infodir=$(share)/info
- touch $@
-
-build: configure-stamp build-stamp
-build-stamp: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
- touch build-stamp
-
-build-%/build-stamp: build-%/configure-stamp
- dh_testdir
- make -C build-$*
- touch $@
-
-dbg-build-%/build-stamp: dbg-build-%/configure-stamp
- dh_testdir
- make -C dbg-build-$*
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp libtool
- rm -rf build-* dbg-build-*
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- -rm -f config.h config.cache config.status config.log
-
- for i in config.guess config.sub; do \
- if test -r $$i.debian-orig ; then \
- mv -f $$i.debian-orig $$i; \
- fi; \
+install/python-cairo-dbg::
+ for i in $(cdbs_python_build_versions); do \
+ python$$i-dbg ./setup.py install --prefix=/usr --root $(CURDIR)/debian/tmp; \
done
- dh_clean
-
-
-install-pre:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-install: install-pre $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%)
- for i in $$(find debian/python-cairo-dbg -name '*.so'); do \
- b=$$(basename $$i .so); \
- mv $$i $$(dirname $$i)/$${b}_d.so; \
- done
- find debian/python-cairo-dbg ! -type d ! -name '*.so' | xargs rm -f
- -find debian/python-cairo-dbg -depth -empty -exec rmdir {} \;
-
-install-%: build-%/build-stamp
- dh_testdir
- dh_testroot
- make -C build-$* install \
- DESTDIR=$(CURDIR)/debian/python-cairo
- find debian/python-cairo/usr/lib \
- \( -name "*.py[co]" -o -name "*.la" \) -exec rm -f {} \;
-
- if [ $* = $(PYDEF) ]; then \
- mkdir -p debian/python-cairo-dev/usr/lib; \
- mv debian/python-cairo/usr/include debian/python-cairo-dev/usr/include; \
- mv debian/python-cairo/usr/lib/pkgconfig debian/python-cairo-dev/usr/lib/pkgconfig; \
- fi
- rm -rf debian/python-cairo/usr/include debian/python-cairo/usr/lib/pkgconfig
-# cp debian/cairo.pth $(CURDIR)/debian/python-cairo/usr/lib/python$*/site-packages
-
-dbg-install-%: dbg-build-%/build-stamp
- dh_testdir
- dh_testroot
- make -C dbg-build-$* install \
- DESTDIR=$(CURDIR)/debian/python-cairo-dbg
-
-# Build architecture-independent files here. (just python-cairo-dev)
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep:
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i README NEWS AUTHORS
- dh_installexamples -i
- dh_installchangelogs ChangeLog -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_pycentral -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
-
- dh_installdocs -A README NEWS AUTHORS
- dh_installchangelogs ChangeLog
- dh_installexamples
- dh_link -a
- dh_strip -ppython-cairo --dbg-package=python-cairo-dbg
- rm -rf debian/python-cairo-dbg/usr/share/doc/python-cairo-dbg
- ln -s python-cairo debian/python-cairo-dbg/usr/share/doc/python-cairo-dbg
- dh_compress -a
- dh_fixperms -a
- dh_pycentral -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install
+# pycairo.pc is created automatically by setup.py, remove before .diff.gz is created
+clean::
+ rm -f $(CURDIR)/pycairo.pc
More information about the Python-modules-commits
mailing list