[Pkg-cups-devel] r816 - in cupsys/trunk/debian: . local/filters/pdf-filters local/filters/pdf-filters/config-scripts local/filters/pdf-filters/pdftopdf

[Till Kamppeter]

Author: till-guest
Date: Mon Aug 11 15:31:15 2008
New Revision: 816

Log:
cups-1.3.8-3: Avoid all CUPS executables and libraries being linked against libpoppler.


Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/local/filters/pdf-filters/addtocups
   cupsys/trunk/debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4
   cupsys/trunk/debian/local/filters/pdf-filters/pdftopdf/Makefile
   cupsys/trunk/debian/local/filters/pdf-filters/removefromcups

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Mon Aug 11 15:31:15 2008
@@ -1,3 +1,15 @@
+cups (1.3.8-3) experimental; urgency=low
+
+  [ Till Kamppeter ]
+  * debian/local/filters/pdf-filters/addtocups,
+    debian/local/filters/pdf-filters/removefromcups,
+    debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4,
+    pdftopdf/Makefile: Avoid that all executables and libraries of CUPS
+    get linked against libpoppler. This especially leads to all packages
+    dependent on CUPS needing libpoppler, even for building.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 11 Aug 2008 16:48:59 +0200
+
 cups (1.3.8-2) experimental; urgency=low
 
   [ Till Kamppeter ]

Modified: cupsys/trunk/debian/local/filters/pdf-filters/addtocups
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/addtocups	(original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/addtocups	Mon Aug 11 15:31:15 2008
@@ -71,6 +71,7 @@
 cp conf/Makefile conf/Makefile.pdf-filters
 cp filter/Makefile filter/Makefile.pdf-filters
 cp Makefile Makefile.pdf-filters
+cp Makedefs.in Makedefs.in.pdf-filters
 perl -p -i -e 's/^(\s*REPLACE\s*=.*)$/$1 imagetopdf.convs imagetopdf.types pdftopdf.convs pdftoraster.convs pdf.types/' conf/Makefile
 perl -p -i -e 's/^(\s*FILTERS\s*=\s+)/$1imagetopdf pdftoraster /' filter/Makefile
 perl -p -i -e 's/^(\s*OBJS\s*=\s+)/$1imagetopdf.o pdftoraster.o /' filter/Makefile
@@ -95,7 +96,8 @@
 		../cups/\$(LIBCUPS)
 	echo Linking \$@...
 	\$(CC) \$(LDFLAGS) -o \$@ pdftoraster.o common.o \$(LINKCUPSIMAGE) \\
-		\$(LIBS)
+		\$(POPPLER_LIBS)
 
 EOF
 perl -p -i -e 's/^(\s*DIRS\s*=.*\s+filter\s+)/$1pdftopdf /' Makefile
+perl -p -i -e 's/^(\s*LIBS\s*=.*$)/$1\nPOPPLER_LIBS\t=\t\@POPPLER_LIBS\@ \$(LIBS)/' Makedefs.in

Modified: cupsys/trunk/debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4	(original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4	Mon Aug 11 15:31:15 2008
@@ -18,9 +18,11 @@
 AC_LANG(C++)
 
 dnl check poppler
-AC_CHECK_LIB(poppler,main,,
+AC_CHECK_LIB(poppler,main,
+  [ POPPLER_LIBS=-lpoppler],
   [ echo "*** poppler library not found. ***";exit ]
 )
+AC_SUBST(POPPLER_LIBS)
 
 dnl check if GlobalParams::GlobalParams has a argument
 if grep "GlobalParams(char \*cfgFileName)" $POPPLER_SRCDIR/poppler/GlobalParams.h >/dev/null ;then

Modified: cupsys/trunk/debian/local/filters/pdf-filters/pdftopdf/Makefile
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/pdftopdf/Makefile	(original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/pdftopdf/Makefile	Mon Aug 11 15:31:15 2008
@@ -83,7 +83,7 @@
 
 pdftopdf:	pdftopdf.o $(LIBOBJS) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $@ pdftopdf.o $(LIBOBJS) $(LIBS) $(CXXLIBS) -lm
+	$(CXX) $(LDFLAGS) -o $@ pdftopdf.o $(LIBOBJS) $(POPPLER_LIBS) $(CXXLIBS) -lm
 
 
 #

Modified: cupsys/trunk/debian/local/filters/pdf-filters/removefromcups
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/removefromcups	(original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/removefromcups	Mon Aug 11 15:31:15 2008
@@ -27,3 +27,4 @@
 mv -f conf/Makefile.pdf-filters conf/Makefile
 mv -f filter/Makefile.pdf-filters filter/Makefile
 mv -f Makefile.pdf-filters Makefile
+mv -f Makedefs.in.pdf-filters Makedefs.in