tags 603405 patch thanks The script needed for this is actually shipped in the current upstream versions of gucharmap, so we just need to tweak it a litle bit for use with the unicode-data package and run it at build time. The attached patch addresses this.
I'm uploading this patch as an NMU to DELAYED/2-days. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru gucharmap-3.4.1.1/debian/changelog gucharmap-3.4.1.1/debian/changelog
--- gucharmap-3.4.1.1/debian/changelog 2012-04-19 00:37:11.000000000 +0000
+++ gucharmap-3.4.1.1/debian/changelog 2012-06-16 20:04:44.000000000 +0000
@@ -1,3 +1,14 @@
+gucharmap (1:3.4.1.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 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.
+
+ -- Steve Langasek <vor...@debian.org> Sat, 16 Jun 2012 20:04:43 +0000
+
gucharmap (1:3.4.1.1-1) unstable; urgency=low
* New upstream translation release.
diff -Nru gucharmap-3.4.1.1/debian/clean gucharmap-3.4.1.1/debian/clean
--- gucharmap-3.4.1.1/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ gucharmap-3.4.1.1/debian/clean 2012-06-16 19:34:08.000000000 +0000
@@ -0,0 +1 @@
+gucharmap/unicode-*.h
diff -Nru gucharmap-3.4.1.1/debian/control gucharmap-3.4.1.1/debian/control
--- gucharmap-3.4.1.1/debian/control 2012-04-19 00:41:27.000000000 +0000
+++ gucharmap-3.4.1.1/debian/control 2012-06-16 20:05:05.000000000 +0000
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
-Uploaders: Jordi Mallach <jo...@debian.org>, Josselin Mouette <j...@debian.org>, Martin Pitt <mp...@debian.org>, Michael Biebl <bi...@debian.org>
+Uploaders: Jordi Mallach <jo...@debian.org>, Martin Pitt <mp...@debian.org>, Michael Biebl <bi...@debian.org>
Build-Depends: cdbs,
debhelper (>= 8),
gobject-introspection (>= 0.9.0),
@@ -24,7 +24,8 @@
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
diff -Nru gucharmap-3.4.1.1/debian/control.in gucharmap-3.4.1.1/debian/control.in
--- gucharmap-3.4.1.1/debian/control.in 2012-03-28 12:23:16.000000000 +0000
+++ gucharmap-3.4.1.1/debian/control.in 2012-06-16 19:36:57.000000000 +0000
@@ -19,7 +19,8 @@
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
diff -Nru gucharmap-3.4.1.1/debian/patches/series gucharmap-3.4.1.1/debian/patches/series
--- gucharmap-3.4.1.1/debian/patches/series 2012-03-28 12:25:17.000000000 +0000
+++ gucharmap-3.4.1.1/debian/patches/series 2012-06-16 19:13:03.000000000 +0000
@@ -1,2 +1,3 @@
spelling_fixes.patch
99_ltmain_as-needed.patch
+unicode-source-generation.patch
diff -Nru gucharmap-3.4.1.1/debian/patches/unicode-source-generation.patch gucharmap-3.4.1.1/debian/patches/unicode-source-generation.patch
--- gucharmap-3.4.1.1/debian/patches/unicode-source-generation.patch 1970-01-01 00:00:00.000000000 +0000
+++ gucharmap-3.4.1.1/debian/patches/unicode-source-generation.patch 2012-06-16 19:33:37.000000000 +0000
@@ -0,0 +1,54 @@
+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 <vor...@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";
diff -Nru gucharmap-3.4.1.1/debian/rules gucharmap-3.4.1.1/debian/rules
--- gucharmap-3.4.1.1/debian/rules 2011-10-14 21:04:54.000000000 +0000
+++ gucharmap-3.4.1.1/debian/rules 2012-06-16 19:46:43.000000000 +0000
@@ -11,6 +11,10 @@
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
signature.asc
Description: Digital signature
