[Pkg-fonts-bugs] Ubuntu (new upstream) fontforge 0.0.20061220-1ubuntu1

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes.  It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
-------------- next part --------------
Format: 1.7
Date: Mon,  5 Feb 2007 16:10:32 +0100
Source: fontforge
Binary: fontforge-doc fontforge
Architecture: source
Version: 0.0.20061220-1ubuntu1
Distribution: feisty
Urgency: low
Maintainer: Kęstutis Biliūnas <kebil at kaunas.init.lt>
Changed-By: Matthias Klose <doko at ubuntu.com>
Description: 
 fontforge  - Font Editor for PS, TrueType and OpenType fonts
 fontforge-doc - Documentation for FontForge
Closes: 78468
Changes: 
 fontforge (0.0.20061220-1ubuntu1) feisty; urgency=low
 .
   * Configure --with-regular-link. Closes: #78468.
   * debian/patches/008_libgif.diff: New patch, add -lgif when linking.
 .
 fontforge (0.0.20061220-1) experimental; urgency=low
 .
   * New upstream release.
   * Added the fonttools utility - showttf (see: #300111). Also added the
     man page for this program.
   * debian/control: enlarged the fontforge package description - mentioned
     other programs and utilities included in this package.
   * debian/patches:
     - removed the patches  000_fix_exec_prefix.diff and
       patch 009_fix_SVG_output_quotes.diff -- applied by upstream.
Files: 
 b13cb9fdd20e9e51fcbfddabe5d1a838 929 - optional fontforge_0.0.20061220-1ubuntu1.dsc
 a882b6c2159451b3adfd702b5175a015 13221 - optional fontforge_0.0.20061220-1ubuntu1.diff.gz
-------------- next part --------------
diff -pruN 0.0.20061220-1/debian/changelog 0.0.20061220-1ubuntu1/debian/changelog
--- 0.0.20061220-1/debian/changelog	2007-02-05 17:11:32.000000000 +0000
+++ 0.0.20061220-1ubuntu1/debian/changelog	2007-02-05 17:10:59.000000000 +0000
@@ -1,3 +1,10 @@
+fontforge (0.0.20061220-1ubuntu1) feisty; urgency=low
+
+  * Configure --with-regular-link. Closes: #78468.
+  * debian/patches/008_libgif.diff: New patch, add -lgif when linking.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon,  5 Feb 2007 16:10:32 +0100
+
 fontforge (0.0.20061220-1) experimental; urgency=low
 
   * New upstream release.
diff -pruN 0.0.20061220-1/debian/patches/008_libgif.diff 0.0.20061220-1ubuntu1/debian/patches/008_libgif.diff
--- 0.0.20061220-1/debian/patches/008_libgif.diff	1970-01-01 01:00:00.000000000 +0100
+++ 0.0.20061220-1ubuntu1/debian/patches/008_libgif.diff	2007-02-05 17:10:59.000000000 +0000
@@ -0,0 +1,33 @@
+--- fontforge/fontforge/Makefile.dynamic.in~	2006-11-20 21:09:56.000000000 +0100
++++ fontforge/fontforge/Makefile.dynamic.in	2007-01-10 15:01:16.000000000 +0100
+@@ -18,7 +18,7 @@
+ X_11LIB = @X_11LIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-STATIC_LIBS = @STATIC_LIBS@
++STATIC_LIBS = @STATIC_LIBS@ -lgif
+ 
+ fontforge_LIBOBJECTS =  autohint.o autosave.o autowidth.o bitmapdlg.o \
+  bitmapview.o bvedit.o charview.o cursors.o \
+--- fontforge/mensis/Makefile.dynamic.in~	2003-10-16 03:57:54.000000000 +0200
++++ fontforge/mensis/Makefile.dynamic.in	2007-01-10 15:13:59.000000000 +0100
+@@ -31,7 +31,7 @@
+ 
+ LDFLAGS = @LDFLAGS@
+ LIBS = -L../libs -rpath $(libdir) $(X_LIBS) -lgdraw -lgunicode \
+-    $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) @LIBS@ -lm
++    $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) @LIBS@ -lgif -lm
+ 
+ 
+ all: mensis-en.ui mensis
+--- fontforge/mensis/Makefile.in~	2007-01-10 15:14:39.000000000 +0100
++++ fontforge/mensis/Makefile.in	2007-01-10 15:28:41.000000000 +0100
+@@ -32,7 +32,7 @@
+ 
+ LDFLAGS = @LDFLAGS@
+ LIBS = $(X_LIBS) @GLIBS@ \
+-    $(X_PRE_LIBS) $(X_EXTRA_LIBS) @LIBS@ -lm
++    $(X_PRE_LIBS) $(X_EXTRA_LIBS) @LIBS@ -lgif -lm
+ 
+ 
+ all: mensis-en.ui mensis
diff -pruN 0.0.20061220-1/debian/patches/series 0.0.20061220-1ubuntu1/debian/patches/series
--- 0.0.20061220-1/debian/patches/series	2007-02-05 17:11:32.000000000 +0000
+++ 0.0.20061220-1ubuntu1/debian/patches/series	2007-02-05 17:10:59.000000000 +0000
@@ -1,6 +1,7 @@
 005_x_www_browser.diff -p0
 006_Fix_home_dir.diff -p0
 007_mensis_kill_rpatch_on_binaries.diff -p0
+008_libgif.diff -p0
 900_debian_HelpDir_path.diff -p0
 999_disable_xinput.diff -p0
 
diff -pruN 0.0.20061220-1/debian/rules 0.0.20061220-1ubuntu1/debian/rules
--- 0.0.20061220-1/debian/rules	2007-02-05 17:11:32.000000000 +0000
+++ 0.0.20061220-1ubuntu1/debian/rules	2007-02-05 17:10:59.000000000 +0000
@@ -95,7 +95,7 @@ build: build-arch
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 
-	set -e; cd fontforge; CFLAGS="${CFLAGS}" ./configure --prefix=/usr --mandir=\$${prefix}/share/man --with-freetype-bytecode=no
+	set -e; cd fontforge; CFLAGS="${CFLAGS}" ./configure --prefix=/usr --mandir=\$${prefix}/share/man --with-freetype-bytecode=no --with-regular-link
 	$(MAKE) -C fontforge
 
 	set -e; cd fontforge/mensis; CFLAGS="${CFLAGS}" ./configure --prefix=/usr --exec-prefix=/usr --mandir=\$${prefix}/share/man --with-freetype-bytecode=no