r48348 - in /desktop/unstable/gucharmap/debian: changelog patches/unicode-source-generation.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr 21 21:56:10 2016
New Revision: 48348

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48348
Log:
Refresh debian/patches/unicode-source-generation.patch.

Modified:
    desktop/unstable/gucharmap/debian/changelog
    desktop/unstable/gucharmap/debian/patches/unicode-source-generation.patch

Modified: desktop/unstable/gucharmap/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/changelog?rev=48348&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/changelog	[utf-8] Thu Apr 21 21:56:10 2016
@@ -7,6 +7,7 @@
     time from the source data provided by unicode.org. This is basically what
     we've always been doing in Debian and we can now drop our custom build
     rules.
+  * Refresh debian/patches/unicode-source-generation.patch.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 21 Apr 2016 01:38:59 +0200
 

Modified: desktop/unstable/gucharmap/debian/patches/unicode-source-generation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/patches/unicode-source-generation.patch?rev=48348&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/patches/unicode-source-generation.patch	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/patches/unicode-source-generation.patch	[utf-8] Thu Apr 21 21:56:10 2016
@@ -3,10 +3,10 @@
  with the Debian unicode-data package.
 Author: Steve Langasek <vorlon at debian.org>
 Bug-Debian: http://bugs.debian.org/603405
-Index: gucharmap-3.4.1.1/gucharmap/gen-guch-unicode-tables.pl
+Index: gucharmap-8.0.0/gucharmap/gen-guch-unicode-tables.pl
 ===================================================================
---- gucharmap-3.4.1.1.orig/gucharmap/gen-guch-unicode-tables.pl
-+++ gucharmap-3.4.1.1/gucharmap/gen-guch-unicode-tables.pl
+--- gucharmap-8.0.0.orig/gucharmap/gen-guch-unicode-tables.pl	2016-03-03 19:01:01.000000000 +0100
++++ gucharmap-8.0.0/gucharmap/gen-guch-unicode-tables.pl	2016-04-21 02:09:08.000000000 +0200
 @@ -12,7 +12,7 @@
  #  - unicode-versions.h
  #
@@ -16,17 +16,8 @@
  #
  # NOTE! Some code copied from glib/glib/gen-unicode-tables.pl; keep in sync!
  
-@@ -20,7 +20,7 @@
- use vars ('$UNZIP', '$ICONV');
- 
- # if these things aren't in your path you can put full paths to them here
--$UNZIP = 'unzip';
-+$UNZIP = 'bunzip2';
- $ICONV = 'iconv';
- 
- sub process_unicode_data_txt ($);
-@@ -40,7 +40,7 @@
- Usage: $0 UNICODE-VERSION DIRECTORY
+@@ -31,7 +31,7 @@
+ Usage: $0 UNICODE-VERSION DIRECTORY [--i18n]
  
  DIRECTORY should contain the following Unicode data files:
 -UnicodeData.txt Unihan.zip NamesList.txt Blocks.txt Scripts.txt
@@ -34,7 +25,7 @@
  
  which can be found at http://www.unicode.org/Public/UNIDATA/
  
-@@ -55,7 +55,7 @@
+@@ -53,7 +53,7 @@
  for my $f (readdir ($dir))
  {
      $unicodedata_txt = "$d/$f" if ($f =~ /UnicodeData.*\.txt/);
@@ -43,7 +34,7 @@
      $nameslist_txt = "$d/$f" if ($f =~ /NamesList.*\.txt/);
      $blocks_txt = "$d/$f" if ($f =~ /Blocks.*\.txt/);
      $scripts_txt = "$d/$f" if ($f =~ /Scripts.*\.txt/);
-@@ -63,7 +63,7 @@
+@@ -61,7 +61,7 @@
  }
  
  defined $unicodedata_txt or die "Did not find $d/UnicodeData.txt";
@@ -52,3 +43,19 @@
  defined $nameslist_txt or die "Did not find $d/NamesList.txt";
  defined $blocks_txt or die "Did not find $d/Blocks.txt";
  defined $scripts_txt or die "Did not find $d/Scripts.txt";
+Index: gucharmap-8.0.0/configure.ac
+===================================================================
+--- gucharmap-8.0.0.orig/configure.ac	2016-03-03 19:01:02.000000000 +0100
++++ gucharmap-8.0.0/configure.ac	2016-04-21 02:34:19.112341347 +0200
+@@ -188,9 +188,9 @@
+ # Note! Not using UNZIP as variable name here since unzip itself
+ # uses the UNZIP env var and interprets it as its options.
+ AC_ARG_VAR([PROG_UNZIP],[the unzip programme])
+-AC_PATH_PROG([PROG_UNZIP],[unzip],[false])
++AC_PATH_PROG([PROG_UNZIP],[bunzip2],[false])
+ if test "$PROG_UNZIP" = "false"; then
+-    AC_MSG_ERROR([unzip not found])
++    AC_MSG_ERROR([bunzip2 not found])
+ fi
+ 
+ AC_ARG_VAR([WGET],[the wget programme])