[Pkg-gnupg-commit] r322 - in /gpa/trunk/debian: NEWS changelog control copyright gpa.1 patches/ watch
dleidert at users.alioth.debian.org
dleidert at users.alioth.debian.org
Thu May 9 10:12:50 UTC 2013
Author: dleidert
Date: Thu May 9 10:12:50 2013
New Revision: 322
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=322
Log:
Merge back experimental branch.
Added:
gpa/trunk/debian/NEWS
- copied unchanged from r321, gpa/branches/experimental/debian/NEWS
gpa/trunk/debian/patches/
- copied from r321, gpa/branches/experimental/debian/patches/
Modified:
gpa/trunk/debian/changelog
gpa/trunk/debian/control
gpa/trunk/debian/copyright
gpa/trunk/debian/gpa.1
gpa/trunk/debian/watch
Modified: gpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/changelog?rev=322&op=diff
==============================================================================
--- gpa/trunk/debian/changelog (original)
+++ gpa/trunk/debian/changelog Thu May 9 10:12:50 2013
@@ -1,8 +1,57 @@
-gpa (0.9.0-5) UNRELEASED; urgency=low
+gpa (0.9.3-2) UNRELEASED; urgency=low
* NOT RELEASED YET
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sun, 27 Jan 2013 16:38:37 +0100
+ * debian/copyright: Updated.
+
+ -- Daniel Leidert <dleidert at debian.org> Sat, 11 Aug 2012 19:21:30 +0200
+
+gpa (0.9.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control (Build-Depends): Added dh-autoreconf and autopoint.
+ * debian/rules: Added autoreconf addon.
+ * debian/NEWS: Added.
+ * debian/patches/fix_segfault_filehandler.patch: Dropped (applied upstream).
+ * debian/patches/gnupg2.patch: Added.
+ - configure.ac: Check for gnupg2 binary and helpers.
+ * debian/patches/series: Adjusted.
+
+ -- Daniel Leidert <dleidert at debian.org> Sat, 11 Aug 2012 19:16:51 +0200
+
+gpa (0.9.2-2) experimental; urgency=low
+
+ * debian/control (Homepage): Changed to point to gnupg.org.
+ (Build-Depends): Removed unused autopoint too.
+ * debian/patches/fix_segfault_filehandler.patch: Added.
+ - src/fileman.c: Fix a segmentation fault in file-manager mode.
+ * debian/patches/series: Added.
+
+ -- Daniel Leidert <dleidert at debian.org> Sun, 08 Jul 2012 14:20:49 +0200
+
+gpa (0.9.2-2) experimental; urgency=low
+
+ * debian/control (Homepage): Changed to point to gnupg.org.
+ (Build-Depends): Removed unused autopoint too.
+ * debian/patches/fix_segfault_filehandler.patch: Added.
+ - src/fileman.c: Fix a segmentation fault in file-manager mode.
+ * debian/patches/series: Added.
+
+ -- Daniel Leidert <dleidert at debian.org> Sun, 08 Jul 2012 14:20:49 +0200
+
+gpa (0.9.2-1) experimental; urgency=low
+
+ * debian/control: Adjusted for experimental. Removed DM-Upload-Allowed.
+ (Build-Depends): Dropped dh-autoreconf.
+ (Uploaders): Adjusted my address.
+ * debian/gpa.1: Added hidden options and missing references.
+ * debian/rules: Removed autoreconf addon.
+ * debian/watch: Fixed tp point to ftp.gnupg.org.
+ * debian/patches/448765_grammar_fixes.patch: Dropped - applied upstream.
+ * debian/patches/625513_fix_expiration_date.patch: Ditto.
+ * debian/patches/628305_build_with_libassuan_v2.patch: Ditto.
+ * debian/patches/series: Removed.
+
+ -- Daniel Leidert <dleidert at debian.org> Wed, 04 Jul 2012 21:09:28 +0200
gpa (0.9.0-4) unstable; urgency=low
Modified: gpa/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/control?rev=322&op=diff
==============================================================================
--- gpa/trunk/debian/control (original)
+++ gpa/trunk/debian/control Thu May 9 10:12:50 2013
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: Debian GnuPG-Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>
-Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Uploaders: Daniel Leidert <dleidert at debian.org>
Build-Depends: autopoint,
autotools-dev (>> 20100122.1~),
debhelper (>> 7.0.50~),
@@ -13,10 +13,9 @@
libgpgme11-dev (>> 1.2.0),
libgtk2.0-dev (>> 2.10.0)
Standards-Version: 3.9.3
-Homepage: http://www.gnupg.org/related_software/gpa/
+Homepage: Homepage: http://www.gnupg.org/gpa.html
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/gpa/trunk/
-DM-Upload-Allowed: yes
Package: gpa
Architecture: any
Modified: gpa/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/copyright?rev=322&op=diff
==============================================================================
--- gpa/trunk/debian/copyright (original)
+++ gpa/trunk/debian/copyright Thu May 9 10:12:50 2013
@@ -1,87 +1,61 @@
-This package was debianized by Bastian Blank <waldi at debian.org> on
-Sun, 5 Jan 2003 13:28:44 +0100. It is currently maintained by the
-Debian GnuPG-Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>.
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: GPA
+Upstream-Contact: gpa-dev at gnupg.org
+Source: ftp://ftp.gnupg.org/gcrypt/gpa/
-It was downloaded from:
+Files: *
+Copyright: 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
+ 2002-2004 Miguel Coca
+ 2001-2009, 2011, 2012 g10 Code GmbH
+ 1995 Spencer Kimball and Peter Mattis (partial)
+ 1998-2007 Free Software Foundation, Inc (partial)
+ 2000, 2001 OpenIT GmbH (partial)
+ 2000-2002 Timo Schulz (partial)
+ 2005 Ryan McDougall (partial)
+Comments: Some sources files are distributed under GPL-2+.
+License: GPL-3+
- http://wald.intevation.org/projects/gpa/
+Files: src/w32-afunix.* src/strlist.*
+Copyright: see above
+License: LGPL-3+
-Upstream Authors:
+Files: debian/*
+Copyright:
+Comment: This package was debianized by Bastian Blank <waldi at debian.org> on
+ Sun, 5 Jan 2003 13:28:44 +0100. It is currently maintained by the Debian
+ GnuPG-Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>.
+License: GPL-3+
- Markus Gerwinski <markus at gnu.de>
- Peter Gerwinski <peter.gerwinski at g-n-u.de>
- Werner Koch <wk at gnupg.org> et al.
+License: LGPL-3+
+ This program 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 3 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, see <http://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 3 can be found in "/usr/share/common-licenses/LGPL-3".
- Please refer to the file `AUTHORS' for the full list of people who
- made this software possible.
-
-Copyright:
-
- Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de).
- Copyright (C) 2002-2004 Miguel Coca.
- Copyright (C) 2005-2009 g10 Code GmbH.
-
- GPA uses fragments from the following programs and libraries:
- JNLIB, Copyright (C) 1998-2000 Free Software Foundation, Inc.
- GPGME, Copyright (C) 2000-2001 Werner Koch
- WinPT, Copyright (C) 2000-2002 Timo Schulz
-
-License: GPL2+, GPL3+ and LGPLv3+
-
- Some files are licensed under GPL v2+:
-
- GPA 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.
-
- GPA 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 GNU/Linux systems, the complete text of the GNU General
- Public License v2 can be found in `/usr/share/common-licenses/GPL-2'.
-
- Some files are licensed under GPL v3+:
-
- GPA 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
- (at your option) any later version.
-
- GPA 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, see <http://www.gnu.org/licenses/>. */
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License v3 can be found in `/usr/share/common-licenses/GPL-3'.
-
- The files src/strlist.c, src/strlist.h, src/w32-afunix.c and
- src/w32-afunix.h have been taken from JNLIB and have been licensed under the
- the LGPL v3+:
-
- JNLIB 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 3 of
- the License, or (at your option) any later version.
-
- JNLIB 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.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this program; if not, see <http://www.gnu.org/licenses/>.
-
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License v3 can be found in `/usr/share/common-licenses/LGPL-3'.
+License: GPL-3+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in "/usr/share/common-licenses/GPL-3".
Modified: gpa/trunk/debian/gpa.1
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/gpa.1?rev=322&op=diff
==============================================================================
--- gpa/trunk/debian/gpa.1 (original)
+++ gpa/trunk/debian/gpa.1 Thu May 9 10:12:50 2013
@@ -26,12 +26,33 @@
.B \-d, \-\-daemon
Enable the UI server.
.TP
+.B \-\-debug-edit-fsm
+Debug the Finite State Machine (FSM).
+.TP
.B \-\-disable\-ticker
Disable ticker used for card operations.
+.TP
+.B \-\-disable-x509
+Disable support for X.509.
+.TP
+.B \-\-enable-logging
+Enable logging on Win32 systems.
.TP
.B \-f, \-\-files
Start with the file-manager open. This is the \fIdefault\fP if one or more
\fIFILE(S)\fP are added to the command arguments.
+.TP
+.B \-\-gpg-binary=\fIFILE\fP
+Path to the
+.BR gpg (1)
+or
+.BR gpg2 (1)
+binary.
+.TP
+.B \-\-gpgsm-binary=\fIFILE\fP
+Path to the
+.BR gpgsm (1)
+binary.
.TP
.B \-k, \-\-keyring
Start with the keyring editor. This is the \fIdefault\fP.
@@ -42,18 +63,18 @@
.B \-s, \-\-settings
Open the settings dialog.
.TP
+.B \-v, \-\-version
+Print version information and exit.
+.TP
.B \-x, \-\-cms
Enable basic support for X.509.
-.TP
-.B \-?, \-\-help, \-\-help\-all
-Print usage information and exit.
.TP
.B \-\-help\-gtk
Print options related to GTK. See also
.BR gtk-options "(7)."
.TP
-.B \-v, \-\-version
-Print version information and exit.
+.B \-?, \-\-help, \-\-help\-all
+Print usage information and exit.
.SH FILES
.TP
@@ -61,7 +82,8 @@
Standard user configuration file read by \fBgpa\fP on startup.
.SH "BUGS"
-Please report bugs to <bug\-gpa at gnupg.org>.
+Please report bugs to <bug\-gpa at gnupg.org> or to
+\fI\%https://bugs.g10code.com/gnupg/\fR.
.SH AUTHORS
.B gpa
Modified: gpa/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/watch?rev=322&op=diff
==============================================================================
--- gpa/trunk/debian/watch (original)
+++ gpa/trunk/debian/watch Thu May 9 10:12:50 2013
@@ -1,2 +1,2 @@
version=3
-http://wald.intevation.org/frs/?group_id=13 .*/gpa-([\d.]+)\.tar\.(?:gz|bz2)
+opts=pasv ftp://ftp.gnupg.org/gcrypt/gpa/ gpa-([\d.]+)\.tar\.(?:bz2|gz)
More information about the Pkg-gnupg-commit
mailing list