r39596 - in /desktop/unstable/gucharmap/debian: changelog control control.in patches/revert-unicode-6.2.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Thu Sep 19 19:19:35 2013
New Revision: 39596

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39596
Log:
* Add debian/patches/revert-unicode-6.2.patch (Closes: #714297)
  Thanks to everyone working together in the bug report to find
  the solution to this problem!
* Change unicode-data build-dependency to be (<< 6.2)
  - We should drop this and the above patch once unicode-data is updated.

Added:
    desktop/unstable/gucharmap/debian/patches/revert-unicode-6.2.patch
Modified:
    desktop/unstable/gucharmap/debian/changelog
    desktop/unstable/gucharmap/debian/control
    desktop/unstable/gucharmap/debian/control.in
    desktop/unstable/gucharmap/debian/patches/series

Modified: desktop/unstable/gucharmap/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/changelog?rev=39596&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/changelog	[utf-8] Thu Sep 19 19:19:35 2013
@@ -1,10 +1,18 @@
-gucharmap (1:3.8.2-3) UNRELEASED; urgency=low
-
+gucharmap (1:3.8.2-3) unstable; urgency=low
+
+  [ Jeremy Bicha ]
   * debian/control.in:
     - Update homepage
     - Don't build-depend on scrollkeeper
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Fri, 28 Jun 2013 18:36:28 -0400
+  [ Andreas Henriksson ]
+  * Add debian/patches/revert-unicode-6.2.patch (Closes: #714297)
+    Thanks to everyone working together in the bug report to find
+    the solution to this problem!
+  * Change unicode-data build-dependency to be (<< 6.2)
+    - We should drop this and the above patch once unicode-data is updated.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 19 Sep 2013 21:03:48 +0200
 
 gucharmap (1:3.8.2-2) unstable; urgency=low
 

Modified: desktop/unstable/gucharmap/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/control?rev=39596&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/control	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/control	[utf-8] Thu Sep 19 19:19:35 2013
@@ -25,7 +25,7 @@
                libglib2.0-doc,
                libpango1.0-doc,
                libgtk-3-doc,
-               unicode-data
+               unicode-data (<< 6.2)
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gucharmap
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gucharmap

Modified: desktop/unstable/gucharmap/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/control.in?rev=39596&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/control.in	[utf-8] Thu Sep 19 19:19:35 2013
@@ -20,7 +20,7 @@
                libglib2.0-doc,
                libpango1.0-doc,
                libgtk-3-doc,
-               unicode-data
+               unicode-data (<< 6.2)
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gucharmap
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gucharmap

Added: desktop/unstable/gucharmap/debian/patches/revert-unicode-6.2.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/patches/revert-unicode-6.2.patch?rev=39596&op=file
==============================================================================
--- desktop/unstable/gucharmap/debian/patches/revert-unicode-6.2.patch	(added)
+++ desktop/unstable/gucharmap/debian/patches/revert-unicode-6.2.patch	[utf-8] Thu Sep 19 19:19:35 2013
@@ -0,0 +1,17 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Revert "unicode: Fix table generation for 6.2.0"
+
+This patch reverts upstream commit bda1c37e9be as Debian does not
+(yet) have unicode-data >= 6.2.
+
+--- a/gucharmap/gen-guch-unicode-tables.pl
++++ b/gucharmap/gen-guch-unicode-tables.pl
+@@ -521,7 +521,7 @@ sub process_nameslist_txt ($)
+ {
+     my ($nameslist_txt) = @_;
+ 
+-    open (my $nameslist, $nameslist_txt) or die;
++    open (my $nameslist, "$ICONV -f 'ISO8859-1' -t 'UTF-8' $nameslist_txt |") or die;
+ 
+     print "processing $nameslist_txt...";
+ 

Modified: desktop/unstable/gucharmap/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/patches/series?rev=39596&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/patches/series	[utf-8] Thu Sep 19 19:19:35 2013
@@ -1,3 +1,4 @@
 unicode-source-generation.patch
 10_perl_5_18.patch
+revert-unicode-6.2.patch
 99_ltmain_as-needed.patch