[Pkg-gnutls-commits] r294 - in /packages/gnutls13/trunk/debian: ./ patches/

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sat Apr 14 07:48:55 UTC 2007 

Author: ametzler
Date: Sat Apr 14 07:48:54 2007
New Revision: 294

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

Added:
    packages/gnutls13/trunk/debian/libgnutlsxx13.install
      - copied unchanged from r293, packages/gnutls13/branches/branch1.5.x.EXP/debian/libgnutlsxx13.install
    packages/gnutls13/trunk/debian/patches/14_version_gettextcat.diff
      - copied unchanged from r293, packages/gnutls13/branches/branch1.5.x.EXP/debian/patches/14_version_gettextcat.diff
Removed:
    packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls-extra.diff
    packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls.diff
Modified:
    packages/gnutls13/trunk/debian/changelog
    packages/gnutls13/trunk/debian/compat
    packages/gnutls13/trunk/debian/control
    packages/gnutls13/trunk/debian/gnutls-bin.install
    packages/gnutls13/trunk/debian/libgnutls-dev.install
    packages/gnutls13/trunk/debian/libgnutls13.install
    packages/gnutls13/trunk/debian/rules
    packages/gnutls13/trunk/debian/watch

Modified: packages/gnutls13/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/changelog?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/changelog (original)
+++ packages/gnutls13/trunk/debian/changelog Sat Apr 14 07:48:54 2007
@@ -1,8 +1,59 @@
-gnutls13 (1.4.4-4) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sat, 11 Nov 2006 16:39:44 +0100
+gnutls13 (1.6.1-2) UNRELEASED; urgency=low
+
+  * UNRELEASED
+  * [gnutls-bin.install] Ship psktool.
+  * Ship gettext translations in deb package, but as gnutls13.mo instead of
+    gnutls.mo.
+  * Upload to unstable. Merge branch1.5.x.EXP to svn trunk. Include 1.4.4-*
+    changelog entries after branchoff.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat,  3 Feb 2007 13:49:48 +0100
+
+gnutls13 (1.6.1-1) experimental; urgency=low
+
+  [ James Westby ]
+  * New upstream release.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat,  3 Feb 2007 13:18:03 +0100
+
+gnutls13 (1.6.0-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 18 Nov 2006 13:21:56 +0100
+
+gnutls13 (1.5.3-1) experimental; urgency=low
+
+  [ Andreas Metzler ]
+  * Fix debian/copyright.
+    - Do not use "copyright" as title of a paragraph listing licenses.
+      (Closes: #290194)
+    - Add a copy of the FDL 1.2 to debian/copyright.
+  * New upstream version 1.5.3.
+  * Bump shlibs to get rid of reference to ugly 1.5.1.cvs2006093.
+  * Drop code for re-libtoolizing and running auto* from debian/rules, it is
+    unused and would not work anymore. (We can later grab the from SVN and
+    update it to make work if we ever need it.)
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 28 Oct 2006 12:56:46 +0200
+
+gnutls13 (1.5.1.cvs20060930-1) experimental; urgency=low
+
+  [ Andreas Metzler ]
+  * Add a watchfile.
+  * New upstream development version.
+    - Pulled from http://josefsson.org/daily/gnutls/gnutls-20060930.tar.gz
+    - Using a cvs snapshot instead of 1.5.1 because the soname in 1.5.1 was
+      broken.
+    - Drop unneeded patches/16_libs.private_gnutls.diff
+      patches/16_libs.private_gnutls-extra.diff
+    - Point watchfile to development versions.
+    - Builds a C++ library.
+  * Switch to debhelper v5 mode to be able to ship debug symbols of
+    libgnutls13 and libgnutlsxx13 in a common libgnutls13-dbg package.
+  * Branched off from 1.4.4-1.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 30 Sep 2006 09:54:38 +0200
 
 gnutls13 (1.4.4-3) unstable; urgency=low
 

Modified: packages/gnutls13/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/compat?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/compat (original)
+++ packages/gnutls13/trunk/debian/compat Sat Apr 14 07:48:54 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: packages/gnutls13/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/control?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/control (original)
+++ packages/gnutls13/trunk/debian/control Sat Apr 14 07:48: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 (>= 4.1), libgcrypt11-dev (>= 1.2.2), zlib1g-dev, libopencdk8-dev (>= 0.5.5-8), liblzo-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, libopencdk8-dev (>= 0.5.5-8), liblzo-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}), libgcrypt11-dev (>= 1.2.2), libc6-dev | libc-dev, zlib1g-dev, libtasn1-3-dev (>= 0.3.4), libopencdk8-dev, liblzo-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, liblzo-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
@@ -53,7 +53,7 @@
 Priority: extra
 Architecture: any
 Section: devel
-Depends: libgnutls13 (= ${Source-Version})
+Depends: libgnutls13 (= ${Source-Version}), libgnutlsxx13 (= ${Source-Version})
 Description: GNU TLS library - debugger symbols
  gnutls is a portable library which implements the Transport Layer
  Security (TLS) 1.0 and Secure Sockets Layer (SSL) 3.0 protocols.
@@ -91,3 +91,21 @@
  Security (TLS) 1.0 and Secure Sockets Layer (SSL) 3.0 protocols.
  .
  This package contains all the gnutls documentation.
+
+Package: libgnutlsxx13
+Priority: optional
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: the GNU TLS library - C++ runtime library
+ gnutls is a portable library which implements the Transport Layer
+ Security (TLS) 1.0 and Secure Sockets Layer (SSL) 3.0 protocols.
+ .
+ Currently gnutls implements:
+  - the TLS 1.0 and SSL 3.0 protocols, without any US-export
+    controlled algorithms
+  - X509 Public Key Infrastructure (with several limitations).
+  - SRP for TLS authentication.
+  - TLS Extension mechanism
+ .
+ This package contains the C++ runtime libraries.

