[Python-apps-commits] r658 - in packages/spe/trunk/debian (6 files)

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Sat Feb 16 22:14:01 UTC 2008 

    Date: Saturday, February 16, 2008 @ 22:14:00
  Author: pochu-guest
Revision: 658

* debian/01_setup.py, debian/rules:
  - Add a setup.py file and install it before building the package.
  - Require debhelper >= 5.0.51 for dh_icons.
  - Call dh_icons as we install a png file in /usr/share/pixmaps.
  - Fix dh_installchangelog call with a non-repacked tarball.

Added:
  packages/spe/trunk/debian/setup.py
Modified:
  packages/spe/trunk/debian/changelog
  packages/spe/trunk/debian/control
  packages/spe/trunk/debian/links
  packages/spe/trunk/debian/rules
Deleted:
  packages/spe/trunk/debian/patches/

Modified: packages/spe/trunk/debian/changelog
===================================================================
--- packages/spe/trunk/debian/changelog	2008-02-16 20:16:42 UTC (rev 657)
+++ packages/spe/trunk/debian/changelog	2008-02-16 22:14:00 UTC (rev 658)
@@ -1,17 +1,15 @@
-spe (0.8.4c-1) unstable; urgency=low
+spe (0.8.4.c-1) unstable; urgency=low
 
   [ Stefano Canepa ]
   * New upstream release, from the upstream SPE-0.8.4.c-wx2.6.1.0.tar.gz
     tarball.
   * debian/control:
-    - Added dpatch to Build-Depends.
     - Added docbook-to-man to Build-Depends-Indep.
     - Added myself to Uploaders.
   * debian/rules:
-    - Added dpatch magic.
     - Added creation of manpage.
-  * debian/patches/01_setup.py.patch.dpatch
-    - Added, creates a distutils script.
+  * debian/01_setup.py, debian/rules:
+    - Add a setup.py file and install it before building the package.
   * debian/spe.sgml
     - Added to generate manpage.
 
@@ -23,7 +21,7 @@
     - Section -> devel.
     - Remove python-central from build-depends. We don't need it anymore
       as we install spe now in /usr/share/spe.
-    - Require debhelper >= 5.0.38 as required by policy.
+    - Require debhelper >= 5.0.51 for dh_icons.
     - Require python-central >= 0.5.6 as required by policy.
     - Depend on winpdb, as we have removed it from the package.
     - Depend on pychecker >= 0.8.17-5 to get pychecker2 too.
@@ -53,6 +51,7 @@
   * debian/copyright:
     - Updated Homepage and Website.
   * debian/rules:
+    - Call dh_icons as we install a png file in /usr/share/pixmaps.
     - Install the package in /usr/share/spe. Closes: #401982, #384293.
     - Make SPE.py executable.
     - Move installation of files to spe.install and spe.links.
@@ -60,11 +59,9 @@
     - Install spe.desktop from spe.install and not here.
     - Call dh_install, dh_link and dh_desktop.
     - The changelog has been moved, so the path is different now.
-    - Remove winpdb plugin. Let's use Debian's package.
-    - Remove pychecker and pychecker2 too.
-    - Remove XRCed plugin.
     - Remove SPE_DEBUG.py. That's a windows launcher.
     - Do nothing on binary-arch target.
+    - Fix dh_installchangelog call with a non-repacked tarball.
   * debian/pycompat:
     - Removed, not needed as we don't call dh_python.
   * debian/README.Debian:
@@ -72,7 +69,7 @@
   * debian/watch:
     - Updated as spe is now hosted on berlios.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 16 Feb 2008 02:56:15 +0100
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 16 Feb 2008 22:38:37 +0100
 
 spe (0.8.2a+repack-1) unstable; urgency=medium
 

Modified: packages/spe/trunk/debian/control
===================================================================
--- packages/spe/trunk/debian/control	2008-02-16 20:16:42 UTC (rev 657)
+++ packages/spe/trunk/debian/control	2008-02-16 22:14:00 UTC (rev 658)
@@ -4,9 +4,9 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Stefano Canepa <sc at linux.it>, Emilio Pozuelo Monfort <pochu at ubuntu.com>
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5.0.38), dpatch
-Build-Depends-Indep: python, python-central (>= 0.5.6), docbook-to-man
-XS-Python-Version: current
+Build-Depends: debhelper (>= 5.0.51), python
+Build-Depends-Indep: python-central (>= 0.5.6), docbook-to-man
+XS-Python-Version: all
 Homepage: http://pythonide.stani.be/
 VCS-Svn: svn://svn.debian.org/python-apps/packages/spe/trunk/
 VCS-Browser:http://svn.debian.org/wsvn/python-apps/packages/spe/?op=log

Modified: packages/spe/trunk/debian/links
===================================================================
--- packages/spe/trunk/debian/links	2008-02-16 20:16:42 UTC (rev 657)
+++ packages/spe/trunk/debian/links	2008-02-16 22:14:00 UTC (rev 658)
@@ -1,14 +1,14 @@
-usr/share/spe/_spe/SPE.py		usr/bin/spe
+usr/share/spe/SPE.py		usr/bin/spe
 
