Bug#623319: Please switch to dh_python2

2011-04-21 Thread Thierry Randrianiriana
Hi,

Sorry for the delay,

On 19.04.2011 19:06, Laurent Bigonville wrote:
 Le Tue, 19 Apr 2011 17:37:50 +0300,
 Thierry Randrianiriana thie...@debian.org a écrit :
 
 Hi,

 I'm testing your patch but the glchess doesn't support 3D with it.
 
 Are you getting an error or something?
 

During the build process:

[...]
dh_python2
W: dh_python2:96: Python 2.6 should install files in
/usr/lib/python2.6/dist-packages/. Did you forget --install-layout=deb?
W: dh_python2:96: Python 2.7 should install files in
/usr/lib/python2.7/dist-packages/. Did you forget --install-layout=deb?
dh_installdeb
dh_shlibdeps
dpkg-shlibdeps: warning:
debian/python-gtkglext1/usr/lib/python2.7/dist-packages/gtk-2.0/gtk/gtkgl/_gtkgl.so
contains an unresolvable reference to symbol PyImport_ImportModule: it's
probably a plugin.
[...]

 Could you try with the pygtk version from SVN?
 
 svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygtk/


I use sid :

ii  python-gtk2  2.17.0-4+b1


 I think it will work better like that as it also uses dh_python2
 


Cheers,


--
Thierry Randrianiriana



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#623319: Please switch to dh_python2

2011-04-21 Thread Laurent Bigonville
Le Thu, 21 Apr 2011 17:10:18 +0300,
Thierry Randrianiriana thie...@debian.org a écrit :

 Hi,

Hi,

 During the build process:
 
 [...]
 dh_python2
 W: dh_python2:96: Python 2.6 should install files in
 /usr/lib/python2.6/dist-packages/. Did you forget
 --install-layout=deb? W: dh_python2:96: Python 2.7 should install
 files in /usr/lib/python2.7/dist-packages/. Did you forget
 --install-layout=deb? dh_installdeb
 dh_shlibdeps
 dpkg-shlibdeps: warning:
 debian/python-gtkglext1/usr/lib/python2.7/dist-packages/gtk-2.0/gtk/gtkgl/_gtkgl.so
 contains an unresolvable reference to symbol PyImport_ImportModule:
 it's probably a plugin.
 [...]

Please find a new version of the patch that should fix this.

Cheers

