Commit f8a514fe authored by Michael Biebl's avatar Michael Biebl

* debian/patches/unicode-source-generation.patch: compatibility with

  the unicode-data package.
* debian/rules, debian/clean, debian/control: build-depend on unicode-data
  and generate our unicode header files at package build time, to ensure
  that we actually can.  Closes: #603405.
parent ed1dcb95
gucharmap (1:3.4.1.1-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* debian/patches/unicode-source-generation.patch: compatibility with
the unicode-data package.
* debian/rules, debian/clean, debian/control: build-depend on unicode-data
and generate our unicode header files at package build time, to ensure
that we actually can. Closes: #603405.
-- Michael Biebl <biebl@debian.org> Sun, 17 Jun 2012 16:27:20 +0200
gucharmap (1:3.4.1.1-1) unstable; urgency=low
* New upstream translation release.
......
......@@ -7,7 +7,7 @@ Source: gucharmap
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>
Uploaders: Jordi Mallach <jordi@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: cdbs,
debhelper (>= 8),
gobject-introspection (>= 0.9.0),
......@@ -24,7 +24,8 @@ Build-Depends: cdbs,
intltool (>= 0.40),
libglib2.0-doc,
libpango1.0-doc,
libgtk-3-doc
libgtk-3-doc,
unicode-data
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/experimental/gucharmap
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gucharmap
......
......@@ -19,7 +19,8 @@ Build-Depends: cdbs,
intltool (>= 0.40),
libglib2.0-doc,
libpango1.0-doc,
libgtk-3-doc
libgtk-3-doc,
unicode-data
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/experimental/gucharmap
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gucharmap
......
spelling_fixes.patch
unicode-source-generation.patch
99_ltmain_as-needed.patch
Description: compatibility with the unicode-data package
Adjust the script used for unicode header file generation for compatibility
with the Debian unicode-data package.
Author: Steve Langasek <vorlon@debian.org>
Bug-Debian: http://bugs.debian.org/603405
Index: gucharmap-3.4.1.1/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
@@ -12,7 +12,7 @@
# - unicode-versions.h
#
# usage: ./gen-guch-unicode-tables.pl UNICODE-VERSION DIRECTORY
-# where DIRECTORY contains UnicodeData.txt Unihan.zip NamesList.txt Blocks.txt Scripts.txt
+# where DIRECTORY contains UnicodeData.txt Unihan_Readings.txt.bz2 NamesList.txt Blocks.txt Scripts.txt
#
# 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
DIRECTORY should contain the following Unicode data files:
-UnicodeData.txt Unihan.zip NamesList.txt Blocks.txt Scripts.txt
+UnicodeData.txt Unihan_Readings.txt.bz2 NamesList.txt Blocks.txt Scripts.txt
which can be found at http://www.unicode.org/Public/UNIDATA/
@@ -55,7 +55,7 @@
for my $f (readdir ($dir))
{
$unicodedata_txt = "$d/$f" if ($f =~ /UnicodeData.*\.txt/);
- $unihan_zip = "$d/$f" if ($f =~ /Unihan.*\.zip/);
+ $unihan_zip = "$d/$f" if ($f =~ /Unihan_Readings\.txt\.bz2/);
$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 @@
}
defined $unicodedata_txt or die "Did not find $d/UnicodeData.txt";
-defined $unihan_zip or die "Did not find $d/Unihan.zip";
+defined $unihan_zip or die "Did not find $d/Unihan_Readings.txt.bz2";
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";
......@@ -11,6 +11,10 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
--enable-gtk-doc \
--enable-introspection
UNICODE_DATA_VERSION=$(shell dpkg-query -W -f'$${Version}' unicode-data | sed -e's/-.*//')
configure/libgucharmap-2-90-dev::
cd gucharmap && ./gen-guch-unicode-tables.pl $(UNICODE_DATA_VERSION) /usr/share/unicode
clean::
rm -f intltool-extract intltool-merge intltool-update
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment