Hi, As part of the current BSP, I've prepared an NMU which refreshes the patches which aren't applying and updated debian/rules to exit if patches do not apply cleanly. Attached is the full debdiff.
Thanks, James -- GPG Key: 1024D/61326D40 2003-09-02 James Vega <[EMAIL PROTECTED]>
diff -u fontforge-0.0.20051205/debian/fontforge-patches/001_fix_gdraw.diff
fontforge-0.0.20051205/debian/fontforge-patches/001_fix_gdraw.diff
--- fontforge-0.0.20051205/debian/fontforge-patches/001_fix_gdraw.diff
+++ fontforge-0.0.20051205/debian/fontforge-patches/001_fix_gdraw.diff
@@ -12,10 +12,10 @@
STATIC_LIBS = @STATIC_LIBS@
libgdraw_OBJECTS = choosericons.lo divisors.lo drawboxborder.lo \
-@@ -39,7 +43,8 @@
+@@ -37,7 +41,8 @@
../libgdraw.la: $(libgdraw_OBJECTS)
- $(LIBTOOL) $(CC) $(CFLAGS) -o ../libgdraw.la $(libgdraw_OBJECTS) \
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la
$(libgdraw_OBJECTS) \
- $(STATIC_LIBS) \
+ $(STATIC_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) \
+ ../libgunicode.la -lm \
diff -u
fontforge-0.0.20051205/debian/fontforge-patches/002_fix_gdraw_part_2.diff
fontforge-0.0.20051205/debian/fontforge-patches/002_fix_gdraw_part_2.diff
--- fontforge-0.0.20051205/debian/fontforge-patches/002_fix_gdraw_part_2.diff
+++ fontforge-0.0.20051205/debian/fontforge-patches/002_fix_gdraw_part_2.diff
@@ -1,6 +1,6 @@
--- pfaedit-031020.orig/Makefile.dynamic.in 2003-10-23 19:59:36.000000000
+1000
+++ pfaedit-031020/Makefile.dynamic.in 2003-10-23 20:18:33.000000000 +1000
-@@ -23,7 +23,7 @@
+@@ -25,7 +25,7 @@
libgunicode:
( cd Unicode ; $(MAKE) )
@@ -11,11 +11,11 @@
- clean:
-@@ -43,8 +43,8 @@
+ pos:
+@@ -48,8 +48,8 @@
# You may need to be root to do the install
mkdir -p $(libdir)
#-rm $(libdir)/libgdraw.so* $(libdir)/libgunicode.so.*
-- $(LIBTOOL) $(INSTALL) -c libgdraw.la $(libdir)/libgdraw.la
- $(LIBTOOL) $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
-+ $(LIBTOOL) $(INSTALL) -c libgdraw.la $(libdir)/libgdraw.la
+- $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la
$(libdir)/libgdraw.la
+ $(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la
$(libdir)/libgunicode.la
++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la
$(libdir)/libgdraw.la
#cp .libs/*.so.*.* $(libdir)
- $(LIBTOOL) --finish $(libdir)
-
+ $(LIBTOOL) --mode=finish $(libdir)
+ mkdir -p $(libdir)/pkgconfig
diff -u
fontforge-0.0.20051205/debian/fontforge-patches/004_kill_rpath_on_binaries.diff
fontforge-0.0.20051205/debian/fontforge-patches/004_kill_rpath_on_binaries.diff
---
fontforge-0.0.20051205/debian/fontforge-patches/004_kill_rpath_on_binaries.diff
+++
fontforge-0.0.20051205/debian/fontforge-patches/004_kill_rpath_on_binaries.diff
@@ -2,13 +2,13 @@
+++ fontforge-20040410/fontforge/Makefile.dynamic.in 2004-04-16
22:01:45.000000000 +1000
-@@ -48,9 +48,9 @@
- @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
+@@ -50,9 +50,9 @@
+ @CPPFLAGS@ '-DPREFIX="@prefix@"'
CFLAGS = @CFLAGS@ $(_CFLAGS)
-LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
+LIBS = $(X_LIBS) ../libgdraw.la ../libgunicode.la \
$(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib
-lm
--DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ -lm
-+DLIBS = ../libgunicode.la @LIBS@ -lm
+-DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
++DLIBS = ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
- all: pfaedit-en.ui fontforge sfddiff
+ all: fontforge
diff -u fontforge-0.0.20051205/debian/fontforge-patches/005_x_www_browser.diff
fontforge-0.0.20051205/debian/fontforge-patches/005_x_www_browser.diff
--- fontforge-0.0.20051205/debian/fontforge-patches/005_x_www_browser.diff
+++ fontforge-0.0.20051205/debian/fontforge-patches/005_x_www_browser.diff
@@ -1,11 +1,11 @@
--- fontforge-20040618/fontforge/uiutil.c.orig 2004-06-16 05:43:23.000000000
+1000
+++ fontforge-20040618/fontforge/uiutil.c 2004-06-27 14:55:24.000000000
+1000
-@@ -240,7 +240,7 @@
+@@ -220,7 +220,7 @@
"iexplore.exe",
/*"lynx.exe",*/
#else
-- static char *stdbrowsers[] = { "mozilla", "opera", "galeon", "kfmclient",
-+ static char *stdbrowsers[] = { "x-www-browser", "mozilla-firefox",
"mozilla", "konqueror", "opera", "galeon", "kfmclient",
+- static char *stdbrowsers[] = { "htmlview", "firefox", "mozilla", "opera",
"galeon", "kfmclient",
++ static char *stdbrowsers[] = { "x-www-browser", "htmlview", "firefox",
"mozilla", "opera", "galeon", "kfmclient",
"netscape", "mosaic", /*"grail",*/ "lynx",
#endif
NULL };
diff -u fontforge-0.0.20051205/debian/fontforge-patches/006_Fix_home_dir.diff
fontforge-0.0.20051205/debian/fontforge-patches/006_Fix_home_dir.diff
--- fontforge-0.0.20051205/debian/fontforge-patches/006_Fix_home_dir.diff
+++ fontforge-0.0.20051205/debian/fontforge-patches/006_Fix_home_dir.diff
@@ -1,6 +1,6 @@
--- fontforge-20040410/fontforge/autosave.c.orig 2004-04-16
22:52:03.000000000 +1000
+++ fontforge-20040410/fontforge/autosave.c 2004-04-16 22:52:35.000000000
+1000
-@@ -65,7 +65,7 @@
+@@ -79,7 +79,7 @@
return( dir );
if ( gethomedir()==NULL )
return( NULL );
diff -u fontforge-0.0.20051205/debian/rules fontforge-0.0.20051205/debian/rules
--- fontforge-0.0.20051205/debian/rules
+++ fontforge-0.0.20051205/debian/rules
@@ -51,7 +51,7 @@
(cd libuninameslist; libtoolize --force --copy ; aclocal-1.7 ; autoconf)
# Now configure fontforge
- (cd $(FONTFORGE_DIR); for p in ../debian/fontforge-patches/*; do patch
-p1 < $$p ; done)
+ (cd $(FONTFORGE_DIR); for p in ../debian/fontforge-patches/*; do patch
-p1 --dry-run < $$p || exit 1; patch -p1 < $$p; done)
# Update config.sub and config.guess
cp /usr/share/misc/config.guess /usr/share/misc/config.sub
$(FONTFORGE_DIR)/
diff -u fontforge-0.0.20051205/debian/changelog
fontforge-0.0.20051205/debian/changelog
--- fontforge-0.0.20051205/debian/changelog
+++ fontforge-0.0.20051205/debian/changelog
@@ -1,3 +1,11 @@
+fontforge (0.0.20051205-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Refresh debian/fontforge-patches/* to fix FTBFS. (Closes: 362123)
+ * Update debian/rules to fail if patches are unable to apply cleanly.
+
+ -- James Vega <[EMAIL PROTECTED]> Sun, 23 Apr 2006 23:53:29 -0400
+
fontforge (0.0.20051205-0.1) unstable; urgency=low
* Non-maintainer upload to allow new fonts to enter Debian
signature.asc
Description: Digital signature
