[Pkg-gnutls-commits] r382 - in /packages/gnutls13/trunk/debian: README.source_and_patches changelog control gnutls-doc.install rules watch

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sat Aug 25 08:08:54 UTC 2007 

Author: ametzler
Date: Sat Aug 25 08:08:54 2007
New Revision: 382

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=382
Log:
Merge branch1.7.x.EXP to trunk

Modified:
    packages/gnutls13/trunk/debian/README.source_and_patches
    packages/gnutls13/trunk/debian/changelog
    packages/gnutls13/trunk/debian/control
    packages/gnutls13/trunk/debian/gnutls-doc.install
    packages/gnutls13/trunk/debian/rules
    packages/gnutls13/trunk/debian/watch

Modified: packages/gnutls13/trunk/debian/README.source_and_patches
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/README.source_and_patches?rev=382&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/README.source_and_patches (original)
+++ packages/gnutls13/trunk/debian/README.source_and_patches Sat Aug 25 08:08:54 2007
@@ -8,3 +8,12 @@
 to see the patched source.
 
 See cdbs-edit-patch for a useful way to make modifications.
+
+
+----------------------------------------
+Rebuilding PDF documentation:
+
+apt-get install texlive-latex-base texlive-fonts-recommended \
+  texlive-generic-recommended
+
+make pdf

