[Pkg-cups-devel] r90 - in cupsys/branches/cups-1.2/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Thu Dec 22 11:53:51 2005
New Revision: 90

Added:
   cupsys/branches/cups-1.2/debian/patches/01_cupsimage.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
Log:
* Resurrect debian/patches/01_cupsimage.dpatch (formerly
  03_cupsimage.dpatch), as we get unresolved symbols if libcupsimage
  isn't properly linked to libcupsys, causing other packages to FTBFS.
  Thanks to Adam Conrad.



Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Thu Dec 22 11:53:51 2005
@@ -23,8 +23,12 @@
     cupsd processes, but only the one in the pid file; this will unbreak cupsd
     behaviour in chroots.
   * debian/cupsys.default: Remove obsolete FORCE_RESTART option.
+  * Resurrect debian/patches/01_cupsimage.dpatch (formerly
+    03_cupsimage.dpatch), as we get unresolved symbols if libcupsimage
+    isn't properly linked to libcupsys, causing other packages to FTBFS.
+    Thanks to Adam Conrad.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 22 Dec 2005 12:36:27 +0100
+ -- Martin Pitt <mpitt at debian.org>  Thu, 22 Dec 2005 12:53:03 +0100
 
 cupsys (1.1.99.b1.r4876-1) unstable; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Thu Dec 22 11:53:51 2005
@@ -1,3 +1,4 @@
+01_cupsimage.dpatch
 02_configure.dpatch
 03_manext.dpatch
 04_freebsd.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/01_cupsimage.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/01_cupsimage.dpatch	Thu Dec 22 11:53:51 2005
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_cupsimage.dpatch by Adam Conrad <adconrad at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: libcupsimage needs to link to libcupsys, or we get unresolved symbols
+
+ at DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4841~/filter/Makefile cupsys-1.1.99.b1.r4841/filter/Makefile
+--- cupsys-1.1.99.b1.r4841~/filter/Makefile	2005-10-21 00:05:42.000000000 +1000
++++ cupsys-1.1.99.b1.r4841/filter/Makefile	2005-12-09 17:46:39.000000000 +1100
+@@ -131,9 +131,9 @@
+ # libcupsimage.so.2, libcupsimage.sl.2
+ #
+ 
+-libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
++libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS) ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
++	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm ../cups/$(LIBCUPS)
+ 	$(RM) `basename $@ .2`
+ 	$(LN) $@ `basename $@ .2`
+