[Python-modules-commits] r11267 - in packages/pycairo/trunk/debian (8 files)

[shlomme at users.alioth.debian.org]

    Date: Sunday, January 24, 2010 @ 14:35:00
  Author: shlomme
Revision: 11267

prepare for new upstream release and python 2.6

Added:
  packages/pycairo/trunk/debian/patches/
  packages/pycairo/trunk/debian/patches/series
  packages/pycairo/trunk/debian/patches/setup_25_compat
  packages/pycairo/trunk/debian/source/
  packages/pycairo/trunk/debian/source/format
Modified:
  packages/pycairo/trunk/debian/changelog
  packages/pycairo/trunk/debian/rules
Deleted:
  packages/pycairo/trunk/debian/patches/

Modified: packages/pycairo/trunk/debian/changelog
===================================================================
--- packages/pycairo/trunk/debian/changelog	2010-01-24 14:26:11 UTC (rev 11266)
+++ packages/pycairo/trunk/debian/changelog	2010-01-24 14:35:00 UTC (rev 11267)
@@ -1,10 +1,20 @@
-pycairo (1.8.6-2) UNRELEASED; urgency=low
+pycairo (1.8.8-1) UNRELEASED; urgency=low
 
+  [ Loïc Minier ]
   * Use *-packages instead of site-packages in debian/python-cairo-dbg.install
     to work with both dist-packages and site-packages, backports etc.
 
- -- Loïc Minier <lool at dooz.org>  Thu, 30 Jul 2009 12:34:54 +0200
+  [ Torsten Marek ]
+  * New upstream release
+  * Convert to new source format "3.0 (quilt)"
+  * debian/patches/setup_25_compat
+    - Ensure Python 2.5 compatibility
+    - Make sure __init__.py is installed
+  * debian/rules
+    - Remove old dpatch workarounds
 
+ -- Torsten Marek <shlomme at debian.org>  Sun, 24 Jan 2010 15:33:13 +0100
+
 pycairo (1.8.6-1) unstable; urgency=low
 
   * New upstream release

Added: packages/pycairo/trunk/debian/patches/series
===================================================================
--- packages/pycairo/trunk/debian/patches/series	                        (rev 0)
+++ packages/pycairo/trunk/debian/patches/series	2010-01-24 14:35:00 UTC (rev 11267)
@@ -0,0 +1 @@
+setup_25_compat

Added: packages/pycairo/trunk/debian/patches/setup_25_compat
===================================================================
--- packages/pycairo/trunk/debian/patches/setup_25_compat	                        (rev 0)
+++ packages/pycairo/trunk/debian/patches/setup_25_compat	2010-01-24 14:35:00 UTC (rev 11267)
@@ -0,0 +1,32 @@
+Index: pycairo-1.8.8/setup.py
+===================================================================
+--- pycairo-1.8.8.orig/setup.py	2009-08-26 12:59:35.000000000 +0200
++++ pycairo-1.8.8/setup.py	2010-01-24 15:28:26.280398479 +0100
+@@ -1,9 +1,8 @@
+ #!/usr/bin/env python
+-
++from __future__ import with_statement
+ import distutils.core      as dic
+ import distutils.dir_util  as dut
+ import distutils.file_util as fut
+-import io
+ import subprocess
+ import sys
+ 
+@@ -71,9 +70,6 @@
+             )
+ 
+ 
+-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':
+   runtime_library_dirs = []
+@@ -107,4 +103,6 @@
+   ext_modules = [cairo],
+   data_files=[('include/pycairo',['src/pycairo.h']),
+               ('lib/pkgconfig',[pkgconfig_file])],
++  package_dir = {"cairo": "src"},
++  packages = ["cairo"],
+   )

Modified: packages/pycairo/trunk/debian/rules
===================================================================
--- packages/pycairo/trunk/debian/rules	2010-01-24 14:26:11 UTC (rev 11266)
+++ packages/pycairo/trunk/debian/rules	2010-01-24 14:35:00 UTC (rev 11267)
@@ -22,13 +22,9 @@
 	  python$$i-dbg ./setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp; \
 	done
 
-# pycairo.pc is created automatically by setup.py, remove before .diff.gz is created
 clean::
 	-for i in $(cdbs_python_build_versions); do \
 	  python$$i-dbg ./setup.py clean -a; \
 	done
 	rm -f $(CURDIR)/pycairo.pc
-
-# this has to be include after our clean calls since setup.py needs to be patched
-# in order to run
-include /usr/share/cdbs/1/rules/dpatch.mk
+	rm -rf $(CURDIR)/build

Added: packages/pycairo/trunk/debian/source/format
===================================================================
--- packages/pycairo/trunk/debian/source/format	                        (rev 0)
+++ packages/pycairo/trunk/debian/source/format	2010-01-24 14:35:00 UTC (rev 11267)
@@ -0,0 +1 @@
+3.0 (quilt)