[Python-apps-commits] r646 - in packages/spe/trunk/debian (changelog links rules)

[pochu-guest at users.alioth.debian.org]

    Date: Thursday, February 14, 2008 @ 02:44:58
  Author: pochu-guest
Revision: 646

  - Symlink the XRCed plugin to the system one.
  - Remove XRCed plugin.

Modified:
  packages/spe/trunk/debian/changelog
  packages/spe/trunk/debian/links
  packages/spe/trunk/debian/rules

Modified: packages/spe/trunk/debian/changelog
===================================================================
--- packages/spe/trunk/debian/changelog	2008-02-13 22:49:32 UTC (rev 645)
+++ packages/spe/trunk/debian/changelog	2008-02-14 02:44:58 UTC (rev 646)
@@ -1,4 +1,4 @@
-spe (0.8.4b-1) UNRELEASED; urgency=low
+spe (0.8.4c-1) experimental; urgency=low
 
   [ Stefano Canepa ]
   * New upstream release
@@ -46,6 +46,7 @@
     - Symlink /usr/bin/spe to /usr/share/spe/_spe/SPE.py
     - Symlink the winpdb plugin to the winpdb files from the Debian package.
     - Symlink the pychecker and pychecker2 plugins to the system ones.
+    - Symlink the XRCed plugin to the system one.
   * debian/spe.xpm
     - Added.
   * debian/spe.desktop:
@@ -62,6 +63,7 @@
     - 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.
   * debian/pycompat:
@@ -69,7 +71,7 @@
   * debian/README.Debian:
     - Removed, issues are fixed now.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Thu, 06 Dec 2007 02:17:52 +0100
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Thu, 14 Feb 2008 03:18:22 +0100
 
 spe (0.8.2a+repack-1) unstable; urgency=medium
 

Modified: packages/spe/trunk/debian/links
===================================================================
--- packages/spe/trunk/debian/links	2008-02-13 22:49:32 UTC (rev 645)
+++ packages/spe/trunk/debian/links	2008-02-14 02:44:58 UTC (rev 646)
@@ -5,8 +5,10 @@
 usr/share/spe/_spe/examples		usr/share/doc/spe/examples
 usr/share/spe/_spe/images/spe.png	usr/share/pixmaps/spe.png
 
-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
+# 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

Modified: packages/spe/trunk/debian/rules
===================================================================
--- packages/spe/trunk/debian/rules	2008-02-13 22:49:32 UTC (rev 645)
+++ packages/spe/trunk/debian/rules	2008-02-14 02:44:58 UTC (rev 646)
@@ -32,11 +32,13 @@
 
 	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/SPE_DEBUG.py