Bug#373538: Patch for #373538

2007-05-24 Thread Thierry Randrianiriana
Oops!

sorry I forgot something

--
Thierry Randrianiriana

diff -urN python-gdchart-0.6.1.orig/debian/control 
python-gdchart-0.6.1.patched/debian/control
--- python-gdchart-0.6.1.orig/debian/control2007-05-24 18:02:41.0 
+0300
+++ python-gdchart-0.6.1.patched/debian/control 2007-05-24 18:33:22.0 
+0300
@@ -2,11 +2,12 @@
 Section: python
 Priority: optional
 Maintainer: Jonas Smedegaard <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, debhelper (>= 4.1.0), 
dh-buildinfo, libgdchart-gd1-noxpm-dev (>> 0.10.1dev-5) | libgdchart-gd1-dev 
(>> 0.10.1dev-5), python2.3-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, debhelper (>= 4.1.0), 
dh-buildinfo, libgdchart-gd1-noxpm-dev (>> 0.10.1dev-5) | libgdchart-gd1-dev 
(>> 0.10.1dev-5), python-all-dev, python-support (>= 0.5.3)
 Standards-Version: 3.6.1
 
 Package: python-gdchart
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), python (<< 2.4)
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
 Description: Python interface to GDChart
  Python interface to the nice 2d and 3d graphics library GDChart.
diff -urN python-gdchart-0.6.1.orig/debian/control.in 
python-gdchart-0.6.1.patched/debian/control.in
--- python-gdchart-0.6.1.orig/debian/control.in 2007-05-24 18:02:41.0 
+0300
+++ python-gdchart-0.6.1.patched/debian/control.in  2007-05-24 
18:32:41.0 +0300
@@ -2,11 +2,12 @@
 Section: python
 Priority: optional
 Maintainer: Jonas Smedegaard <[EMAIL PROTECTED]>
-Build-Depends: @cdbs@, libgdchart-gd1-noxpm-dev (>> 0.10.1dev-5) | 
libgdchart-gd1-dev (>> 0.10.1dev-5), python2.3-dev
+Build-Depends: @cdbs@, libgdchart-gd1-noxpm-dev (>> 0.10.1dev-5) | 
libgdchart-gd1-dev (>> 0.10.1dev-5), python-all-dev, python-support (>= 0.5.3)
 Standards-Version: 3.6.1
 
 Package: python-gdchart
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), python (<< 2.4)
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
 Description: Python interface to GDChart
  Python interface to the nice 2d and 3d graphics library GDChart.
diff -urN python-gdchart-0.6.1.orig/debian/rules 
python-gdchart-0.6.1.patched/debian/rules
--- python-gdchart-0.6.1.orig/debian/rules  2007-05-24 18:02:41.0 
+0300
+++ python-gdchart-0.6.1.patched/debian/rules   2007-05-24 18:36:44.0 
+0300
@@ -26,7 +26,9 @@
 
 DEB_MAKE_INSTALL_TARGET =
 common-install-impl::
-   install -m 0755 gdchart.so 
$(CURDIR)/debian/python-gdchart/usr/lib/python2.3/site-packages/
+   mkdir -p $(CURDIR)/debian/python-gdchart/usr/lib/$(PY)/site-packages
+   install -m 0755 gdchart.so 
$(CURDIR)/debian/python-gdchart/usr/lib/$(PY)/site-packages/
+   dh_pysupport
 
 # Brutally make sure to always link against shared libs
 clean::
diff -urN python-gdchart-0.6.1.orig/Makefile 
python-gdchart-0.6.1.patched/Makefile
--- python-gdchart-0.6.1.orig/Makefile  2007-05-24 18:02:41.0 +0300
+++ python-gdchart-0.6.1.patched/Makefile   2007-05-24 18:30:13.0 
+0300
@@ -11,9 +11,9 @@
 # LD  Command to make a shared library.
 # SO  Extension for shared libs.
 # MAKECommand to correctly build dependencies
-
+PY = $(shell pyversions -d)
 HAVE_JPEG = 1
