diff -Nru libwmf-0.2.8.4/debian/changelog libwmf-0.2.8.4/debian/changelog --- libwmf-0.2.8.4/debian/changelog 2011-10-26 11:17:02.000000000 +0000 +++ libwmf-0.2.8.4/debian/changelog 2012-01-19 15:14:54.000000000 +0000 @@ -1,3 +1,92 @@ +libwmf (0.2.8.4-10ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Split out GTK plugin into separate package. + * Add a no-op prerm to libwmf0.2-7 to work around old prerms breaking on + upgrade due to using defoma while perl-modules is unconfigured + (LP: #904901). This can be removed after Ubuntu 12.04 LTS. + + -- Colin Watson Thu, 19 Jan 2012 15:14:53 +0000 + +libwmf (0.2.8.4-10) unstable; urgency=low + + * Read libwmf binary package name from control in rules. + * Switch to dh instead of cdbs; bump debhelper compat to 9 and debhelper + build-dep to >= 8.9.4~; this also means multiarch, so update install files + and rules to cope with new pathnames. Add new 05_gdk-pixbuf-loader-dir + patch to fix the install location for the module to be under + gdk-pixbuf-2.0 and not gtk-2.0. Add ${misc:Pre-Depends}. + + -- Loïc Minier Fri, 06 Jan 2012 00:07:17 +0100 + +libwmf (0.2.8.4-9) unstable; urgency=low + + * Ack Neil Williams's NMU; thanks! + * Stop shipping .la files altogether; remove dependency_libs stripping code + from rules; rdepends of libwmf-dev either dont ship any .la files or ship + .la files which don't reference the libwmf one. + * Add comment to debian/libwmf0.2-7.lintian-overrides to point at + Debian #382511. + * Update my email address in control. + * Drop defoma support from the packaging; closes: #542336; based on patch + from Christian Perrier; thanks! Defoma support is also included in the + upstream configure.{ac,in}, but is largely useless nowadays, at least the + generated libwmf XML fontmap in /var/lib/defoma/libwmf0.2-7.d/fontmap + doesn't list any actual font on my system. + - Drop defoma build-dep and dep. + - Stop shipping a var/lib/defoma/libwmf0.2-7.d directory and "rm -rf" + it on upgrades of libwmf0.2-7. + - Drop debian/defoma XML fontmap generation script which seems to be + generating an empty XML fontmap nowadays; incidentally closes: #501871. + - Stop passing --with-fontdir=/var/lib/defoma/$(libwmf_pkg).d and + --with-gsfontdir=/var/lib/defoma/$(libwmf_pkg).d to configure; these are + going away and didn't have any font files anyway. + - Review fontdir, gsfontdir, sysfontmap, gsfontmap and xtrafontmap + configure args: + . sysfontmap is the default XML fontmap (when not specified via the API) + and currently points at an empty XML list of fonts; this is parsed + either by libexpat1 or libxml2; in both cases, no specific message is + output by default if the file is missing. The configure.ac default + for this file is /usr/share/fonts/fontmap which has a change of + existing with random data some day, so just set it to /non-existent. + . xtrafontmap is similar to sysfontmap and serves asan extra fontmap on + top of the system one. It's also used by thelibwmf-fontmap tool which + serves generation of fontmap XML files and isn't shipped nor used + during build. Keep xtrafontmap set to /etc/libwmf.fontmap to allow + for local configuration. + . gsfontmap is similar to sysfontmap except it points at a + GhostScript-style Fontmap. It seems sensible to point libwmf at + /var/lib/ghostscript/fonts/Fontmap as generated by ghostscript's + update-gsfontmap. + . gsfontdir is just appended to the font search path. Set it to + /usr/share/fonts/type1/gsfont which is where gsfonts ships its fonts. + . fontdir is used as the default font search location, as the default + search location for libwmf-fontmap, as the default pathname for + bundled fonts in the bundled XML fontmap file -- neither of which are + currently shipped -- and as a configure default for other pathnames + such as xtrafontmap. Set it to /non-existent as there currently isn't + any single directory with all supported fonts that would be useful to + list. + * Add debian/TODO suggesting that this package ought to generate its own + fontmap in its own XML format, perhaps into /var/lib/libwmf/, as a trigger + whenever /usr/share/fonts is updated. + * Fix typo in 0.2.8.4-5 changelog entry (which closed Debian #382511 instead + of Debian #405012). + * Update libwmf-bin description to list names of utilities; closes: #519601. + * Cleanup libwmf-dev deps: list ${shlibs:Depends} but drop all deps except + for packages shipping headers referenced in libwmf's headers + (libfreetype6-dev, x11proto-core-dev, libx11-dev, zlib1g-dev). + * Drop obsolete Replaces/Conflicts on libwmf0-dev and libwmf0. + * Wrap build-deps and deps to get cleaner diffs. + * Bump up Standards-Version to 3.9.2. + * Drop libsm-dev, libxt-dev and libice-dev build-deps; might have been used + with AC_PATH_XTRA in the past. + * Rename debian/install to debian/libwmf0.2-7.install. + * Take libwmf-bin symlink upgrade snippet from Ubuntu to minimize delta; + can be dropped in may 2012. + + -- Loïc Minier Thu, 05 Jan 2012 16:07:15 +0100 + libwmf (0.2.8.4-8.1ubuntu1) precise; urgency=low * Resynchronise with Debian. Remaining changes: @@ -102,7 +191,7 @@ libwmf (0.2.8.4-5) experimental; urgency=low - * Convert the package to the new Gtk modules handling; closes: #382511. + * Convert the package to the new Gtk modules handling; closes: #405012. - Bump up the libgtk2.0-dev build-dep to >= 2.10.1-1. - Call dh_gtkmodules with an appropriate LD_LIBRARY_PATH. - Drop debian/postinst and debian/postrm. diff -Nru libwmf-0.2.8.4/debian/compat libwmf-0.2.8.4/debian/compat --- libwmf-0.2.8.4/debian/compat 2010-07-23 08:07:19.000000000 +0000 +++ libwmf-0.2.8.4/debian/compat 2012-01-05 23:23:58.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libwmf-0.2.8.4/debian/control libwmf-0.2.8.4/debian/control --- libwmf-0.2.8.4/debian/control 2011-10-26 11:16:27.000000000 +0000 +++ libwmf-0.2.8.4/debian/control 2012-01-19 14:15:11.000000000 +0000 @@ -2,14 +2,26 @@ Section: libs Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Loic Minier +XSBC-Original-Maintainer: Loïc Minier Uploaders: Sebastian Dröge -Standards-Version: 3.9.0 -Build-Depends: debhelper (>= 7), cdbs, quilt, defoma (>= 0.11), dh-autoreconf, autotools-dev, libfreetype6-dev, zlib1g-dev, libsm-dev, libice-dev, libx11-dev, libxt-dev, libexpat1-dev, libjpeg-dev, libpng12-dev, libgtk2.0-dev (>= 2.21.5), libgdk-pixbuf2.0-dev (>= 2.21.6) +Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8.9.4~), + quilt, + dh-autoreconf, + autotools-dev, + libfreetype6-dev, + zlib1g-dev, + libx11-dev, + libexpat1-dev, + libjpeg-dev, + libpng12-dev, + libgtk2.0-dev (>= 2.21.5), + libgdk-pixbuf2.0-dev (>= 2.21.6) Package: libwmf0.2-7 Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, defoma (>= 0.11) +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: gsfonts Suggests: libwmf0.2-7-gtk Description: Windows metafile conversion library @@ -22,6 +34,7 @@ Package: libwmf0.2-7-gtk Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libwmf0.2-7 (= ${Source-Version}) Description: Windows metafile conversion library Windows metafile (WMF) is a picture format used by many Windows @@ -41,15 +54,14 @@ metafile images and either displaying them using X or converting them to standard formats such as PNG, JPEG, PS, EPS and SVG(Z)... . - This package contains several frontends to libwmf. + This package contains several frontends to libwmf (wmf2x, wmf2gd, + wmf2fig, wmf2eps, wmf2svg). Package: libwmf-dev Section: libdevel Architecture: any -Replaces: libwmf0 (<< 0.1.21-1), libwmf0-dev -Depends: ${misc:Depends}, libwmf0.2-7 (= ${binary:Version}), libc6-dev, libfreetype6-dev, zlib1g-dev, libsm-dev, libice-dev, libx11-dev, libexpat1-dev, libjpeg-dev, libpng12-dev +Depends: ${misc:Depends}, ${shlibs:Depends}, libwmf0.2-7 (= ${binary:Version}), libfreetype6-dev, x11proto-core-dev, libx11-dev, zlib1g-dev Suggests: libwmf-doc -Conflicts: libwmf0-dev Description: Windows metafile conversion development Windows metafile (WMF) is a picture format used by many Windows programs, e.g. Microsoft Word. libwmf is a library for interpreting diff -Nru libwmf-0.2.8.4/debian/defoma libwmf-0.2.8.4/debian/defoma --- libwmf-0.2.8.4/debian/defoma 2010-07-23 05:53:07.000000000 +0000 +++ libwmf-0.2.8.4/debian/defoma 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -# libwmf.defoma: Generate XML fontmap for libwmf. -*- Perl -*- - -@ACCEPT_CATEGORIES = qw(truetype type1); - -package libwmf0_2_7; -use Debian::Defoma::Common; -use Debian::Defoma::Id; - -my $PkgDir = "$ROOTDIR/libwmf0.2-7.d"; -my $Fontmap = "$PkgDir/fontmap"; -my $Id; - -sub init { - $Id ||= defoma_id_open_cache(); - - return 0; -} - -sub register { - my($font, @hints) = @_; - - my $hint = parse_hints_start(@hints); - defined($hint->{FontName}) or return 1; - my $fontname = $hint->{FontName}; - $fontname =~ s/ .*//; - my $priority = $hint->{Priority} || 20; - - defoma_id_register($Id, type => 'real', font => $font, - id => $fontname, priority => $priority, - hints => join(' ', @hints)); - if (defined($hint->{Alias})) { - for my $alias (split(/ /, $hint->{Alias})) { - defoma_id_register($Id, type => 'alias', font => $font, - id => $alias, priority => $priority, - origin => $fontname); - } - } - - return 0; -} - -sub unregister { - my($font) = @_; - - defoma_id_unregister($Id, type => 'alias', font => $font); - defoma_id_unregister($Id, type => 'real', font => $font); - - return 0; -} - -sub term { - if ($Id) { - open(FONTMAP, ">$Fontmap.tmp") or die "$Fontmap.tmp: $!\n"; - - print FONTMAP "\n"; - print FONTMAP "\n"; - - for my $i (defoma_id_grep_cache($Id, 'installed', sorttype => 'p')) { - my $hint = parse_hints_start(defoma_id_get_hints($Id, $i)); - my @attrs; - - push(@attrs, format => $Id->{e_category}->[$i]); - - push(@attrs, metrics => $hint->{AFM}) - if defined($hint->{AFM}); - - push(@attrs, glyphs => $Id->{e_font}->[$i]); - - push(@attrs, name => $Id->{e_id}->[$i]); - - my $fullname = $Id->{e_id}->[$i]; - # ipa_font_sys_map() determines whether a font is italic by - # searching the full name. - $fullname .= " ($1)" - if $fullname !~ /Italic|Oblique/ - && defined($hint->{Shape}) - && $hint->{Shape} =~ /(Italic|Oblique)/; - push @attrs, fullname => $fullname; - - my $familyname; - if (defined($hint->{Family})) { - $familyname = $hint->{Family}; - $familyname =~ tr/_/ /; - } else { - $familyname = $Id->{e_id}->[$i]; - } - push(@attrs, familyname => $familyname); - - push(@attrs, weight => $hint->{Weight}) - if defined($hint->{Weight}); - - push(@attrs, version => '0.1'); - - print FONTMAP " \n"; - } - - print FONTMAP "\n"; - - close(FONTMAP) or die "$Fontmap.tmp: $!\n"; - - # Atomically replace old fontmap. - rename("$Fontmap.tmp", $Fontmap) or die "$Fontmap: $!\n" ; - - defoma_id_close_cache($Id); - undef($Id); - } - - return 0; -} - -sub dispatch { - my($command, @args) = @_; - - if (my $code = __PACKAGE__->can($command)) { - return $code->(@args); - } else { - return 0; - } -} - -*truetype = *dispatch; -*type1 = *dispatch; - -1; diff -Nru libwmf-0.2.8.4/debian/dirs libwmf-0.2.8.4/debian/dirs --- libwmf-0.2.8.4/debian/dirs 2010-07-23 05:53:07.000000000 +0000 +++ libwmf-0.2.8.4/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -var/lib/defoma/libwmf0.2-7.d diff -Nru libwmf-0.2.8.4/debian/install libwmf-0.2.8.4/debian/install --- libwmf-0.2.8.4/debian/install 2011-10-26 11:16:27.000000000 +0000 +++ libwmf-0.2.8.4/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/lib/*.so.* diff -Nru libwmf-0.2.8.4/debian/libwmf0.2-7-gtk.install libwmf-0.2.8.4/debian/libwmf0.2-7-gtk.install --- libwmf-0.2.8.4/debian/libwmf0.2-7-gtk.install 2011-10-26 11:16:27.000000000 +0000 +++ libwmf-0.2.8.4/debian/libwmf0.2-7-gtk.install 2012-01-19 14:15:11.000000000 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/gtk-*/*/loaders/*.so /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders +debian/tmp/usr/lib/*/gdk-pixbuf-2.0/*/loaders/*.so diff -Nru libwmf-0.2.8.4/debian/libwmf0.2-7.install libwmf-0.2.8.4/debian/libwmf0.2-7.install --- libwmf-0.2.8.4/debian/libwmf0.2-7.install 1970-01-01 00:00:00.000000000 +0000 +++ libwmf-0.2.8.4/debian/libwmf0.2-7.install 2012-01-19 14:15:11.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/lib/*/*.so.* diff -Nru libwmf-0.2.8.4/debian/libwmf0.2-7.lintian-overrides libwmf-0.2.8.4/debian/libwmf0.2-7.lintian-overrides --- libwmf-0.2.8.4/debian/libwmf0.2-7.lintian-overrides 2011-07-24 16:32:56.000000000 +0000 +++ libwmf-0.2.8.4/debian/libwmf0.2-7.lintian-overrides 2012-01-05 23:43:01.000000000 +0000 @@ -1,2 +1,2 @@ -embedded-library usr/lib/libwmf-0.2.so.7.1.0: libgd2 - +# see Debian #382511 +embedded-library usr/lib/x86_64-linux-gnu/libwmf-0.2.so.7.1.0: libgd2 diff -Nru libwmf-0.2.8.4/debian/libwmf0.2-7.postinst libwmf-0.2.8.4/debian/libwmf0.2-7.postinst --- libwmf-0.2.8.4/debian/libwmf0.2-7.postinst 1970-01-01 00:00:00.000000000 +0000 +++ libwmf-0.2.8.4/debian/libwmf0.2-7.postinst 2012-01-05 18:33:18.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# dropped in 0.2.8.4-9 +rm -rf /var/lib/defoma/libwmf0.2-7.d + +#DEBHELPER# + diff -Nru libwmf-0.2.8.4/debian/libwmf0.2-7.prerm libwmf-0.2.8.4/debian/libwmf0.2-7.prerm --- libwmf-0.2.8.4/debian/libwmf0.2-7.prerm 1970-01-01 00:00:00.000000000 +0000 +++ libwmf-0.2.8.4/debian/libwmf0.2-7.prerm 2012-01-19 15:16:53.000000000 +0000 @@ -0,0 +1,10 @@ +#! /bin/sh +set -e + +# No-op prerm to cope with old prerms breaking on upgrade due to using +# defoma while perl-modules is unconfigured. This can be removed after +# Ubuntu 12.04 LTS. + +#DEBHELPER# + +exit 0 diff -Nru libwmf-0.2.8.4/debian/libwmf-bin.preinst libwmf-0.2.8.4/debian/libwmf-bin.preinst --- libwmf-0.2.8.4/debian/libwmf-bin.preinst 2011-10-26 11:16:27.000000000 +0000 +++ libwmf-0.2.8.4/debian/libwmf-bin.preinst 2012-01-05 18:52:07.000000000 +0000 @@ -9,3 +9,4 @@ fi #DEBHELPER# + diff -Nru libwmf-0.2.8.4/debian/libwmf-dev.install libwmf-0.2.8.4/debian/libwmf-dev.install --- libwmf-0.2.8.4/debian/libwmf-dev.install 2010-07-23 08:01:36.000000000 +0000 +++ libwmf-0.2.8.4/debian/libwmf-dev.install 2012-01-05 23:24:47.000000000 +0000 @@ -1,5 +1,4 @@ debian/tmp/usr/bin/libwmf-config debian/tmp/usr/include -debian/tmp/usr/lib/*.so -debian/tmp/usr/lib/*.a -debian/tmp/usr/lib/*.la +debian/tmp/usr/lib/*/*.so +debian/tmp/usr/lib/*/*.a diff -Nru libwmf-0.2.8.4/debian/patches/05_gdk-pixbuf-loader-dir.patch libwmf-0.2.8.4/debian/patches/05_gdk-pixbuf-loader-dir.patch --- libwmf-0.2.8.4/debian/patches/05_gdk-pixbuf-loader-dir.patch 1970-01-01 00:00:00.000000000 +0000 +++ libwmf-0.2.8.4/debian/patches/05_gdk-pixbuf-loader-dir.patch 2012-01-05 23:40:41.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -745,7 +745,7 @@ + if test $LIBWMF_BUILDSTYLE != lite; then + PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ + GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" ++ GDK_PIXBUF_DIR="gdk-pixbuf-2.0/$GTK_VERSION/loaders" + wmf_gdk_pixbuf=yes + ],[ wmf_gdk_pixbuf=no + ]) diff -Nru libwmf-0.2.8.4/debian/patches/series libwmf-0.2.8.4/debian/patches/series --- libwmf-0.2.8.4/debian/patches/series 2010-07-23 07:59:30.000000000 +0000 +++ libwmf-0.2.8.4/debian/patches/series 2012-01-05 23:39:57.000000000 +0000 @@ -2,3 +2,4 @@ 02_font.c-always-check-generated-fontmap.patch 03_font.c-compare-fonts-by-name.patch 04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch +05_gdk-pixbuf-loader-dir.patch diff -Nru libwmf-0.2.8.4/debian/rules libwmf-0.2.8.4/debian/rules --- libwmf-0.2.8.4/debian/rules 2011-07-24 16:22:50.000000000 +0000 +++ libwmf-0.2.8.4/debian/rules 2012-01-05 23:50:29.000000000 +0000 @@ -1,20 +1,19 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/class/gnome.mk --include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +%: + dh $@ --with autoreconf -libwmf_pkg := libwmf0.2-7 +libwmfN := $(shell sed -rn 's/^Package:[[:space:]]*(libwmf[0-9.-]+)[[:space:]]*$$/\1/p' debian/control) -DEB_CONFIGURE_EXTRA_FLAGS += --with-docdir=/usr/share/doc/$(libwmf_pkg) \ - --with-fontdir=/var/lib/defoma/$(libwmf_pkg).d \ - --with-gsfontdir=/var/lib/defoma/$(libwmf_pkg).d \ - --with-sysfontmap=/var/lib/defoma/$(libwmf_pkg).d/fontmap \ - --with-gsfontmap=/var/lib/defoma/$(libwmf_pkg).d/fontmap.gs \ - --with-xtrafontmap=/etc/libwmf.fontmap +override_dh_auto_configure: + dh_auto_configure -- \ + --with-docdir=/usr/share/doc/$(libwmfN) \ + --with-fontdir=/non-existent \ + --with-gsfontdir=//usr/share/fonts/type1/gsfonts\ + --with-sysfontmap=/non-existent \ + --with-gsfontmap=/var/lib/ghostscript/fonts/Fontmap \ + --with-xtrafontmap=/etc/libwmf.fontmap -DEB_DH_MAKESHLIBS_ARGS_$(libwmf_pkg) += -X "/usr/lib/gdk-pixbuf-2.0" -V "$(libwmf_pkg) (>= 0.2.8.4)" +override_dh_makeshlibs: + dh_makeshlibs -X "gdk-pixbuf-2.0" -V "$(libwmfN) (>= 0.2.8.4)" -install/libwmf-dev:: - sed -i "/dependency_libs/ s/'.*'/''/" `find debian/ -name '*.la'` diff -Nru libwmf-0.2.8.4/debian/TODO libwmf-0.2.8.4/debian/TODO --- libwmf-0.2.8.4/debian/TODO 1970-01-01 00:00:00.000000000 +0000 +++ libwmf-0.2.8.4/debian/TODO 2012-01-05 18:53:53.000000000 +0000 @@ -0,0 +1,5 @@ +* A libwmf package should generate a libwmf-style XML fontmap with the provided + libwmf-fontmap tool from the fonts found in /usr/share/fonts. This could be + a trigger generating into /var/lib/libwmf. + +* Should split Gtk+ module in its own package.