summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <mpitt@debian.org>2010-12-06 19:06:46 +0100
committerMartin Pitt <mpitt@debian.org>2010-12-06 19:06:46 +0100
commit43bd19359666be9d6a575594394810a1e22e309b (patch)
tree1253b43caff907dd63b81ccdd57212621914a0d8
parent60b873f2f67aa38f8aa5d79ae44c1fdfc5e1599e (diff)
downloadcups-43bd19359666be9d6a575594394810a1e22e309b.tar.gz
Drop manual-section-for-drv.dpatch, obsolete with new upstream version.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/00list1
-rwxr-xr-xdebian/patches/manual-section-for-drv.dpatch24
3 files changed, 1 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog
index d2429df0..53e3b6cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ cups (1.4.5-1) UNRELEASED; urgency=low
(CVE-2010-2941) was already fixed by a backported patch in the previous
upload.
* Drop CVE-2010-2941.dpatch, upstream now.
+ * Drop manual-section-for-drv.dpatch, obsolete with new upstream version.
* debian/control: Drop xpdf-* CJK suggests, they got removed from squeeze.
(Closes: #603467)
* debian/control: Clean up obsolete suggests.
diff --git a/debian/patches/00list b/debian/patches/00list
index 375be7bb..646ff72f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -16,7 +16,6 @@ usb-backend-both-usblp-and-libusb.dpatch
removecvstag.dpatch
no-conffile-timestamp.dpatch
drop_unnecessary_dependencies.dpatch
-manual-section-for-drv.dpatch
reactivate_recommended_driver.dpatch
poppler-based-pdftops-fixes.dpatch
read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.dpatch
diff --git a/debian/patches/manual-section-for-drv.dpatch b/debian/patches/manual-section-for-drv.dpatch
deleted file mode 100755
index ff7be68a..00000000
--- a/debian/patches/manual-section-for-drv.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manual-section-for-drv.dpatch by <q-funk@ubuntu.com>
-##
-## DP: fix incorrect man section 7 -> 1 as reported by Lintian.
-@DPATCH@
---- a/man/Makefile 2009-05-13 21:39:17.000000000 +0000
-+++ b/man/Makefile 2009-09-08 21:42:14.000000000 +0000
-@@ -24,6 +24,7 @@ MAN1 = cancel.$(MAN1EXT) \
- cups-config.$(MAN1EXT) \
- cupstestdsc.$(MAN1EXT) \
- cupstestppd.$(MAN1EXT) \
-+ drv.$(MAN1EXT) \
- lp.$(MAN1EXT) \
- lpoptions.$(MAN1EXT) \
- lppasswd.$(MAN1EXT) \
-@@ -47,7 +48,6 @@ MAN5 = classes.conf.$(MAN5EXT) \
- printers.conf.$(MAN5EXT) \
- subscriptions.conf.$(MAN5EXT)
- MAN7 = backend.$(MAN7EXT) \
-- drv.$(MAN7EXT) \
- filter.$(MAN7EXT) \
- notifier.$(MAN7EXT)
- MAN8 = cupsaccept.$(MAN8EXT) \
-debian/patches/debian/patches/manual-section-for-drv.dpatch