rev 12802 - in krap/libspectre/trunk/debian: . patches

[Matthew Rosewarne]

Author: mukidohime-guest
Date: 2008-11-30 23:31:16 +0000 (Sun, 30 Nov 2008)
New Revision: 12802

Added:
   krap/libspectre/trunk/debian/patches/use-system-ghostscript.patch
Removed:
   krap/libspectre/trunk/debian/patches/prune-ghostscript.patch
Modified:
   krap/libspectre/trunk/debian/changelog
   krap/libspectre/trunk/debian/patches/series
   krap/libspectre/trunk/debian/rules
Log:
* Don't prune ghostscript in clean rule
 ...in fact, don't prune it at all.


Modified: krap/libspectre/trunk/debian/changelog
===================================================================
--- krap/libspectre/trunk/debian/changelog	2008-11-30 23:17:49 UTC (rev 12801)
+++ krap/libspectre/trunk/debian/changelog	2008-11-30 23:31:16 UTC (rev 12802)
@@ -1,13 +1,13 @@
-libspectre (0.2.2.ds-1) UNRELEASED; urgency=low
+libspectre (0.2.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
     + Fixes rendering of Mozilla-generated files. (Closes: #484645)
     + Correctly loads EPS files with TIFF previews. (Closes: #490309)
-  * Replace prune-ghostscript script with DEB_MAINTAINER_MODE clean rule.
+  * Do not remove ghostscript headers, just patch the from build system.
   * Update Autotools instead of direct patching.
     + Add Build-Depends on autoconf, automake, and libtool.
     + Switch to from CDBS simple patch system to quilt.
-    + Rewrite strip_ghostscript.patch as prune-ghostscript.patch.
+    + Rewrite strip_ghostscript.patch as use-system-ghostscript.patch.
   * Bump Standards-Version to 3.8.0, no changes required.
   * Fix watch file.
   * Adjust descriptions.

Deleted: krap/libspectre/trunk/debian/patches/prune-ghostscript.patch

Modified: krap/libspectre/trunk/debian/patches/series
===================================================================
--- krap/libspectre/trunk/debian/patches/series	2008-11-30 23:17:49 UTC (rev 12801)
+++ krap/libspectre/trunk/debian/patches/series	2008-11-30 23:31:16 UTC (rev 12802)
@@ -1 +1 @@
-prune-ghostscript.patch
+use-system-ghostscript.patch
\ No newline at end of file

Added: krap/libspectre/trunk/debian/patches/use-system-ghostscript.patch
===================================================================
--- krap/libspectre/trunk/debian/patches/use-system-ghostscript.patch	                        (rev 0)
+++ krap/libspectre/trunk/debian/patches/use-system-ghostscript.patch	2008-11-30 23:31:16 UTC (rev 12802)
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -287,7 +287,6 @@
+ Doxyfile
+ libspectre/Makefile
+ libspectre/spectre-version.h
+-libspectre/ghostscript/Makefile
+ test/Makefile
+ libspectre.pc
+ ])
+--- a/libspectre/Makefile.am
++++ b/libspectre/Makefile.am
+@@ -1,5 +1,3 @@
+-SUBDIRS = ghostscript
+-
+ INCLUDES = 			\
+ 	-I$(top_builddir)	\
+ 	-I$(srcdir)		\

Modified: krap/libspectre/trunk/debian/rules
===================================================================
--- krap/libspectre/trunk/debian/rules	2008-11-30 23:17:49 UTC (rev 12801)
+++ krap/libspectre/trunk/debian/rules	2008-11-30 23:31:16 UTC (rev 12802)
@@ -1,13 +1,6 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-ifneq (,$(DEB_MAINTAINER_MODE))
-# Prune included ghostscript headers
-# Makefiles must be updated!
-clean::
-	rm -rf $(DEB_SRCDIR)/libspectre/ghostscript/
-endif
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk