[SCM] idjc packaging branch, master, updated. upstream/0.8.2-8-g1d0cafd

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Wed Apr 28 08:57:41 UTC 2010


The following commit has been merged in the master branch:
commit 9b697cf5f24856d944b0851b570e924f1901ac7c
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed Apr 28 10:54:18 2010 +0200

    Refresh server_window_size.patch, add configure.patch.

diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
new file mode 100644
index 0000000..b6cf47a
--- /dev/null
+++ b/debian/patches/configure.patch
@@ -0,0 +1,15 @@
+---
+ configure |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- idjc.orig/configure
++++ idjc/configure
+@@ -2473,7 +2473,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
++	for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+ 	  test "$am_cv_pathless_PYTHON" = none && break
+ 	  prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
diff --git a/debian/patches/server_window_size.patch b/debian/patches/server_window_size.patch
index 3de0ceb..4077e0e 100644
--- a/debian/patches/server_window_size.patch
+++ b/debian/patches/server_window_size.patch
@@ -1,6 +1,10 @@
---- idjcpython/sourceclientgui.py.orig	2008-06-21 11:18:18.000000000 +0200
-+++ idjcpython/sourceclientgui.py	2008-06-21 11:19:10.000000000 +0200
-@@ -169,7 +169,7 @@
+---
+ idjcpython/sourceclientgui.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- idjc.orig/idjcpython/sourceclientgui.py
++++ idjc/idjcpython/sourceclientgui.py
+@@ -722,7 +722,7 @@ class MetadataBar(gtk.HBox):
     def __init__(self, parent, qty, default_text=""):
        self.source_client_gui = parent
        gtk.HBox.__init__(self)
@@ -9,7 +13,7 @@
        left_hbox = gtk.HBox()
        label = gtk.Label(ln.metadata)
        left_hbox.pack_start(label, False, False, 0)
-@@ -616,7 +616,7 @@
+@@ -1249,7 +1249,7 @@ class StreamTab(Tab):
        scrolled = gtk.ScrolledWindow()
        Tab.add(self, scrolled)
        scrolled.show()

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list