[Pkg-ocaml-maint-commits] [dose3] 01/01: Drop patch buildcheck-redirect-output
Johannes Schauer
josch-guest at moszumanska.debian.org
Tue Oct 21 12:27:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
josch-guest pushed a commit to branch master
in repository dose3.
commit 4ae1108275dc3afd2b761ea13ef82ea5eb4d1c55
Author: josch <j.schauer at email.de>
Date: Tue Oct 21 14:26:23 2014 +0200
Drop patch buildcheck-redirect-output
- There was a leftover patch which added the -o option to the
buildcheck man page. But upstream already added the -o option (and
the rest of the patch) so this patch was now resulting in a second -o
option being added.
---
debian/changelog | 1 +
debian/patches/buildcheck-redirect-output | 20 --------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d0e20f2..7583b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dose3 (3.3~beta1-1) UNRELEASED; urgency=low
* avoid lintian warning copyright-refers-to-symlink-license by pointing to
LGPL-3 license file instead of LGPL
* d/control: s/debian/Debian/ to avoid capitalization-error-in-description
+ * dropped buildcheck-redirect-output because it was integrated upstream
-- Ralf Treinen <treinen at debian.org> Mon, 20 Oct 2014 19:59:11 +0200
diff --git a/debian/patches/buildcheck-redirect-output b/debian/patches/buildcheck-redirect-output
deleted file mode 100644
index db3bd91..0000000
--- a/debian/patches/buildcheck-redirect-output
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: add option -o to buildcheck (redirects output)
-Debian-bug: 757643
-Upstream-commit: 72dcb2efa9c8e9a5f127afd9b27fdbca4ce03a76
-
-Index: dose3/doc/manpages/buildcheck.pod
-===================================================================
---- dose3.orig/doc/manpages/buildcheck.pod 2014-10-20 20:15:26.362580585 +0200
-+++ dose3/doc/manpages/buildcheck.pod 2014-10-20 20:15:26.358580585 +0200
-@@ -125,6 +125,10 @@
-
- Display this list of options.
-
-+=item B<-o> I<file>
-+
-+Send output to I<file>.
-+
- =back
- =cut
-
diff --git a/debian/patches/series b/debian/patches/series
index 9d1710e..2e270a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
binaries-prefix-edos
coinstall-binary-name
-buildcheck-redirect-output
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
More information about the Pkg-ocaml-maint-commits
mailing list