[Forensics-changes] [fcrackzip] 92/93: Imported Debian patch 1.0-7

Giovani Augusto Ferreira giovani-guest at moszumanska.debian.org
Wed Dec 28 03:06:47 UTC 2016


This is an automated email from the git hooks/post-receive script.

giovani-guest pushed a commit to branch debian
in repository fcrackzip.

commit 509d188528ddb2734589b5ac659c1910cb2b3109
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Tue Apr 26 22:19:53 2016 -0300

    Imported Debian patch 1.0-7
---
 debian/changelog                    | 20 ++++++++++++++++
 debian/control                      | 18 +++++++--------
 debian/copyright                    | 46 +++++++++++++++++++------------------
 debian/docs                         |  1 -
 debian/patches/70-fix-manpage.patch | 25 ++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  7 +++---
 debian/watch                        |  2 +-
 8 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e2eae3..482f051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+fcrackzip (1.0-7) unstable; urgency=medium
+
+  * QA upload.
+  * Using dh-autoreconf now.
+  * Using the original upstream homepage.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Changed from cgit to git in Vcs-Browser field.
+      - Updated the Vcs-* fields to use https instead of http and git.
+  * debian/copyright:
+      - Added the licensing for cpmask.c.
+      - Fixed the licensing from GPL-3+ to GPL-2 for main upstream source code.
+      - Reverting the licensing from GPL-3+ to GPL-2+ for packaging.
+      - Updated copyright years about upstream and packaging.
+  * debian/docs: removed AUTHORS. All data already in debian/copyright.
+  * debian/patches/70-fix-manpage.patch: added to fix a typo in manpage.
+  * debian/watch: bumped to version 4.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 26 Apr 2016 22:19:53 -0300
+
 fcrackzip (1.0-6) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/control b/debian/control
index d8ad1e8..f3ac51b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,18 @@ Source: fcrackzip
 Section: utils
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/fcrackzip.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/fcrackzip.git
-Homepage: http://freshmeat.net/projects/fcrackzip
+Build-Depends: debhelper (>= 9), dh-autoreconf
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/fcrackzip.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/fcrackzip.git
+Homepage: http://oldhome.schmorp.de/marc/fcrackzip.html
 
 Package: fcrackzip
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: unzip, wordlist
 Description: password cracker for zip archives
- fcrackzip is a fast password cracker partly written in assembler.
- It is able to crack password protected zip files with brute
- force or dictionary based attacks, optionally testing with
- unzip its results. It can also crack cpmask'ed images.
+ fcrackzip is a fast password cracker partly written in assembler. It is
+ able to crack password protected zip files with brute force or dictionary
+ based attacks, optionally testing with unzip its results. It can also crack
+ cpmask'ed images.
diff --git a/debian/copyright b/debian/copyright
index 49d99ff..3669cad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,45 +1,47 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: fcrackzip
 Upstream-Contact: Marc Lehmann <schmorp at schmorp.de>, <pcg at goof.com>
-Source: http://freshmeat.net/projects/fcrackzip
-X-Upstream-Vcs:
-X-Upstream-Bugs:
-X-Source:
-  http://software.schmorp.de/pkg/fcrackzip.html
-  http://cvs.schmorp.de/fcrackzip
+Source: http://oldhome.schmorp.de/marc/fcrackzip.html
 
 Files: *
-Copyright:
- 2010 Marc Lehmann <schmorp at schmorp.de>
-License: GPL-3+
+Copyright: 1998-2008 Marc Lehmann <schmorp at schmorp.de>
+License: GPL-2
 
-Files: getopt.c getopt.h getopt1.c
-Copyright:
-  1987-1996 Free Software Foundation, Inc.
+Files: cpmask.c
+Copyright: 1998 Hirotsuna Mizuno <s1041150 at u-aizu.ac.jp>
+           ?    Marc Lehmann <schmorp at schmorp.de>
+License: GPL-2
+
+Files: getopt.c
+       getopt.h
+       getopt1.c
+Copyright: 1987-1996 Free Software Foundation, Inc.
 License: LGPL-2+
 
 Files: debian/*
-Copyright:
-  2011-2013 Jari Aalto <jari.aalto at cante.net>
-  2004 Francesco Donadon <francesco.donadon at katamail.com>
-License: GPL-3+
+Copyright: 2004      Francesco Donadon <francesco.donadon at katamail.com>
+           2010-2013 Jari Aalto <jari.aalto at cante.net>
+           2013      Tony Mancill
+           2015      Adam Borowski <kilobyte at angband.pl>
+           2016      Joao Eriberto Mota Filho <eriberto at debian.org>
+License: GPL-2+
 
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
+License: GPL-2 or GPL-2+
+ This package 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 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
  .
  This package 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
+ 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, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
- Public License can be found in "/usr/share/common-licenses/GPL-3".
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 License: LGPL-2+
  This package is free software; you can redistribute it and/or
diff --git a/debian/docs b/debian/docs
index 55bc0a6..e845566 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
 README
-AUTHORS
diff --git a/debian/patches/70-fix-manpage.patch b/debian/patches/70-fix-manpage.patch
new file mode 100644
index 0000000..ad5e9c4
--- /dev/null
+++ b/debian/patches/70-fix-manpage.patch
@@ -0,0 +1,25 @@
+Description: fix a typo in manpage.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-04-26
+Index: fcrackzip-1.0/fcrackzip.1
+===================================================================
+--- fcrackzip-1.0.orig/fcrackzip.1
++++ fcrackzip-1.0/fcrackzip.1
+@@ -38,7 +38,7 @@ of
+   A   include all uppercase characters [A-Z]
+   1   include the digits [0-9]
+   !   include [!:$%&/()=?{[]}+*~#]
+-  :   the following characters upto the end of the spe-
++  :   the following characters up to the end of the spe-
+       cification string are included in the character set.
+       This way you can include any character except binary
+       null (at least under unix).
+@@ -54,7 +54,7 @@ searching.
+ .TP
+ .B \-l, \-\-length min[-max]
+ Use an initial password of length min, and check all passwords
+-upto passwords of length max (including). You can omit the max
++up to passwords of length max (including). You can omit the max
+ parameter.
+ .TP
+ .B \-u, \-\-use-unzip
diff --git a/debian/patches/series b/debian/patches/series
index 7822e4f..ef2193e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 40-fix-big-endian-format.patch
 50-crash-on-bad-file.patch
 60-typo-wether.patch
+70-fix-manpage.patch
diff --git a/debian/rules b/debian/rules
index 87a2462..40c2b84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@ export DEB_BUILD_MAINT_OPTIONS	= hardening=+all
 export DEB_CFLAGS_MAINT_APPEND	= -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+%:
+	dh $@ --with autoreconf
+
 man:
 	$(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE)info makeman
 
@@ -24,9 +27,5 @@ override_dh_auto_install: man
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
-%:
-	dh $@
 
 .PHONY: man
-
-# End of file
diff --git a/debian/watch b/debian/watch
index b2c78fa..473d94b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
 http://oldhome.schmorp.de/marc/data/fcrackzip-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))
 # Bart Martens <bartm at debian.org>  Sat, 24 Nov 2012 12:56:08 +0000

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/fcrackzip.git



More information about the forensics-changes mailing list