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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jun 25 01:18:02 2016
New Revision: 49167

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49167
Log:
Instead of patching configure.ac, set PROG_UNZIP in debian/rules.

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

Modified: desktop/unstable/gucharmap/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/changelog?rev=49167&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/changelog	[utf-8] Sat Jun 25 01:18:02 2016
@@ -3,6 +3,7 @@
   * New upstream release.
   * Bump Build-Depends on unicode-data accordingly.
   * Refresh debian/patches/unicode-source-generation.patch.
+  * Instead of patching configure.ac, set PROG_UNZIP in debian/rules.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 25 Jun 2016 02:46:53 +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=49167&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] Sat Jun 25 01:18:02 2016
@@ -43,19 +43,3 @@
  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-9.0.0/configure.ac
-===================================================================
---- gucharmap-9.0.0.orig/configure.ac	2016-06-25 02:48:55.760864421 +0200
-+++ gucharmap-9.0.0/configure.ac	2016-06-25 02:51:42.863385505 +0200
-@@ -195,9 +195,9 @@
- # uses the UNZIP env var and interprets it as its options.
- AC_ARG_VAR([PROG_UNZIP],[the unzip programme])
- if test -z "$PROG_UNZIP"; then
--  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
- fi
- 

Modified: desktop/unstable/gucharmap/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gucharmap/debian/rules?rev=49167&op=diff
==============================================================================
--- desktop/unstable/gucharmap/debian/rules	[utf-8] (original)
+++ desktop/unstable/gucharmap/debian/rules	[utf-8] Sat Jun 25 01:18:02 2016
@@ -10,6 +10,8 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_DH_AUTORECONF_ARGS = --as-needed
+
+export PROG_UNZIP = bunzip2
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
 			     --enable-vala \