[SCM] devede/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Apr 16 07:12:33 UTC 2012


The following commit has been merged in the master branch:
commit 9649e4bbee8d4254ada383233421eee0a576a717
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 16 09:12:30 2012 +0200

    Refresh patches.

diff --git a/debian/patches/01-fix_building.patch b/debian/patches/01-fix_building.patch
index 78d7d3a..8b93503 100644
--- a/debian/patches/01-fix_building.patch
+++ b/debian/patches/01-fix_building.patch
@@ -5,8 +5,8 @@ Description: Install only locales, the other stuff will be installed
  install.sh |   11 -----------
  1 file changed, 11 deletions(-)
 
---- devede-3.21.0.orig/install.sh
-+++ devede-3.21.0/install.sh
+--- devede.orig/install.sh
++++ devede/install.sh
 @@ -130,12 +130,6 @@ then
  	#		paths (relative to DESTDIR).
  
diff --git a/debian/patches/02-setup_py.patch b/debian/patches/02-setup_py.patch
index ec3f7b0..ad9ff5b 100644
--- a/debian/patches/02-setup_py.patch
+++ b/debian/patches/02-setup_py.patch
@@ -2,10 +2,12 @@ Author: Alessio Treglia <quadrispro at ubuntu.com>
 Description: Byte-compile and install the Python modules and all
  application's data files.
 
-Index: devede/setup.py
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ devede/setup.py	2011-12-31 09:55:09.596739012 +0100
+---
+ setup.py |   32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+--- /dev/null
++++ devede/setup.py
 @@ -0,0 +1,32 @@
 +#!/usr/bin/python
 +
diff --git a/debian/patches/03-try_setlocale.patch b/debian/patches/03-try_setlocale.patch
index baaa59e..ccec690 100644
--- a/debian/patches/03-try_setlocale.patch
+++ b/debian/patches/03-try_setlocale.patch
@@ -4,11 +4,13 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/746415
 Forwarded: no
 Last-Update: 2011-08-19
 
-Index: b/devede.py
-===================================================================
---- a/devede.py
-+++ b/devede.py
-@@ -136,7 +136,10 @@
+---
+ devede.py |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- devede.orig/devede.py
++++ devede/devede.py
+@@ -136,7 +136,10 @@ else:
  #####################
  
  gettext.bindtextdomain('devede',share_locale)

-- 
devede packaging



More information about the pkg-multimedia-commits mailing list