[Forensics-changes] [rsakeyfind] 02/02: Imported Debian patch 1:1.0-2.1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sat Jun 27 19:36:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository rsakeyfind.
commit 2b74c487bf5f2003d246575c9c17d401dec4f47c
Merge: 2969add a43acef
Author: Salvatore Bonaccorso <carnil at debian.org>
Date: Tue May 15 20:47:52 2012 +0200
Imported Debian patch 1:1.0-2.1
debian/changelog | 11 ++++++-----
debian/copyright | 2 +-
debian/docs | 1 -
debian/patches/002_gcc_4.7.diff | 18 ++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 26 insertions(+), 7 deletions(-)
diff --cc debian/changelog
index a012cdc,0000000..d751c98
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,0 +1,48 @@@
- rsakeyfind (1:1.0-3) unstable; urgency=low
++rsakeyfind (1:1.0-2.1) unstable; urgency=low
+
- * Team upload.
- * Re-add README file to the package
- * Use versioned DEP-5 uri
++ * Non-maintainer upload.
++ * Add 002_gcc_4.7.diff patch to fix FTBFS with gcc 4.7.
++ Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> include.
++ Thanks to Cyril Brulebois <kibi at debian.org> for the patch. (Closes: #667360)
+
- -- Julien Valroff <julien at debian.org> Sun, 18 Sep 2011 14:50:59 +0200
++ -- Salvatore Bonaccorso <carnil at debian.org> Tue, 15 May 2012 20:47:52 +0200
+
+rsakeyfind (1:1.0-2) unstable; urgency=low
+
+ * Team upload.
+ * Switch section to utils as per the override
+ * Fix VCS-* fields
+
+ -- Julien Valroff <julien at debian.org> Sat, 23 Jul 2011 10:10:00 +0200
+
+rsakeyfind (1:1.0-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Daniel Baumann ]
+ * Minimizing rules file.
+
+ [ Jacob Appelbaum ]
+ * Fix incorrect program description in control file (Closes: #541279).
+
+ [ Julien Valroff ]
+ * Fix maintainer address (Closes: #624464)
+ * Bump debhelper compat to 8
+ * Bump standards version to 3.9.2 (no changes needed)
+ * Switch to 3.0 (quilt) source package format
+ * Add patch and add install file to avoid direct modifications of upstream
+ sources
+ * Fix version number (add an epoch to ensure the new version number is
+ higher than the previously uploaded package)
+ * Add watch file
+ * Update copyright file as per current DEP-5
+
+ -- Julien Valroff <julien at debian.org> Sat, 23 Jul 2011 08:48:46 +0200
+
+rsakeyfind (1.0.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #495418)
+ * Adjusted the Makefile to add $DESTDIR
+ * Added a man page.
+
+ -- Jacob Appelbaum <jacob at appelbaum.net> Thu, 25 Jun 2009 12:44:00 -0300
diff --cc debian/copyright
index 99724d6,0000000..f39f926
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,58 -1,0 +1,58 @@@
- Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
++Format: http://dep.debian.net/deps/dep5/
+Upstream-Contact: Nadia Heninger
+ J. Alex Halderman
+Source: http://citp.princeton.edu/memory/code/
+
+Files: *
+Copyright: 2008 Nadia Heninger
+ 2008 J. Alex Halderman
+License: BSD-3-clause
+ Redistribution and use of this software in source and binary forms,
+ with or without modification, are permitted provided that the
+ following conditions are met:
+ .
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+ .
+ * Neither the names of the authors nor the names of their institutions
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2008-2009 Jacob Appelbaum <jacob at appelbaum.net>
+ 2011 Julien Valroff <julien at debian.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
diff --cc debian/patches/002_gcc_4.7.diff
index 0000000,0000000..88a7382
new file mode 100644
--- /dev/null
+++ b/debian/patches/002_gcc_4.7.diff
@@@ -1,0 -1,0 +1,18 @@@
++Description: Fix FTBFS with gcc-4.7
++ Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> include.
++Origin: vendor
++Bug-Debian: http://bugs.debian.org/667360
++Forwarded: no
++Author: Cyril Brulebois <kibi at debian.org>
++Last-Update: 2012-05-15
++
++--- a/rsakeyfind.cpp
+++++ b/rsakeyfind.cpp
++@@ -10,6 +10,7 @@
++ #include <sys/mman.h>
++ #include <string.h>
++ #include <iostream>
+++#include <unistd.h>
++
++ #ifdef __FreeBSD__
++ #include <err.h>
diff --cc debian/patches/series
index c701d91,0000000..268f74b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+001_include.diff
++002_gcc_4.7.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/rsakeyfind.git
More information about the forensics-changes
mailing list