r23209 - in /packages/unstable/ontv/debian: changelog control control.in patches/ patches/01_shebang.patch rules

Sat Mar 6 20:36:22 UTC 2010

Author: pochu
Date: Sat Mar  6 20:36:22 2010
New Revision: 23209

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23209
Log:
* debian/rules:
  - Don't install *.la and *.a files.
* debian/control.in:
  - Build depend on python-dev rather than on python2.5-dev.
  - Standards-Version is 3.8.4, no changes needed.
* debian/patches/01_shebang.patch:
  - Don't hardcode python2.5 in the shebang to avoid a dependency on
    python2.5.

Added:
    packages/unstable/ontv/debian/patches/
    packages/unstable/ontv/debian/patches/01_shebang.patch
Modified:
    packages/unstable/ontv/debian/changelog
    packages/unstable/ontv/debian/control
    packages/unstable/ontv/debian/control.in
    packages/unstable/ontv/debian/rules

Modified: packages/unstable/ontv/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/changelog?rev=23209&op=diff
==============================================================================

--- packages/unstable/ontv/debian/changelog [utf-8] (original)
+++ packages/unstable/ontv/debian/changelog [utf-8] Sat Mar  6 20:36:22 2010
@@ -1,3 +1,16 @@
+ontv (3.0.0-4) unstable; urgency=low
+
+  * debian/rules:
+    - Don't install *.la and *.a files.
+  * debian/control.in:
+    - Build depend on python-dev rather than on python2.5-dev.
+    - Standards-Version is 3.8.4, no changes needed.
+  * debian/patches/01_shebang.patch:
+    - Don't hardcode python2.5 in the shebang to avoid a dependency on
+      python2.5.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 06 Mar 2010 21:36:07 +0100
+
 ontv (3.0.0-3) unstable; urgency=low
 
   [ Luca Falavigna ]

Modified: packages/unstable/ontv/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/control?rev=23209&op=diff
==============================================================================
--- packages/unstable/ontv/debian/control [utf-8] (original)
+++ packages/unstable/ontv/debian/control [utf-8] Sat Mar  6 20:36:22 2010
@@ -1,8 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: ontv
 Section: gnome
 Priority: optional
 Maintainer: Jeremy Guitton <debotux at free.fr>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.49),
                debhelper (>= 5.0.38),
                autotools-dev,
@@ -12,7 +17,7 @@
                libgtk2.0-dev (>= 2.10.0),
                libxml-parser-perl,
                pkg-config,
-               python2.5-dev,
+               python-dev,
                python-central (>= 0.5.6),
                python-gnome2-dev (>= 2.16.0),
                python-gnome2-extras-dev (>= 2.14.2),
@@ -20,7 +25,7 @@
                python-gtk2-dev (>= 2.10.0),
                python-notify (>= 0.1.1),
                python-vte
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: >= 2.5
 Homepage: http://live.gnome.org/OnTV
 

Modified: packages/unstable/ontv/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/control.in?rev=23209&op=diff
==============================================================================
--- packages/unstable/ontv/debian/control.in [utf-8] (original)
+++ packages/unstable/ontv/debian/control.in [utf-8] Sat Mar  6 20:36:22 2010
@@ -12,7 +12,7 @@
                libgtk2.0-dev (>= 2.10.0),
                libxml-parser-perl,
                pkg-config,
-               python2.5-dev,
+               python-dev,
                python-central (>= 0.5.6),
                python-gnome2-dev (>= 2.16.0),
                python-gnome2-extras-dev (>= 2.14.2),
@@ -20,7 +20,7 @@
                python-gtk2-dev (>= 2.10.0),
                python-notify (>= 0.1.1),
                python-vte
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: >= 2.5
 Homepage: http://live.gnome.org/OnTV
 

Added: packages/unstable/ontv/debian/patches/01_shebang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/patches/01_shebang.patch?rev=23209&op=file
==============================================================================
--- packages/unstable/ontv/debian/patches/01_shebang.patch (added)
+++ packages/unstable/ontv/debian/patches/01_shebang.patch [utf-8] Sat Mar  6 20:36:22 2010
@@ -1,0 +1,14 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=612026
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+
+Don't hardcode python2.5 in the hashbang
+
+diff -ruNp ontv-3.0.0/scripts/ontv.in ontv-3.0.0.new/scripts/ontv.in
+--- ontv-3.0.0/scripts/ontv.in	2008-02-10 23:56:10.000000000 +0100
++++ ontv-3.0.0.new/scripts/ontv.in	2010-03-06 21:05:04.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.5
++#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ 
+ # Copyright (C) 2004-2007 Johan Svedberg <johan at svedberg.com>

Modified: packages/unstable/ontv/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/rules?rev=23209&op=diff
==============================================================================
--- packages/unstable/ontv/debian/rules [utf-8] (original)
+++ packages/unstable/ontv/debian/rules [utf-8] Sat Mar  6 20:36:22 2010
@@ -3,8 +3,10 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 binary-install/ontv::
+	rm debian/ontv/usr/lib/python*/*-packages/ontv/keybinder/_keybinder.*a
 	dh_pycentral -pontv