Modified: packages/gnutls13/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/changelog?rev=382&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/changelog (original)
+++ packages/gnutls13/trunk/debian/changelog Sat Aug 25 08:08:54 2007
@@ -1,8 +1,63 @@
-gnutls13 (1.6.3-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sun, 27 May 2007 10:22:34 +0200
+gnutls13 (1.7.18-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 25 Aug 2007 09:27:18 +0200
+
+gnutls13 (1.7.18-1) experimental; urgency=low
+
+  * New upstream version 1.7.18, release candidate for 2.0.
+  * Bump shlibs, since functions have been added.
+  * Image files renamed upstream with gnutls- prefix and symlinked to
+    /usr/share/info/ in Debian package. Closes: #423577
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 18 Aug 2007 09:06:11 +0200
+
+gnutls13 (1.7.16-1) experimental; urgency=low
+
+  * New upstream version 1.7.16.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 11 Aug 2007 10:50:21 +0200
+
+gnutls13 (1.7.14-1) experimental; urgency=low
+
+  * New upstream version
+    - fixes crash in gnutls-cli when TLS handshake fails. Closes: #429183
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 30 Jun 2007 09:06:35 +0200
+
+gnutls13 (1.7.12-1) experimental; urgency=low
+
+  * New upstream version 1.7.12
+    - Fixes memory errors in certificate parsing. Closes: #333050
+  * Bump shlibs, due to API extensions in 1.7.10.
+  * Rebuilding of docs simpified, strip debian/README.source_and_patches to
+    reflect that.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 23 Jun 2007 11:14:26 +0200
+
+gnutls13 (1.7.9-1) experimental; urgency=low
+
+  * Switch to liblzo2. (Thanks, Peter Eisentraut) (Closes: #423332)
+  * New upstream version.
+    - Uses opencdk10 (0.6.x).
+    - Improved gnutls_set_default_priority() priorities, with matching correct
+      docs. (Closes: #422024)
+    - bumped shlibs.
+  * Do not delete doc/gnutls.pdf on clean, allowing to run dpkg-buildpackage
+    twice in a row on the same sourcetree. (Closes: #424357) Document what is
+    needed to rebuild doc/gnutls.pdf in README.source_and_patches.
+
+ -- Andreas Metzler <ametzler at debian.org>  Mon, 28 May 2007 08:36:42 +0200
+
+gnutls13 (1.7.7-1) experimental; urgency=low
+
+  * New development upstream version 1.7.7.
+    - Point watchfile to development versions.
+    - Bump shlibs for added APIs.
+    - Includes German translation. (Closes: #392857)
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 15 Apr 2007 10:11:21 +0200
 
 gnutls13 (1.6.3-1) unstable; urgency=low
 

Modified: packages/gnutls13/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/control?rev=382&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/control (original)
+++ packages/gnutls13/trunk/debian/control Sat Aug 25 08:08:54 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GnuTLS Maintainers <pkg-gnutls-maint at lists.alioth.debian.org>
 Uploaders: Andreas Metzler <ametzler at debian.org>, Eric Dorland <eric at debian.org>, James Westby <jw+debian at jameswestby.net>
-Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.2.2), zlib1g-dev, libopencdk8-dev (>= 0.5.5-8), liblzo2-dev, cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-1), autotools-dev
+Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.2.2), zlib1g-dev, libopencdk10-dev, liblzo2-dev, cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-1), autotools-dev
 Standards-Version: 3.7.2
 
 Package: libgnutls-dev
@@ -11,7 +11,7 @@
 Section: libdevel
 Architecture: any
 Provides: gnutls-dev
-Depends: libgnutls13 (= ${Source-Version}), libgnutlsxx13 (= ${Source-Version}), libgcrypt11-dev (>= 1.2.2), libc6-dev | libc-dev, zlib1g-dev, libtasn1-3-dev (>= 0.3.4), libopencdk8-dev, liblzo2-dev
+Depends: libgnutls13 (= ${Source-Version}), libgnutlsxx13 (= ${Source-Version}), libgcrypt11-dev (>= 1.2.2), libc6-dev | libc-dev, zlib1g-dev, libtasn1-3-dev (>= 0.3.4), libopencdk10-dev, liblzo2-dev
 Suggests: gnutls-doc, gnutls-bin
 Conflicts: libgnutls11-dev, gnutls-dev (<< 0.4.0-0), gnutls0.4-dev
 Replaces: libgnutls11-dev, gnutls-dev (<< 0.4.0-0), gnutls0.4-dev

Modified: packages/gnutls13/trunk/debian/gnutls-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/gnutls-doc.install?rev=382&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/gnutls-doc.install (original)
+++ packages/gnutls13/trunk/debian/gnutls-doc.install Sat Aug 25 08:08:54 2007
@@ -5,4 +5,3 @@
 doc/reference/html/*.devhelp* usr/share/doc/gnutls-doc/api-reference
 doc/*.html usr/share/doc/gnutls-doc/html
 doc/*.png usr/share/doc/gnutls-doc/html
-doc/arch/*.png usr/share/doc/gnutls-doc/html/arch

Modified: packages/gnutls13/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/rules?rev=382&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/rules (original)
+++ packages/gnutls13/trunk/debian/rules Sat Aug 25 08:08:54 2007
@@ -9,10 +9,10 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script
+DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script --disable-guile
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_STRIP_ARGS = --dbg-package=libgnutls13-dbg
-DEB_DH_MAKESHLIBS_ARGS_libgnutls13 := -V 'libgnutls13 (>=1.6.3-0)'
+DEB_DH_MAKESHLIBS_ARGS_libgnutls13 := -V 'libgnutls13 (>=1.7.17-0)'
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
 
 #build/libgnutls-doc::
@@ -27,6 +27,13 @@
 post-patches::
 	cd $(DEB_SRCDIR) && chmod +x doc/scripts/sort2.pl doc/scripts/gdoc
 
+# pre-clean rule: save gnutls.pdf since it is expensive to regenerate.
+# See README.source_and_patches
+cleanbuilddir/gnutls-doc::
+	if [ -e doc/gnutls.pdf ] ; then mv doc/gnutls.pdf doc/gnutls.pdf.debbackup ; fi
+
+
+# additional commands for clean
 clean::
 	mkdir -p m4
 
@@ -35,5 +42,22 @@
 	-rm -f tests/stamp-tests
 	# stupid conflicts
 	-rm -f libextra/lzoconf.h libextra/lzodefs.h
+	# restore gnutls.pdf
+	if [ -e doc/gnutls.pdf.debbackup ] && [ ! -e doc/gnutls.pdf ] ; then mv doc/gnutls.pdf.debbackup doc/gnutls.pdf ; fi
 
-	chmod +x install-sh
+# additional comands for build rule
+build/gnutls-doc::
+	$(MAKE) html
+
+# add post deb preparation (including debhelper stuff) actions
+# generate symlinks manually and use dh_link to make them policy-conform.
+binary-install/gnutls-doc::
+	cd debian/gnutls-doc && \
+	for i in usr/share/doc/gnutls-doc/html/gnutls*.png ; do \
+		i=`basename "$$i"` ; \
+		ln -s "/usr/share/doc/gnutls-doc/html/$$i" \
+			usr/share/info/ ; \
+	done && \
+	cd ../.. && \
+	dh_link -pgnutls-doc
+

Modified: packages/gnutls13/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/watch?rev=382&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/watch (original)
+++ packages/gnutls13/trunk/debian/watch Sat Aug 25 08:08:54 2007
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnupg.org/gcrypt/gnutls/gnutls-(.*)\.tar\.bz2 debian uupdate
+http://ftp.gnupg.org/gcrypt/alpha/gnutls/devel/gnutls-(.*)\.tar\.bz2 debian uupdate

More information about the Pkg-gnutls-commits mailing list