-usr/share/spe/_spe/doc/donate.html	usr/share/doc/spe/donate.html
-usr/share/spe/_spe/doc/about.htm	usr/share/doc/spe/about.htm
-usr/share/spe/_spe/examples		usr/share/doc/spe/examples
-usr/share/spe/_spe/images/spe.png	usr/share/pixmaps/spe.png
+usr/share/spe/doc/donate.html	usr/share/doc/spe/donate.html
+usr/share/spe/doc/about.htm	usr/share/doc/spe/about.htm
+usr/share/spe/examples		usr/share/doc/spe/examples
+usr/share/spe/images/spe.png	usr/share/pixmaps/spe.png
 
 # Link external modules to the debian packages, so we don't duplicate code.
-usr/share/pycentral/kiki/site-packages/kiki				usr/share/spe/_spe/plugins/kiki
-usr/share/pycentral/python-wxglade/site-packages/wxglade		usr/share/spe/_spe/plugins/wxGlade
-usr/share/python-support/winpdb						usr/share/spe/_spe/plugins/winpdb
-usr/share/python-support/pychecker/pychecker				usr/share/spe/_spe/plugins/pychecker
-usr/share/python-support/pychecker/pychecker2				usr/share/spe/_spe/plugins/pychecker2
-usr/lib/python2.4/site-packages/wx-2.6-gtk2-unicode/wx/tools/XRCed	usr/share/spe/_spe/plugins/XRCed
+usr/share/pycentral/kiki/site-packages/kiki				usr/share/spe/plugins/kiki
+usr/share/pycentral/python-wxglade/site-packages/wxglade		usr/share/spe/plugins/wxGlade
+usr/share/python-support/winpdb						usr/share/spe/plugins/winpdb
+usr/share/python-support/pychecker/pychecker				usr/share/spe/plugins/pychecker
+usr/share/python-support/pychecker/pychecker2				usr/share/spe/plugins/pychecker2
+usr/lib/python2.4/site-packages/wx-2.6-gtk2-unicode/wx/tools/XRCed	usr/share/spe/plugins/XRCed

Modified: packages/spe/trunk/debian/rules
===================================================================
--- packages/spe/trunk/debian/rules	2008-02-16 20:16:42 UTC (rev 657)
+++ packages/spe/trunk/debian/rules	2008-02-16 22:14:00 UTC (rev 658)
@@ -4,25 +4,25 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 MANPAGES = spe.1
 
 %.1: debian/%.sgml
 	docbook-to-man $< > $@
 
-build: patch build-stamp $(MANPAGES)
+build: build-stamp $(MANPAGES)
 
 build-stamp:
 	dh_testdir
+	cp debian/setup.py $(CURDIR)
 	python setup.py build
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 	-find _spe -name '*.py[co]' | xargs rm -f
+	rm -f setup.py
 	dh_clean 
 
 install: build
@@ -32,29 +32,22 @@
 
 	python setup.py install --root=debian/spe --install-lib=usr/share/spe --no-compile
 
-	# Remove duplicate code. We symlink these modules to the respective Debian packages.
-	rm -rf debian/spe/usr/share/spe/_spe/plugins/kiki
-	rm -rf debian/spe/usr/share/spe/_spe/plugins/wxGlade
-	rm -rf debian/spe/usr/share/spe/_spe/plugins/winpdb
-	rm -rf debian/spe/usr/share/spe/_spe/plugins/pychecker
-	rm -rf debian/spe/usr/share/spe/_spe/plugins/pychecker2
-	rm -rf debian/spe/usr/share/spe/_spe/plugins/XRCed
+	rm debian/spe/usr/share/spe/SPE_DEBUG.py
 
-	rm debian/spe/usr/share/spe/_spe/SPE_DEBUG.py
+	chmod +x debian/spe/usr/share/spe/SPE.py
 
-	chmod +x debian/spe/usr/share/spe/_spe/SPE.py
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs _spe/spe_changes.txt
+	dh_installchangelogs spe_changes.txt
 	dh_installmenu
 	dh_installdocs
 	dh_installman spe.1
 	dh_install
 	dh_link
 	dh_desktop
+	dh_icons
 	dh_compress -X.pdf -X.rtf -X.py
 	dh_fixperms
 	dh_pycentral

Added: packages/spe/trunk/debian/setup.py
===================================================================
--- packages/spe/trunk/debian/setup.py	                        (rev 0)
+++ packages/spe/trunk/debian/setup.py	2008-02-16 22:14:00 UTC (rev 658)
@@ -0,0 +1,16 @@
+#/usr/bin/python
+from distutils.core import setup
+
+setup(name          = "spe",
+      description   = "If you enjoy SPE, consider a (small) donation.",
+      author        = "http://pythonide.stani.be",
+      author_email  = "spe.stani.be at gmail.com",
+      url           = "http://pythonide.stani.be",
+      license       = "GPL",
+      scripts       = ['spe'],
+      packages      = ['', 'dialogs', 'examples', 'plugins', 'shortcuts', 'sidebar',
+                       'skins', 'sm', 'tabs', 'view', 'skins.default', 'sm.wxp'],
+      package_data  = {'': ['defaults.cfg', 'doc/donate.html', 'doc/about.htm', 
+                       'skins/default/*', 'images/*']}
+)
+

More information about the Python-apps-commits mailing list