[Pkg-cups-devel] r585 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Tue Sep 11 20:32:01 2007
New Revision: 585

Log:
* Add debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch: Do not kill
  edit-config.tmpl on distclean. Forwarded upstream as STR#2508.
  (Closes: #441697)

Added:
   cupsys/trunk/debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Tue Sep 11 20:32:01 2007
@@ -8,8 +8,11 @@
     Kerberos support.
   * debian/rules: Use -Wl,--as-needed linker flag. This drops a few
     unnecessary dependencies and should make checklib much happier.
+  * Add debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch: Do not kill
+    edit-config.tmpl on distclean. Forwarded upstream as STR#2508.
+    (Closes: #441697)
 
- -- Martin Pitt <mpitt at debian.org>  Tue, 11 Sep 2007 22:02:26 +0200
+ -- Martin Pitt <mpitt at debian.org>  Tue, 11 Sep 2007 22:23:59 +0200
 
 cupsys (1.3.0-3) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Tue Sep 11 20:32:01 2007
@@ -1,4 +1,5 @@
 str2488-fix-localedir.dpatch
+str2508-dont_kill_edit-config.tmpl.dpatch
 freebsd.dpatch
 removecvstag.dpatch
 pam.dpatch

Added: cupsys/trunk/debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/str2508-dont_kill_edit-config.tmpl.dpatch	Tue Sep 11 20:32:01 2007
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## str2508-dont_kill_edit-config.tmpl.dpatch by  <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debian #441697, STR #2508
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2007-07-11 23:46:42.000000000 +0200
++++ trunk/Makefile	2007-09-11 22:22:39.000000000 +0200
+@@ -63,9 +63,8 @@
+ 	$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
+ 	$(RM) man/cupsd.conf.man man/lpoptions.man
+ 	$(RM) packaging/cups.list
+-	$(RM) templates/edit-config.tmpl templates/header.tmpl
++	$(RM) templates/header.tmpl
+ 	-$(RM) doc/*/index.html
+-	-$(RM) templates/*/edit-config.tmpl
+ 	-$(RM) templates/*/header.tmpl
+ 	-$(RM) -r autom4te*.cache
+