Modified: packages/gnutls13/trunk/debian/gnutls-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/gnutls-bin.install?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/gnutls-bin.install (original)
+++ packages/gnutls13/trunk/debian/gnutls-bin.install Sat Apr 14 07:48:54 2007
@@ -1,3 +1,4 @@
 debian/tmp/usr/bin/gnutls-* usr/bin
 debian/tmp/usr/bin/certtool usr/bin
 debian/tmp/usr/bin/srptool usr/bin
+debian/tmp/usr/bin/psktool usr/bin

Modified: packages/gnutls13/trunk/debian/libgnutls-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/libgnutls-dev.install?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/libgnutls-dev.install (original)
+++ packages/gnutls13/trunk/debian/libgnutls-dev.install Sat Apr 14 07:48:54 2007
@@ -1,7 +1,8 @@
 debian/tmp/usr/include/* usr/include
 debian/tmp/usr/lib/lib*.so usr/lib
 debian/tmp/usr/lib/lib*.a usr/lib
-debian/tmp/usr/lib/lib*.la usr/lib
+debian/tmp/usr/lib/libgnutls.la usr/lib
+debian/tmp/usr/lib/libgnutls-*.la usr/lib
 debian/tmp/usr/share/aclocal/* usr/share/aclocal
 debian/tmp/usr/bin/libgnutls*config usr/bin
 debian/tmp/usr/lib/pkgconfig/gnutls.pc usr/lib/pkgconfig

Modified: packages/gnutls13/trunk/debian/libgnutls13.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/libgnutls13.install?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/libgnutls13.install (original)
+++ packages/gnutls13/trunk/debian/libgnutls13.install Sat Apr 14 07:48:54 2007
@@ -1,1 +1,3 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib
+debian/tmp/usr/lib/libgnutls.so.* usr/lib
+debian/tmp/usr/lib/libgnutls-*.so.* usr/lib
+debian/tmp/usr/share/locale/* /usr/share/locale

Modified: packages/gnutls13/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/rules?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/rules (original)
+++ packages/gnutls13/trunk/debian/rules Sat Apr 14 07:48:54 2007
@@ -11,8 +11,8 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script
 DEB_MAKE_CHECK_TARGET = check
-DEB_DH_STRIP_ARGS = --dbg-package=libgnutls13
-DEB_DH_MAKESHLIBS_ARGS_libgnutls13 := -V 'libgnutls13 (>=1.4.0-0)'
+DEB_DH_STRIP_ARGS = --dbg-package=libgnutls13-dbg
+DEB_DH_MAKESHLIBS_ARGS_libgnutls13 := -V 'libgnutls13 (>=1.5.3-0)'
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
 
 #build/libgnutls-doc::
@@ -22,13 +22,7 @@
 #
 #install/libgnutls-doc::
 #	$(DEB_MAKE_INVOKE) -C doc/tex $(DEB_MAKE_INSTALL_TARGET)
-#
-#binary-post-install/libgnutls-doc::
-#	install -o root -g root -m 755 $(DEB_SRCDIR)/doc/tex/gnutls.ps debian/libgnutls-doc/usr/share/doc/libgnutls-doc/
-#	# install -d -o root -g root -m 755 debian/libgnutls-doc/usr/share/doc/libgnutls-doc/html/
-#	# cp -a $(DEB_SRCDIR)/doc/tex/gnutls/gnutls.html debian/libgnutls-doc/usr/share/doc/libgnutls-doc/html/
-#	# cp -a $(DEB_SRCDIR)/doc/tex/gnutls/gnutls.css debian/libgnutls-doc/usr/share/doc/libgnutls-doc/html/
-#	# cp -a $(DEB_SRCDIR)/doc/tex/gnutls/*.png debian/libgnutls-doc/usr/share/doc/libgnutls-doc/html/
+
 
 post-patches::
 	cd $(DEB_SRCDIR) && chmod +x doc/scripts/sort2.pl doc/scripts/gdoc
@@ -36,26 +30,6 @@
 clean::
 	mkdir -p m4
 
-	if test -d gl ; then : ; else \
-	mkdir -p gl; \
-	gnulib-tool --import --source-base=gl --m4-base=gl/m4 \
-		--dir=. --lib=libgnu --aux-dir=. --libtool --macro-prefix=gl \
-		 gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 getline getpass inet_ntop memmem memmove minmax readline snprintf socklen ; \
-	fi
-
-	if test ! -f ABOUT-NLS; then gettextize -f -c --no-changelog; \
-		test ! -f Makefile.am~ || mv -f Makefile.am~ Makefile.am; \
-		test ! -f configure.in~ || mv -f configure.in~ configure.in; \
-		test -f libextra/gettext.h || cp /usr/share/gettext/gettext.h libextra/; \
-	fi
-	if test -f gtk-doc.make ; then touch gtk-doc.make; else gtkdocize --copy; fi
-	if test -f ltmain.sh ; then touch ltmain.sh; else libtoolize -c -f --automake ; fi
-	if test -f aclocal.m4 ; then touch aclocal.m4; else aclocal-1.9 -I m4 -I gl/m4 -I . ; 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.9 --copy --add-missing; fi
-
-	if test -f configure ; then touch configure; else autoconf2.50; fi
 	-rm -rf autom4te.cache
 
 	-rm -f tests/stamp-tests

Modified: packages/gnutls13/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/watch?rev=294&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/watch (original)
+++ packages/gnutls13/trunk/debian/watch Sat Apr 14 07:48: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