Laurent Bigonville
diff -Nru python-gtkglext1-1.1.0/debian/changelog python-gtkglext1-1.1.0/debian/changelog
--- python-gtkglext1-1.1.0/debian/changelog	2010-10-02 19:18:00.0 +0200
+++ python-gtkglext1-1.1.0/debian/changelog	2011-04-21 17:10:40.0 +0200
@@ -1,3 +1,17 @@
+python-gtkglext1 (1.1.0-7) UNRELEASED; urgency=low
+
+  * Use dh_python2 instead of pysupport (Closes: #623319)
+  * debian/control:
+- Drop python-support build-dependency
+- Bump python-all-dev build-dependency to = 2.6.6-3~
+- Add dh-autoreconf to build-dependencies
+  * debian/rules:
+- Call dh_python2 instead of dh_pysupport
+- Do not ship .la files anymore
+- Call dh_autoreconf to regenerate autotools (Closes: #558625)
+
+ -- Laurent Bigonville bi...@debian.org  Thu, 21 Apr 2011 17:09:41 +0200
+
 python-gtkglext1 (1.1.0-6) unstable; urgency=low
 
   * Bumped Standards-Version to 3.9.1
diff -Nru python-gtkglext1-1.1.0/debian/control python-gtkglext1-1.1.0/debian/control
--- python-gtkglext1-1.1.0/debian/control	2010-10-02 19:15:31.0 +0200
+++ python-gtkglext1-1.1.0/debian/control	2011-04-21 16:53:53.0 +0200
@@ -2,8 +2,8 @@
 Section: python
 Priority: extra
 Maintainer: Thierry Randrianiriana thie...@debian.org
-Build-Depends: debhelper (= 7.0.50~), autotools-dev, python-gtk2-dev, libgtk2.0-dev, libgtkglext1-dev (= 1.0.0), libglu1-mesa-dev, python-all-dev, python-support (= 0.5.3)
-XS-Python-Version: = 2.4
+Build-Depends: debhelper (= 7.0.50~), dh-autoreconf, python-gtk2-dev, libgtk2.0-dev, libgtkglext1-dev (= 1.0.0), libglu1-mesa-dev, python-all-dev (= 2.6.6-3~)
+X-Python-Version: = 2.4
 Standards-Version: 3.9.1
 Homepage: http://gtkglext.sourceforge.net/
 
diff -Nru python-gtkglext1-1.1.0/debian/rules python-gtkglext1-1.1.0/debian/rules
--- python-gtkglext1-1.1.0/debian/rules	2010-10-02 19:32:22.0 +0200
+++ python-gtkglext1-1.1.0/debian/rules	2011-04-21 17:00:15.0 +0200
@@ -3,6 +3,8 @@
 
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -20,13 +22,7 @@
 
 build-%/configure-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
+	dh_autoreconf
 
 	mkdir -p build-$*
 	cd build-$*  CFLAGS=$(CFLAGS) PYTHON=/usr/bin/python$* ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -40,7 +36,7 @@
 
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
-	$(MAKE) -C build-$*
+	$(MAKE) -C build-$* pyexecdir=$(call py_libdir_sh, $*)
 	touch $@
 
 clean: $(PYVERS:%=clean-%)
@@ -52,6 +48,7 @@
 	rm -f config.log changelog.tmp
 	rm -f config.sub config.guess
 
+	dh_autoreconf_clean
 	dh_clean
 
 clean-%:
@@ -63,7 +60,7 @@
 install-%: build-%/build-stamp
 	dh_testdir
 	dh_testroot
-	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gtkglext1
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gtkglext1 pyexecdir=$(call py_libdir_sh, $*)
 
 install-clean:
 	dh_testdir
@@ -81,6 +78,7 @@
 	cat ChangeLog.pre-1-0  changelog.tmp
 	find debian/python-gtkglext1/usr -type d -empty | xargs -r rmdir -p --ignore-fail-on-non-empty
 	find debian/python-gtkglext1/usr/lib -name 'apputils.py' | xargs chmod +x
+	find debian/python-gtkglext1/usr/lib -name '*.la' -delete
 
 binary-indep: build install
 
@@ -93,7 +91,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_pysupport
+	dh_python2
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol


Bug#623319: Please switch to dh_python2

2011-04-21 Thread Laurent Bigonville
Hi,

Could you please add a Breaks: python-gtk2 ( 2.24.0) to the package.

Thanks

Laurent Bigonvillediff -Nru python-gtkglext1-1.1.0/debian/changelog python-gtkglext1-1.1.0/debian/changelog
--- python-gtkglext1-1.1.0/debian/changelog	2010-10-02 19:18:00.0 +0200
+++ python-gtkglext1-1.1.0/debian/changelog	2011-04-21 17:10:40.0 +0200
@@ -1,3 +1,17 @@
+python-gtkglext1 (1.1.0-7) UNRELEASED; urgency=low
+
+  * Use dh_python2 instead of pysupport (Closes: #623319)
+  * debian/control:
+- Drop python-support build-dependency
+- Bump python-all-dev build-dependency to = 2.6.6-3~
+- Add dh-autoreconf to build-dependencies
+  * debian/rules:
+- Call dh_python2 instead of dh_pysupport
+- Do not ship .la files anymore
+- Call dh_autoreconf to regenerate autotools (Closes: #558625)
+
+ -- Laurent Bigonville bi...@debian.org  Thu, 21 Apr 2011 17:09:41 +0200
+
 python-gtkglext1 (1.1.0-6) unstable; urgency=low
 
   * Bumped Standards-Version to 3.9.1
diff -Nru python-gtkglext1-1.1.0/debian/control python-gtkglext1-1.1.0/debian/control
--- python-gtkglext1-1.1.0/debian/control	2010-10-02 19:15:31.0 +0200
+++ python-gtkglext1-1.1.0/debian/control	2011-04-21 16:53:53.0 +0200
@@ -2,8 +2,8 @@
 Section: python
 Priority: extra
 Maintainer: Thierry Randrianiriana thie...@debian.org
-Build-Depends: debhelper (= 7.0.50~), autotools-dev, python-gtk2-dev, libgtk2.0-dev, libgtkglext1-dev (= 1.0.0), libglu1-mesa-dev, python-all-dev, python-support (= 0.5.3)
-XS-Python-Version: = 2.4
+Build-Depends: debhelper (= 7.0.50~), dh-autoreconf, python-gtk2-dev, libgtk2.0-dev, libgtkglext1-dev (= 1.0.0), libglu1-mesa-dev, python-all-dev (= 2.6.6-3~)
+X-Python-Version: = 2.4
 Standards-Version: 3.9.1
 Homepage: http://gtkglext.sourceforge.net/
 
diff -Nru python-gtkglext1-1.1.0/debian/rules python-gtkglext1-1.1.0/debian/rules
--- python-gtkglext1-1.1.0/debian/rules	2010-10-02 19:32:22.0 +0200
+++ python-gtkglext1-1.1.0/debian/rules	2011-04-21 17:00:15.0 +0200
@@ -3,6 +3,8 @@
 
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -20,13 +22,7 @@
 
 build-%/configure-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
+	dh_autoreconf
 
 	mkdir -p build-$*
 	cd build-$*  CFLAGS=$(CFLAGS) PYTHON=/usr/bin/python$* ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -40,7 +36,7 @@
 
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
-	$(MAKE) -C build-$*
+	$(MAKE) -C build-$* pyexecdir=$(call py_libdir_sh, $*)
 	touch $@
 
 clean: $(PYVERS:%=clean-%)
@@ -52,6 +48,7 @@
 	rm -f config.log changelog.tmp
 	rm -f config.sub config.guess
 
+	dh_autoreconf_clean
 	dh_clean
 
 clean-%:
@@ -63,7 +60,7 @@
 install-%: build-%/build-stamp
 	dh_testdir
 	dh_testroot
-	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gtkglext1
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gtkglext1 pyexecdir=$(call py_libdir_sh, $*)
 
 install-clean:
 	dh_testdir
@@ -81,6 +78,7 @@
 	cat ChangeLog.pre-1-0  changelog.tmp
 	find debian/python-gtkglext1/usr -type d -empty | xargs -r rmdir -p --ignore-fail-on-non-empty
 	find debian/python-gtkglext1/usr/lib -name 'apputils.py' | xargs chmod +x
+	find debian/python-gtkglext1/usr/lib -name '*.la' -delete
 
 binary-indep: build install
 
@@ -93,7 +91,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_pysupport
+	dh_python2
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol


Bug#623319: Please switch to dh_python2

2011-04-19 Thread Laurent Bigonville
Source: python-gtkglext1
Version: 1.1.0-6
Severity: wishlist

Hi,

Could you please switch from pysupport (which is deprecated) to
dh_python2.

This is required for us to be able to switch pygtk to dh_python2 as
both packages share the same namespace.

Cheers

Laurent Bigonville



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#623319: Please switch to dh_python2

2011-04-19 Thread Laurent Bigonville
Le Tue, 19 Apr 2011 17:37:50 +0300,
Thierry Randrianiriana thie...@debian.org a écrit :

 Hi,
 
 I'm testing your patch but the glchess doesn't support 3D with it.

Are you getting an error or something?

Could you try with the pygtk version from SVN?

svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygtk/

I think it will work better like that as it also uses dh_python2

Cheers

Laurent Bigonville



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org