diff -u wxglade-0.6.3/Makefile wxglade-0.6.3/Makefile --- wxglade-0.6.3/Makefile +++ wxglade-0.6.3/Makefile @@ -1,3 +1,4 @@ +include /usr/share/python/python.mk DESTDIR= PACKAGE=python-wxglade @@ -16,22 +17,22 @@ # cd debian && $(XP) $(DB2MAN) manpage.xml install: all install-doc locales - mkdir -p $(DESTDIR)/usr/lib/python$(PYVER)/site-packages/wxglade + mkdir -p $(DESTDIR)/usr/lib/python$(PYVER)/$(call py_sitename, $(PYVER))/wxglade cp -a *.py codegen edit_sizers res widgets \ - $(DESTDIR)/usr/lib/python$(PYVER)/site-packages/wxglade + $(DESTDIR)/usr/lib/python$(PYVER)/$(call py_sitename, $(PYVER))/wxglade # fix executable flags for f in configUI.py wxglade.py; do \ - chmod 755 $(DESTDIR)/usr/lib/python$(PYVER)/site-packages/wxglade/$$f; \ + chmod 755 $(DESTDIR)/usr/lib/python$(PYVER)/$(call py_sitename, $(PYVER))/wxglade/$$f; \ done for f in edit_widget.py config.py; do \ - chmod 644 $(DESTDIR)/usr/lib/python$(PYVER)/site-packages/wxglade/$$f; \ + chmod 644 $(DESTDIR)/usr/lib/python$(PYVER)/$(call py_sitename, $(PYVER))/wxglade/$$f; \ done cp -a icons $(DESTDIR)/usr/share/$(PACKAGE) # get rid of .xvpics subdirectories and .cvsignore files find $(DESTDIR)/usr/share/$(PACKAGE) -name '.xvpics' -type d | xargs rm -rf find $(DESTDIR) -name '.cvsignore' -type f | xargs rm -f ln -s /usr/share/$(PACKAGE)/icons \ - $(DESTDIR)/usr/lib/python$(PYVER)/site-packages/wxglade + $(DESTDIR)/usr/lib/python$(PYVER)/$(call py_sitename, $(PYVER))/wxglade/wxglade install -m 755 wxglade $(DESTDIR)/usr/bin install-doc: debian/wxglade.1 gzip -c9 debian/wxglade.1 > $(DESTDIR)/usr/share/man/man1/wxglade.1.gz diff -u wxglade-0.6.3/debian/rules wxglade-0.6.3/debian/rules --- wxglade-0.6.3/debian/rules +++ wxglade-0.6.3/debian/rules @@ -8,6 +8,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/python/python.mk PYVERS := $(shell pyversions -s) PYVER := $(shell /usr/bin/python -c 'import sys; print sys.version[:3]') @@ -50,7 +51,7 @@ usr/share/man/man1 \ usr/share/pixmaps \ usr/share/applications \ - usr/lib/python$(PYVER)/site-packages/wxglade \ + usr/lib/python$(PYVER)/$(call py_sitename, $(PYVER))/wxglade \ usr/share/python-wxglade/icons \ usr/share/doc/python-wxglade @@ -82,6 +83,7 @@ dh_pycentral rm -f debian/python-wxglade/$$(pycentral pycentraldir python-wxglade)/wxglade/icons dh_link /usr/share/python-wxglade/icons $$(pycentral pycentraldir python-wxglade)/wxglade/icons + dh_link /usr/share/doc/python-wxglade $$(pycentral pycentraldir python-wxglade)/wxglade/docs dh_installdeb dh_gencontrol dh_md5sums diff -u wxglade-0.6.3/debian/changelog wxglade-0.6.3/debian/changelog --- wxglade-0.6.3/debian/changelog +++ wxglade-0.6.3/debian/changelog @@ -1,3 +1,16 @@ +wxglade (0.6.3-0.1ubuntu3) jaunty; urgency=low + + * Python 2.6 transition (LP: #341633): + - Makefile,debian/rules: + + Include /usr/share/python/python.mk. + + Use py_sitename macro to detect the right python modules path. + - debian/dirs: + + Don't install python2.3 empty directories. + * Create symbolic link between /usr/share/doc/python-wxglade/ and + /usr/share/pyshared/wxglade/docs (LP: #320845). + + -- Alessio Treglia Thu, 09 Apr 2009 15:46:12 +0200 + wxglade (0.6.3-0.1ubuntu2) jaunty; urgency=low * Fix startup script. LP: #342716. only in patch2: unchanged: --- wxglade-0.6.3.orig/debian/dirs +++ wxglade-0.6.3/debian/dirs @@ -1,5 +1,2 @@ usr/bin usr/share/man/man1/ -usr/lib/python2.3/site-packages/wxglade -usr/share/python2.3-wxglade/icons -usr/share/doc/python2.3-wxglade