[Pkg-fonts-bugs] Ubuntu fontforge 0.0.20080429-1ubuntu1

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Fri, 02 Jan 2009 13:56:14 -0500
Source: fontforge
Binary: fontforge-doc python-fontforge fontforge
Architecture: source
Version: 0.0.20080429-1ubuntu1
Distribution: jaunty
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Michael Casadevall <sonicmctails at gmail.com>
Description: 
 fontforge  - Font editor for PS, TrueType and OpenType fonts
 fontforge-doc - Documentation for FontForge
 python-fontforge - Python bindings for FontForge
Launchpad-Bugs-Fixed: 313311
Changes: 
 fontforge (0.0.20080429-1ubuntu1) jaunty; urgency=low
 .
   * debian/rules: (LP: #313311)
     - Modified to handle new autotools behavior by copying config.* after
       calling autotools rebuild scripts
   * debian/patches/ubuntu_01_call_libtool_correctly.diff
     - Modifies menesis module to call libtool with a mode option which
       is required with new versions of libtool
Files: 
 42336eed355640608c3b3d309b9746c7 1681 graphics optional fontforge_0.0.20080429-1ubuntu1.dsc
 7c198a9d10e9d927d45e0a0917676577 15629 graphics optional fontforge_0.0.20080429-1ubuntu1.diff.gz
Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 0.0.20080429-1/debian/changelog 0.0.20080429-1ubuntu1/debian/changelog
--- 0.0.20080429-1/debian/changelog	2009-01-03 07:23:52.000000000 +0000
+++ 0.0.20080429-1ubuntu1/debian/changelog	2009-01-03 07:23:51.000000000 +0000
@@ -1,3 +1,14 @@
+fontforge (0.0.20080429-1ubuntu1) jaunty; urgency=low
+
+  * debian/rules: (LP: #313311)
+    - Modified to handle new autotools behavior by copying config.* after
+      calling autotools rebuild scripts
+  * debian/patches/ubuntu_01_call_libtool_correctly.diff
+    - Modifies menesis module to call libtool with a mode option which
+      is required with new versions of libtool
+
+ -- Michael Casadevall <sonicmctails at gmail.com>  Fri, 02 Jan 2009 13:56:14 -0500
+
 fontforge (0.0.20080429-1) unstable; urgency=low
 
   * New upstream release (Closes: #483001).
diff -pruN 0.0.20080429-1/debian/control 0.0.20080429-1ubuntu1/debian/control
--- 0.0.20080429-1/debian/control	2009-01-03 07:23:52.000000000 +0000
+++ 0.0.20080429-1ubuntu1/debian/control	2009-01-03 07:23:51.000000000 +0000
@@ -1,7 +1,8 @@
 Source: fontforge
 Section: graphics
 Priority: optional
-Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
 Uploaders: Christian Perrier <bubulle at debian.org>
 XS-Python-Version: all
 Build-Depends: debhelper (>= 5.0.38),
diff -pruN 0.0.20080429-1/debian/patches/series 0.0.20080429-1ubuntu1/debian/patches/series
--- 0.0.20080429-1/debian/patches/series	2009-01-03 07:23:52.000000000 +0000
+++ 0.0.20080429-1ubuntu1/debian/patches/series	2009-01-03 07:23:51.000000000 +0000
@@ -6,3 +6,4 @@
 900_debian_HelpDir_path.diff -p0
 999_disable_xinput.diff -p0
 
+ubuntu_01_call_libtool_correctly.diff
diff -pruN 0.0.20080429-1/debian/patches/ubuntu_01_call_libtool_correctly.diff 0.0.20080429-1ubuntu1/debian/patches/ubuntu_01_call_libtool_correctly.diff
--- 0.0.20080429-1/debian/patches/ubuntu_01_call_libtool_correctly.diff	1970-01-01 01:00:00.000000000 +0100
+++ 0.0.20080429-1ubuntu1/debian/patches/ubuntu_01_call_libtool_correctly.diff	2009-01-03 07:23:51.000000000 +0000
@@ -0,0 +1,28 @@
+Index: fontforge-0.0.20080429/fontforge/mensis/Makefile.in
+===================================================================
+--- fontforge-0.0.20080429.orig/fontforge/mensis/Makefile.in	2009-01-02 14:17:14.000000000 -0500
++++ fontforge-0.0.20080429/fontforge/mensis/Makefile.in	2009-01-02 14:17:41.000000000 -0500
+@@ -38,12 +38,12 @@
+ all: mensis-en.ui mensis
+ 
+ mensis: $(mensis_OBJECTS)
+-	$(LIBTOOL) $(CC) -o mensis $(mensis_OBJECTS) stamp.c $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) -o mensis $(mensis_OBJECTS) stamp.c $(LIBS)
+ 
+ #this makes all the .ui files but wildcarding doesn't work too well if the
+ # files don't exist.
+ nomen.h mensis-ui.c mensis-en.ui: $(srcdir)/nomen-*.c makenomenh.c
+-	$(LIBTOOL) $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.c $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.c $(LIBS)
+ 	-ln -s $(srcdir)/nomen-*.c .
+ 	./makenomenh mensis Mensis
+ 	mv mensis-ui-en.c mensis-ui.c
+@@ -59,7 +59,7 @@
+ 	mkdir -p $(bindir)
+ 	mkdir -p $(mandir)/man1
+ 	mkdir -p $(sharedir)
+-	$(LIBTOOL) $(INSTALL) -c mensis $(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL) -c mensis $(bindir)
+ 	cp mensis-*.ui $(sharedir)
+ 	cp $(srcdir)/mensis.1 $(mandir)/man1
+ 
diff -pruN 0.0.20080429-1/debian/rules 0.0.20080429-1ubuntu1/debian/rules
--- 0.0.20080429-1/debian/rules	2009-01-03 07:23:52.000000000 +0000
+++ 0.0.20080429-1ubuntu1/debian/rules	2009-01-03 07:23:51.000000000 +0000
@@ -41,12 +41,12 @@ configure-stamp:
 	$(MAKE) -f debian/rules patch
 	
 	# Now configure fontforge
-	cp /usr/share/misc/config.guess /usr/share/misc/config.sub fontforge/
 	set -e; cd fontforge; cp configure.dynamic.in configure.in; libtoolize --force --copy; aclocal; autoconf
+	cp /usr/share/misc/config.guess /usr/share/misc/config.sub fontforge/
 
 	# and mensis
-	cp /usr/share/misc/config.guess /usr/share/misc/config.sub fontforge/mensis/
 	set -e; cd fontforge/mensis; libtoolize --force --copy; aclocal; autoconf
+	cp /usr/share/misc/config.guess /usr/share/misc/config.sub fontforge/mensis/
 
 	touch configure-stamp