[SCM] idjc packaging branch, master, updated. upstream/0.8.2-12-g916cd77

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Wed Apr 28 09:12:14 UTC 2010


The following commit has been merged in the master branch:
commit 001b204f51a592ae68a617f3f9fc614c619309ab
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed Apr 28 11:06:11 2010 +0200

    Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index 676706b..aa8e959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+idjc (0.8.2-1) unstable; urgency=low
+
+  * Imported Upstream version 0.8.2.
+  * Bump python minimum version up to 2.6.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Wed, 28 Apr 2010 00:57:47 +0200
+
 idjc (0.8.1-4) unstable; urgency=medium
 
   * Pass the correct libexecdir path to the configure script rather than
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index b6cf47a..c641903 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -1,3 +1,6 @@
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Description: Fix detection of python2.6.
+Forwarded: no
 ---
  configure |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/desktop_file.patch b/debian/patches/desktop_file.patch
index 9efef63..123dbfa 100644
--- a/debian/patches/desktop_file.patch
+++ b/debian/patches/desktop_file.patch
@@ -1,6 +1,12 @@
-diff -Nur -x '*.orig' -x '*~' idjc-0.8.1/idjc.desktop_ idjc-0.8.1.new/idjc.desktop_
---- idjc-0.8.1/idjc.desktop_	2009-06-03 03:52:11.000000000 +0200
-+++ idjc-0.8.1.new/idjc.desktop_	2009-12-01 00:12:16.820428308 +0100
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Description: Adjust desktop file as Freedesktop's per-spec.
+Forwarded: no
+---
+ idjc.desktop_ |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- idjc.orig/idjc.desktop_
++++ idjc/idjc.desktop_
 @@ -1,5 +1,5 @@
  [___Desktop Entry]
 -Categories=GNOME;Application;Network;
@@ -8,7 +14,7 @@ diff -Nur -x '*.orig' -x '*~' idjc-0.8.1/idjc.desktop_ idjc-0.8.1.new/idjc.deskt
  Comment=Create your live radio show or podcast
  Comment[en_GB]=Create your live radio show or podcast
  Comment[de]=Erstelle deine eigene Radiosendung oder Podcasts
-@@ -12,13 +12,11 @@
+@@ -12,13 +12,11 @@ GenericName[fr]=Client graphique shoutca
  Icon=ICONPATHNAME
  MimeType=
  Name=Internet DJ Console
@@ -22,5 +28,5 @@ diff -Nur -x '*.orig' -x '*~' idjc-0.8.1/idjc.desktop_ idjc-0.8.1.new/idjc.deskt
  X-KDE-SubstituteUID=false
  X-KDE-Username=
 -X-Ubuntu-Gettext-Domain=idjc
-\ Manca newline alla fine del file
+\ No newline at end of file
 +X-Ubuntu-Gettext-Domain=idjc
diff --git a/debian/patches/idjc_script.patch b/debian/patches/idjc_script.patch
index d55c0c1..a6174c7 100644
--- a/debian/patches/idjc_script.patch
+++ b/debian/patches/idjc_script.patch
@@ -1,10 +1,13 @@
 Author: Magnus Holmgren <holmgren at debian.org>
 Description: Fix idjc script to run the gui properly.
 Bug-Debian: http://bugs.debian.org/572271
-diff -Nur -x '*.orig' -x '*~' idjc/idjc_ idjc.new/idjc_
---- idjc/idjc_	2010-03-11 18:30:57.802823705 +0100
-+++ idjc.new/idjc_	2010-03-11 18:31:29.362808632 +0100
-@@ -84,7 +84,7 @@
+---
+ idjc_ |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- idjc.orig/idjc_
++++ idjc/idjc_
+@@ -84,7 +84,7 @@ python=
  export python
  which $python > /dev/null
  if [ $? == "0" ] ; then

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list