-PY_INCLUDE = -I/usr/include/python2.3
+PY_INCLUDE = -I/usr/include/$(PY)
 LIB_DIRS = -L/usr/lib
 GCC = gcc
 CFLAGS = -Wall -fpic -O2


signature.asc
Description: OpenPGP digital signature


Bug#373538: Patch for #373538

2007-05-24 Thread Thierry Randrianiriana
tags 373538 + patch
thanks


Hello,

This is a patch to fix this bug.


Kind regards,


--
Thierry Randrianiriana
diff -urN python-gdchart-0.6.1/debian/compat 
python-gdchart-0.6.1.patched/debian/compat
--- python-gdchart-0.6.1/debian/compat  2007-05-24 18:02:41.0 +0300
+++ python-gdchart-0.6.1.patched/debian/compat  2007-05-24 17:46:56.0 
+0300
@@ -1 +1 @@
-4
+5
diff -urN python-gdchart-0.6.1/debian/control.in 
python-gdchart-0.6.1.patched/debian/control.in
--- python-gdchart-0.6.1/debian/control.in  2007-05-24 18:02:41.0 
+0300
+++ python-gdchart-0.6.1.patched/debian/control.in  2007-05-24 
17:56:44.0 +0300
@@ -2,11 +2,14 @@
 Section: python
 Priority: optional
 Maintainer: Jonas Smedegaard <[EMAIL PROTECTED]>
-Build-Depends: @cdbs@, libgdchart-gd1-noxpm-dev (>> 0.10.1dev-5) | 
libgdchart-gd1-dev (>> 0.10.1dev-5), python2.3-dev
-Standards-Version: 3.6.1
+Build-Depends: @cdbs@, libgdchart-gd1-noxpm-dev (>> 0.10.1dev-5) | 
libgdchart-gd1-dev (>> 0.10.1dev-5), python-dev, python-support (>= 0.5.3)
+Standards-Version: 3.7.2
 
 Package: python-gdchart
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), python (<< 2.4)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
 Description: Python interface to GDChart
  Python interface to the nice 2d and 3d graphics library GDChart.
+ .
+  Homepage: http://www.nullcube.com/software/pygdchart.html
diff -urN python-gdchart-0.6.1/debian/rules 
python-gdchart-0.6.1.patched/debian/rules
--- python-gdchart-0.6.1/debian/rules   2007-05-24 18:02:41.0 +0300
+++ python-gdchart-0.6.1.patched/debian/rules   2007-05-24 17:57:00.0 
+0300
@@ -8,6 +8,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/1/rules/buildinfo.mk
 
+PY = $(shell pyversions -d)
+
 # We override CFLAGS, so need to add this manually
 CFLAGS += -DHAVE_JPEG
 
@@ -26,7 +28,9 @@
 
 DEB_MAKE_INSTALL_TARGET =
 common-install-impl::
-   install -m 0755 gdchart.so 
$(CURDIR)/debian/python-gdchart/usr/lib/python2.3/site-packages/
+   mkdir -p $(CURDIR)/debian/python-gdchart/usr/lib/$(PY)/site-packages/
+   install -m 0755 gdchart.so 
$(CURDIR)/debian/python-gdchart/usr/lib/$(PY)/site-packages/
+   dh_pysupport
 
 # Brutally make sure to always link against shared libs
 clean::
diff -urN python-gdchart-0.6.1/Makefile python-gdchart-0.6.1.patched/Makefile
--- python-gdchart-0.6.1/Makefile   2007-05-24 18:02:41.0 +0300
+++ python-gdchart-0.6.1.patched/Makefile   2007-05-24 17:48:01.0 
+0300
@@ -11,9 +11,9 @@
 # LD  Command to make a shared library.
 # SO  Extension for shared libs.
 # MAKECommand to correctly build dependencies
-
+PY = $(shell pyversions -d)
 HAVE_JPEG = 1
-PY_INCLUDE = -I/usr/include/python2.3
+PY_INCLUDE = -I/usr/include/$(PY)
 LIB_DIRS = -L/usr/lib
 GCC = gcc
 CFLAGS = -Wall -fpic -O2


signature.asc
Description: OpenPGP digital signature