[Pkg-gnupg-commit] r275 - in /gpgme/trunk/debian: ./ patches/ source/
dleidert at users.alioth.debian.org
dleidert at users.alioth.debian.org
Sun Jul 8 17:01:44 UTC 2012
Author: dleidert
Date: Sun Jul 8 17:01:42 2012
New Revision: 275
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=275
Log:
* debian/compat: Raised compatibility level to 7.
* debian/control: Added myself to Uploaders.
(Section): Changed to libs. Fixed binary-control-field-duplicates-source.
(Standards-Version): Bumped to 3.9.3.
(Vcs-Git, Vcs-Browser): Adjusted to point to subversion tree.
(Build-Depends, Depends): Added new dependencies including libassuan-dev.
Fixed debhelper-but-no-misc-depends. Dropped dpatch.
(Description): Fixed several lintian hints.
* debian/copyright: Fixed copyright-refers-to-versionless-license-file.
* debian/gpgme-config.1: Fixed a few errors/warnings.
* debian/libgpgme11.files: Renamed to debian/libgpgme11.install, adjusted.
* debian/libgpgme11-dev.files: Likewise.
* debian/libgpgme11.dirs, debian/libgpgme11-dev.dirs: Dropped useless files.
* debian/libgpgme11-dev.info: Ditto.
* debian/libgpgme11-dev.doc-base (Section): Fixed.
* debian/rules: Complete rewrite for debhelper 7. Enabled hardening.
* debian/watch: Added.
* debian/patches/gpgme-config.dpatch: Dropped (merged upstream).
* debian/patches/10_relibtoolize.dpatch: Dropped.
* debian/patches/00list: Ditto.
* debian/source/format: Added for format 3.0 (quilt).
Added:
gpgme/trunk/debian/libgpgme11-dev.install
- copied, changed from r272, gpgme/trunk/debian/libgpgme11-dev.files
gpgme/trunk/debian/libgpgme11.install
- copied unchanged from r272, gpgme/trunk/debian/libgpgme11.files
gpgme/trunk/debian/source/
gpgme/trunk/debian/source/format
gpgme/trunk/debian/watch
Removed:
gpgme/trunk/debian/libgpgme11-dev.dirs
gpgme/trunk/debian/libgpgme11-dev.files
gpgme/trunk/debian/libgpgme11-dev.info
gpgme/trunk/debian/libgpgme11.dirs
gpgme/trunk/debian/libgpgme11.files
gpgme/trunk/debian/patches/
Modified:
gpgme/trunk/debian/changelog
gpgme/trunk/debian/compat
gpgme/trunk/debian/control
gpgme/trunk/debian/copyright
gpgme/trunk/debian/gpgme-config.1
gpgme/trunk/debian/libgpgme11-dev.doc-base
gpgme/trunk/debian/rules
Modified: gpgme/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/changelog?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/changelog (original)
+++ gpgme/trunk/debian/changelog Sun Jul 8 17:01:42 2012
@@ -2,6 +2,27 @@
* NOT RELEASED YET
* New upstream version.
+ * debian/compat: Raised compatibility level to 7.
+ * debian/control: Added myself to Uploaders.
+ (Section): Changed to libs. Fixed binary-control-field-duplicates-source.
+ (Standards-Version): Bumped to 3.9.3.
+ (Vcs-Git, Vcs-Browser): Adjusted to point to subversion tree.
+ (Build-Depends, Depends): Added new dependencies including libassuan-dev.
+ Fixed debhelper-but-no-misc-depends. Dropped dpatch.
+ (Description): Fixed several lintian hints.
+ * debian/copyright: Fixed copyright-refers-to-versionless-license-file.
+ * debian/gpgme-config.1: Fixed a few errors/warnings.
+ * debian/libgpgme11.files: Renamed to debian/libgpgme11.install, adjusted.
+ * debian/libgpgme11-dev.files: Likewise.
+ * debian/libgpgme11.dirs, debian/libgpgme11-dev.dirs: Dropped useless files.
+ * debian/libgpgme11-dev.info: Ditto.
+ * debian/libgpgme11-dev.doc-base (Section): Fixed.
+ * debian/rules: Complete rewrite for debhelper 7. Enabled hardening.
+ * debian/watch: Added.
+ * debian/patches/gpgme-config.dpatch: Dropped (merged upstream).
+ * debian/patches/10_relibtoolize.dpatch: Dropped.
+ * debian/patches/00list: Ditto.
+ * debian/source/format: Added for format 3.0 (quilt).
-- Daniel Leidert <dleidert at debian.org> Sun, 08 Jul 2012 16:52:59 +0200
Modified: gpgme/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/compat?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/compat (original)
+++ gpgme/trunk/debian/compat Sun Jul 8 17:01:42 2012
@@ -1,1 +1,1 @@
-5
+7
Modified: gpgme/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/control?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/control (original)
+++ gpgme/trunk/debian/control Sun Jul 8 17:01:42 2012
@@ -1,29 +1,47 @@
-Source: gpgme1.0
+Source: gpgme
Priority: optional
-Section: libdevel
+Section: libs
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>> 5.0.0), libgpg-error-dev (>= 0.7-1), dpatch (>= 1.11), libpth-dev
-Standards-Version: 3.8.0
-Vcs-Git: git://git.debian.org/git/users/jsogo/gpgme1.0.git
-Vcs-Browser: http://git.debian.org/git/users/jsogo/gpgme1.0.git
+Uploaders: Daniel Leidert <dleidert at debian.org>
+Build-Depends: autotools-dev (>> 20100122.1~),
+ debhelper (>> 7.0.50~),
+ gnupg (>= 1.4.0),
+ gnupg2,
+ gpgsm,
+ libassuan-dev (>> 2.0.2),
+ libgpg-error-dev (>> 1.8),
+ libpth-dev,
+ scdaemon
+Standards-Version: 3.9.3
+Homepage: http://www.gnupg.org/gpgme.html
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/gpgme/trunk/
Package: libgpgme11-dev
Section: libdevel
Architecture: any
-Depends: libgpgme11 (= ${binary:Version}), libc6-dev, libgpg-error-dev, libpth-dev
+Depends: libassuan-dev,
+ libc6-dev,
+ libgpg-error-dev,
+ libgpgme11 (= ${binary:Version}),
+ libpth-dev,
+ ${misc:Depends}
Conflicts: libgpgme-dev, libgpgme10-dev
-Description: GPGME - GnuPG Made Easy
- GPGME is a wrapper library which provides a C API to access some of the
+Description: GPGME - GnuPG Made Easy (development files)
+ GPGME is a wrapper library which provides a C API to access some of the
GnuPG functions, such as encrypt, decrypt, sign, verify, ...
.
- This package contains the headers and other files needed to compile
+ This package contains the headers and other files needed to compile
against this library.
Package: libgpgme11
-Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, gnupg (>= 1.4.6-2)
-Suggests: gpgsm
-Description: GPGME - GnuPG Made Easy
- GPGME is a wrapper library which provides a C API to access some of the
+Depends: gnupg (>= 1.4.6-2) | gnupg2 (>> 2.0.4),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: gpgsm (>> 1.9.6)
+Description: GPGME - GnuPG Made Easy (library)
+ GPGME is a wrapper library which provides a C API to access some of the
GnuPG functions, such as encrypt, decrypt, sign, verify, ...
+ .
+ This package contains the library.
Modified: gpgme/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/copyright?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/copyright (original)
+++ gpgme/trunk/debian/copyright Sun Jul 8 17:01:42 2012
@@ -27,5 +27,5 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in /usr/share/common-licenses/LGPL.
+On Debian systems, the complete text of the GNU Lesser General Public License
+version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
Modified: gpgme/trunk/debian/gpgme-config.1
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/gpgme-config.1?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/gpgme-config.1 (original)
+++ gpgme/trunk/debian/gpgme-config.1 Sun Jul 8 17:01:42 2012
@@ -1,37 +1,67 @@
-.TH GPGME 1 "12 October 2002"
+.TH "GPGME" "1" "08 July 2012" "gpgme" "User commands"
+
.SH NAME
-gpgme-config - script to get information about the installed version of GPGME
+gpgme-config \- script to get information about the installed version of GPGME
+
.SH SYNOPSIS
-.B gpgme-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags]
+.B gpgme-config
+.RB [ \-\-prefix\fI[=DIR]\fP ]
+.RB [ \-\-exec\-prefix\fI[=DIR]\fP ]
+.RB [ \-\-version ]
+.RB [ \-\-libs ]
+.RB [ \-\-cflags ]
+
.SH DESCRIPTION
.PP
-\fIgpgme-config\fP is a tool that is used to configure to determine
+\fBgpgme-config\fP is a tool that is used to configure to determine
the compiler and linker flags that should be used to compile
and link programs that use \fIGPGME\fP. It is also used internally
to the .m4 macros for GNU autoconf that are included with \fIGPGME\fP.
-.
+
.SH OPTIONS
-.l
-\fIgpgme-config\fP accepts the following options:
-.TP 8
-.B \-\-version
-Print the currently installed version of \fIGPGME\fP on the standard output.
-.TP 8
-.B \-\-libs
+.PP
+\fBgpgme-config\fP accepts the following options:
+.TP
+.B \-\-api\-version
+Print the currently installed API version of \fIGPGME\fP to standard output.
+.TP
+.B \-\-cflags
+Print the compiler flags that are necessary to compile a \fIGPGME\fP program.
+.TP
+.B \-\-exec\-prefix
+Print the exec prefix that was used to configure the \fIGPGME\fP build.
+.TP
+.B --get-gpg
+Print the path to the
+.BR gpg (1)
+binary used to configure the \fIGPGME\fP build.
+.TP
+.B --get-gpgsm
+Print the path to the
+.BR gpgsm (1)
+binary used to configure the \fIGPGME\fP build.
+.TP
+.B \-\-host
+Print host information.
+.TP
+.B \-\-libs
Print the linker flags that are necessary to link a \fIGPGME\fP program.
-.TP 8
-.B \-\-cflags
-Print the compiler flags that are necessary to compile a \fIGPGME\fP program.
-.TP 8
-.B \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that \fIGPGME\fP
-was built with when computing the output for the \-\-cflags and
-\-\-libs options. This option is also used for the exec prefix
-if \-\-exec\-prefix was not specified. This option must be specified
-before any \-\-libs or \-\-cflags options.
-.TP 8
-.B \-\-exec\-prefix=PREFIX
-If specified, use PREFIX instead of the installation exec prefix that
-\fIGpgME\fP was built with when computing the output for the \-\-cflags
-and \-\-libs options. This option must be specified before any
-\-\-libs or \-\-cflags options.
+.TP
+.B \-\-prefix
+Print the prefix that was used to configure the \fIGPGME\fP build.
+.TP
+.B --thread=pthread
+Switch for the
+.B \-\-cflags
+and
+.B \-\-libs
+options for the thread-enabled \fIGPGME\fP version.
+.TP
+.B \-\-version
+Print the currently installed version of \fIGPGME\fP to standard output.
+
+.SH AUTHORS
+.PP
+This manual page page was written by \fBJose Carlos Garcia Sogo\fR
+\&<\&jsogo at debian.org\&> and \fBDaniel Leidert\fR <\&daniel.leidert at wgdd.de\&>
+for the Debian distribution (but may be used by others).
Modified: gpgme/trunk/debian/libgpgme11-dev.doc-base
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/libgpgme11-dev.doc-base?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/libgpgme11-dev.doc-base (original)
+++ gpgme/trunk/debian/libgpgme11-dev.doc-base Sun Jul 8 17:01:42 2012
@@ -5,7 +5,7 @@
.
This package contains the headers and other files needed to compile
against this library.
-Section: Apps/programming
+Section: Programming/C
Format: info
Index: /usr/share/info/gpgme.info.gz
Copied: gpgme/trunk/debian/libgpgme11-dev.install (from r272, gpgme/trunk/debian/libgpgme11-dev.files)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/libgpgme11-dev.install?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/libgpgme11-dev.files (original)
+++ gpgme/trunk/debian/libgpgme11-dev.install Sun Jul 8 17:01:42 2012
@@ -1,7 +1,7 @@
-usr/include/*
+usr/include/
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/*.la
usr/bin/gpgme-config
-usr/share/aclocal/*
-usr/share/info/*
+usr/share/aclocal/
+usr/share/info/*info*
Modified: gpgme/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/rules?rev=275&op=diff
==============================================================================
--- gpgme/trunk/debian/rules (original)
+++ gpgme/trunk/debian/rules Sun Jul 8 17:01:42 2012
@@ -1,106 +1,31 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=3
+export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-# C compiler information
-CC = gcc
-CFLAGS = -Wall -g
+%:
+ dh $@ --with autotools-dev --parallel
-INSTALL = install
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --enable-static \
+ --disable-fd-passing \
+ --infodir=/usr/share/info \
+ --with-gpg=/usr/bin/gpg \
+ --with-gpgsm=/usr/bin/gpgsm
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL += -s
-endif
+override_dh_install:
+ dh_install --list-missing -X.la -Xinfo/dir
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_installdocs:
+ dh_installdocs -A
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
+override_dh_makeshlibs:
+ dh_makeshlibs -V
-version=`ls gpgme/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls gpgme/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-include /usr/share/dpatch/dpatch.make
-PACKAGE=gpgme1.0
-
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
-
- ./configure $(confflags) \
- --enable-static \
- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --with-gpg=/usr/bin/gpg \
- --with-gpgsm=/usr/bin/gpgsm
-
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- rm -f tests/gpg/*.gpg
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
-
-binary-indep: build
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_movefiles
-
- dh_installdocs
- dh_installman
- dh_installinfo
- dh_installchangelogs src/ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs -V 'libgpgme11 (>= 1.1.8)'
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_clean:
+ dh_clean tests/gpg/*.gpg
Added: gpgme/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/source/format?rev=275&op=file
==============================================================================
--- gpgme/trunk/debian/source/format (added)
+++ gpgme/trunk/debian/source/format Sun Jul 8 17:01:42 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
Added: gpgme/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpgme/trunk/debian/watch?rev=275&op=file
==============================================================================
--- gpgme/trunk/debian/watch (added)
+++ gpgme/trunk/debian/watch Sun Jul 8 17:01:42 2012
@@ -1,0 +1,2 @@
+version=3
+opts=pasv ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-([\d.]+)\.tar\.bz2
More information about the Pkg-gnupg-commit
mailing list