[Python-apps-commits] r947 - in packages/scribes/trunk/debian (changelog control rules)

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

    Date: Sunday, April 13, 2008 @ 13:55:12
  Author: pochu-guest
Revision: 947

* debian/rules,
  debian/control:
  - Python2.5 is the default Python version now, no need to change the
    shebang anymore.
  - Remove python2.5-dev alternate build-dependency. python-dev >= 2.5 is
    enough now.

Modified:
  packages/scribes/trunk/debian/changelog
  packages/scribes/trunk/debian/control
  packages/scribes/trunk/debian/rules

Modified: packages/scribes/trunk/debian/changelog
===================================================================
--- packages/scribes/trunk/debian/changelog	2008-04-13 13:51:15 UTC (rev 946)
+++ packages/scribes/trunk/debian/changelog	2008-04-13 13:55:12 UTC (rev 947)
@@ -1,3 +1,14 @@
+scribes (0.3.3.3-4) UNRELEASED; urgency=low
+
+  * debian/rules,
+    debian/control:
+    - Python2.5 is the default Python version now, no need to change the
+      shebang anymore.
+    - Remove python2.5-dev alternate build-dependency. python-dev >= 2.5 is
+      enough now.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sun, 13 Apr 2008 15:53:22 +0200
+
 scribes (0.3.3.3-3) unstable; urgency=low
 
   * debian/rules:

Modified: packages/scribes/trunk/debian/control
===================================================================
--- packages/scribes/trunk/debian/control	2008-04-13 13:51:15 UTC (rev 946)
+++ packages/scribes/trunk/debian/control	2008-04-13 13:55:12 UTC (rev 947)
@@ -8,7 +8,7 @@
                      gconf2 (>= 2.10.1-2),
                      gnome-doc-utils (>= 0.3.2),
                      intltool,
-                     python2.5-dev | python-dev (>=2.5),
+                     python-dev (>= 2.5),
                      python-central (>= 0.5.6),
                      python-dbus (>= 0.70),
                      python-gnome2-desktop-dev (>= 2.12),

Modified: packages/scribes/trunk/debian/rules
===================================================================
--- packages/scribes/trunk/debian/rules	2008-04-13 13:51:15 UTC (rev 946)
+++ packages/scribes/trunk/debian/rules	2008-04-13 13:55:12 UTC (rev 947)
@@ -52,12 +52,6 @@
 	# Add here commands to install the package into debian/scribes.
 	$(MAKE) DESTDIR=$(CURDIR)/debian/scribes install
 
-	# Since python2.4 is the default ATM, we need to hardcode the hashbang
-ifeq (old,$(shell dpkg --compare-versions "`pyversions -vd`" lt '2.5' && echo old)) 
-	sed -i -e '1s/env python/python2.5/g' $(CURDIR)/debian/scribes/usr/bin/scribes
-	sed -i -e 's,/python,/python2.5,g' $(CURDIR)/debian/scribes/usr/lib/python2.5/site-packages/SCRIBES/SaveProcessMonitor.py
-endif
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir