This is an automated email from the git hooks/post-receive script. kloetzl-guest pushed a commit to branch master in repository progressivemauve.
commit a0ad402b3357cc702b1e345a694d1015b32b2da9 Author: Fabian Klötzl <[email protected]> Date: Fri Jan 19 16:08:00 2018 +0100 use native getopt --- debian/changelog | 6 ++++++ debian/copyright | 19 ++----------------- debian/patches/series | 1 + debian/patches/use-native-getopt.patch | 22 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index e452524..bf07fd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +progressivemauve (1.2.0+4713+dfsg-4) UNRELEASED; urgency=medium + + * Exclude copy of old GNU/getopt. (Closes: #887632) + + -- Fabian Klötzl <[email protected]> Fri, 19 Jan 2018 15:38:21 +0100 + progressivemauve (1.2.0+4713-3) unstable; urgency=medium * Team upload. diff --git a/debian/copyright b/debian/copyright index 31c3154..a24c73a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,27 +3,12 @@ Upstream-Name: mauveAligner Upstream-Contact: Aaron Darling <[email protected]> Source: http://sourceforge.net/p/mauve/code/HEAD/tree/mauveAligner/trunk/ +Files-Excluded: include/getopt.h src/getopt* + Files: * Copyright: 2003-2014, Aaron Darling -- [email protected] License: GPL-2 -Files: include/getopt.h src/getopt* -Copyright: 1987-2002 Free Software Foundation, Inc. -License: LGPL-2.1+ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - . - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - On Debian systems, the complete text of the GNU Lesser General Public - License can be found in `/usr/share/common-licenses/LGPL-2.1' -Comment: These files are part of the GNU C Library. - Files: debian/* Copyright: 2015-2017 Andreas Tille <[email protected]> License: GPL-2 diff --git a/debian/patches/series b/debian/patches/series index 6fe698a..e6095d9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ fix_build.patch do_not_build_static_binaries.patch spelling.patch +use-native-getopt.patch diff --git a/debian/patches/use-native-getopt.patch b/debian/patches/use-native-getopt.patch new file mode 100644 index 0000000..c63159a --- /dev/null +++ b/debian/patches/use-native-getopt.patch @@ -0,0 +1,22 @@ +From: Fabian Klötzl <[email protected]> +Date: Fri, 19 Jan 2018 15:42:39 +0100 +Subject: use native getopt.h + +--- + src/mauveAligner.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mauveAligner.cpp b/src/mauveAligner.cpp +index 34b20aa..db36856 100644 +--- a/src/mauveAligner.cpp ++++ b/src/mauveAligner.cpp +@@ -11,7 +11,8 @@ + #endif + + #include "mauveAligner.h" +-#include "getopt.h" ++#include <unistd.h> ++#include <getopt.h> + #include <sstream> + #include <stdexcept> + #include "libGenome/gnSequence.h" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/progressivemauve.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
