[SCM] devede/master: Remove 03-try_setlocale.patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri Jun 8 08:05:09 UTC 2012
The following commit has been merged in the master branch:
commit 0cc4b41ecc73ca26ccdeb93fde7529a370fa10d2
Author: Alessio Treglia <alessio at debian.org>
Date: Fri Jun 8 10:04:44 2012 +0200
Remove 03-try_setlocale.patch, applied upstream.
diff --git a/debian/patches/03-try_setlocale.patch b/debian/patches/03-try_setlocale.patch
deleted file mode 100644
index 3d9c985..0000000
--- a/debian/patches/03-try_setlocale.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Ignore unknown locales; English output is better than crashing
-Author: Colin Watson <cjwatson at ubuntu.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/746415
-Forwarded: https://github.com/devede/Devede/issues/10
-Last-Update: 2012-04-16
-Applied-Upstream: yes
----
- 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)
--locale.setlocale(locale.LC_ALL,"")
-+try:
-+ locale.setlocale(locale.LC_ALL,"")
-+except locale.Error:
-+ pass
- gettext.textdomain('devede')
- gettext.install("devede",localedir=share_locale) # None is sys default locale
- # Note also before python 2.3 you need the following if
diff --git a/debian/patches/series b/debian/patches/series
index 5fbd4e4..200bee2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01-fix_building.patch
-03-try_setlocale.patch
--
devede packaging
More information about the pkg-multimedia-commits
mailing list