[Pkg-gnupg-commit] r336 - in /libgpg-error/trunk/debian: ./ patches/
dleidert at users.alioth.debian.org
dleidert at users.alioth.debian.org
Sat May 18 15:44:18 UTC 2013
Author: dleidert
Date: Sat May 18 15:44:17 2013
New Revision: 336
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=336
Log:
* debian/clean, debian/*.dirs: Removed unused file.
* debian/control: Added Vcs-Browser and Vcs-Svn.
(Standards-Version): Bumped to 3.9.4.
(Build-Depends): Added versioned autotools-dev (closes: #689621).
* debian/copyright: Updated.
* debian/docs, debian/libgpg-error0.docs: Removed. Installed files via
debian/rules.
* debian/libgpg-error0.install.in: Renamed to debian/libgpg-error0.install
and dropped sed stuff.
* debian/libgpg-error-dev.links.in: Put into debian/rules.
* debian/rules: Rewritten for dh 7+. Enabled hardening.
* debian/watch: Minor update.
* debian/patches/: Removed patches and dpatch leftovers (closes: #689604).
* debian/patches/l10n_update.patch: Dropped (shipped with new release).
* debian/patches/series: Emptied.
Added:
libgpg-error/trunk/debian/libgpg-error0.install
- copied, changed from r334, libgpg-error/trunk/debian/libgpg-error0.install.in
Removed:
libgpg-error/trunk/debian/clean
libgpg-error/trunk/debian/docs
libgpg-error/trunk/debian/libgpg-error-dev.dirs
libgpg-error/trunk/debian/libgpg-error-dev.links.in
libgpg-error/trunk/debian/libgpg-error0.dirs
libgpg-error/trunk/debian/libgpg-error0.docs
libgpg-error/trunk/debian/libgpg-error0.install.in
libgpg-error/trunk/debian/patches/00list
libgpg-error/trunk/debian/patches/05_Makefile.am.dpatch
libgpg-error/trunk/debian/patches/06_Makefile.in.dpatch
libgpg-error/trunk/debian/patches/10_relibtoolize.dpatch
libgpg-error/trunk/debian/patches/l10n_update.patch
libgpg-error/trunk/debian/patches/m4_macros.dpatch
Modified:
libgpg-error/trunk/debian/changelog
libgpg-error/trunk/debian/control
libgpg-error/trunk/debian/copyright
libgpg-error/trunk/debian/patches/series
libgpg-error/trunk/debian/rules
libgpg-error/trunk/debian/watch
Modified: libgpg-error/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/changelog?rev=336&op=diff
==============================================================================
--- libgpg-error/trunk/debian/changelog (original)
+++ libgpg-error/trunk/debian/changelog Sat May 18 15:44:17 2013
@@ -2,6 +2,21 @@
* Non-maintainer upload.
* New upstream release.
+ * debian/clean, debian/*.dirs: Removed unused file.
+ * debian/control: Added Vcs-Browser and Vcs-Svn.
+ (Standards-Version): Bumped to 3.9.4.
+ (Build-Depends): Added versioned autotools-dev (closes: #689621).
+ * debian/copyright: Updated.
+ * debian/docs, debian/libgpg-error0.docs: Removed. Installed files via
+ debian/rules.
+ * debian/libgpg-error0.install.in: Renamed to debian/libgpg-error0.install
+ and dropped sed stuff.
+ * debian/libgpg-error-dev.links.in: Put into debian/rules.
+ * debian/rules: Rewritten for dh 7+. Enabled hardening.
+ * debian/watch: Minor update.
+ * debian/patches/: Removed patches and dpatch leftovers (closes: #689604).
+ * debian/patches/l10n_update.patch: Dropped (shipped with new release).
+ * debian/patches/series: Emptied.
-- Daniel Leidert <dleidert at debian.org> Sat, 18 May 2013 16:14:09 +0200
Modified: libgpg-error/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/control?rev=336&op=diff
==============================================================================
--- libgpg-error/trunk/debian/control (original)
+++ libgpg-error/trunk/debian/control Sat May 18 15:44:17 2013
@@ -3,28 +3,30 @@
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
Uploaders: Matthias Urlichs <smurf at debian.org>
Priority: standard
-Build-Depends: debhelper (>= 8.1.3)
-Standards-Version: 3.9.1
+Build-Depends: autotools-dev (>> 20120210.1~), debhelper (>> 8.1.3~)
+Standards-Version: 3.9.4
Homepage: http://www.gnupg.org/related_software/libgpg-error/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/libgpg-error/trunk/
Package: libgpg-error-dev
Priority: optional
Section: libdevel
Architecture: any
-Depends: libgpg-error0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgpg-error0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: library for common error values and messages in GnuPG components (development)
Library that defines common error values for all GnuPG
components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
pinentry, SmartCard Daemon and possibly more in the future.
.
- 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: libgpg-error0
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: library for common error values and messages in GnuPG components
Library that defines common error values for all GnuPG
components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
@@ -35,9 +37,8 @@
Section: debian-installer
Package-Type: udeb
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for common error values and messages in GnuPG components
Library that defines common error values for all GnuPG
components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
pinentry, SmartCard Daemon and possibly more in the future.
-
Modified: libgpg-error/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/copyright?rev=336&op=diff
==============================================================================
--- libgpg-error/trunk/debian/copyright (original)
+++ libgpg-error/trunk/debian/copyright Sat May 18 15:44:17 2013
@@ -1,13 +1,13 @@
This package was debianized by Jose Carlos Garcia Sogo <jsogo at debian.org> on
Mon, 23 Jun 2003 15:43:18 +0200.
-It was downloaded from ftp://ftp.gnupg.org/GnuPG/libgpg-error
+It was downloaded from ftp://ftp.gnupg.org/gcrypt/libgpg-error/
Upstream Author:
g10 Code GmbH <code at g10code.com>
-
-Copyright: 2003 - 2006 g10 Code GmbH
-
+
+Copyright: 2001-2004, 2010, 2012, 2013 g10 Code GmbH
+
Copyright statement:
This program is free software; you can redistribute it and/or modify
Copied: libgpg-error/trunk/debian/libgpg-error0.install (from r334, libgpg-error/trunk/debian/libgpg-error0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/libgpg-error0.install?rev=336&op=diff
==============================================================================
--- libgpg-error/trunk/debian/libgpg-error0.install.in (original)
+++ libgpg-error/trunk/debian/libgpg-error0.install Sat May 18 15:44:17 2013
@@ -1,2 +1,2 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libgpg-error.so.* lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libgpg-error.so.*
usr/share/locale
Modified: libgpg-error/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/patches/series?rev=336&op=diff
==============================================================================
--- libgpg-error/trunk/debian/patches/series (original)
+++ libgpg-error/trunk/debian/patches/series Sat May 18 15:44:17 2013
@@ -1,1 +1,0 @@
-l10n_update.patch
Modified: libgpg-error/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/rules?rev=336&op=diff
==============================================================================
--- libgpg-error/trunk/debian/rules (original)
+++ libgpg-error/trunk/debian/rules Sat May 18 15:44:17 2013
@@ -1,117 +1,37 @@
#!/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
-# C compiler information
-CC = gcc
-CFLAGS = -Wall -g
+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)
-INSTALL = install
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL += -s
-endif
-
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-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
-
+%:
+ dh $@ --with autotools-dev --parallel
-#version=`ls libgpg-error/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls libgpg-error/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --enable-static \
+ --disable-rpath \
+ --infodir=\$${prefix}/share/info \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-configure: configure-stamp
-configure-stamp:
- dh_testdir
+override_dh_link:
+ dh_link
+ dh_link -plibgpg-error-dev usr/lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so.0 \
+ usr/lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so
- ./configure $(confflags) --enable-maintainer-mode \
- --enable-static \
- --prefix=/usr --mandir=\$${prefix}/share/man \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --infodir=\$${prefix}/share/info
-
- touch configure-stamp
+override_dh_install:
+ dh_install --list-missing
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
+override_dh_installchangelogs:
+ dh_installchangelogs -A NEWS
- $(MAKE)
+override_dh_installdocs:
+ dh_installdocs -A README
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
-
-# -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
-# -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
-# -if test -f ltmain.sh ; then touch ltmain.sh; else libtoolize -c; fi
-# -if test -f aclocal.m4 ; then touch aclocal.m4; else aclocal-1.8 -I m4 ; fi
-# -if test -f config.h.in ; then touch config.h.in; else autoheader2.50; fi
-# -if test -f Makefile.in ; then find . -name Makefile.in -exec touch {} \; ;\
-# else automake-1.8 --copy --add-missing; fi
-# -if test -f configure ; then touch configure; else autoconf2.50; fi
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean build-stamp configure-stamp install-stamp
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_prep
- set -e; for file in libgpg-error0.install libgpg-error-dev.links; \
- do \
- sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
- debian/$${file}.in > debian/$$file; \
- done
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
-
- touch install-stamp
-
-binary-indep: build
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install --sourcedir=debian/tmp
-
- dh_installdocs
- dh_installman
- dh_installinfo
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
+override_dh_makeshlibs:
dh_makeshlibs -V --add-udeb=libgpg-error0-udeb
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: configure build clean install binary-indep binary-arch binary
Modified: libgpg-error/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/watch?rev=336&op=diff
==============================================================================
--- libgpg-error/trunk/debian/watch (original)
+++ libgpg-error/trunk/debian/watch Sat May 18 15:44:17 2013
@@ -1,4 +1,2 @@
version=3
-#ftp.gnupg.org fails using active FTP
-opts="passive" ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-(.+)\.tar\.gz debian uupdate
-
+opts=pasv ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-([\d.]+)\.tar\.(?:bz2|gz)
More information about the Pkg-gnupg-commit
mailing list