[Pkg-gnutls-commits] CVS gnutls7
Ivo Timmermans
ivo@quantz.debian.org
Mon, 27 Oct 2003 20:36:48 +0100
Update of /cvsroot/pkg-gnutls/gnutls7
In directory quantz:/tmp/cvs-serv2192
Modified Files:
changelog control libgnutls-doc.doc-base
libgnutls-doc.examples rules
Added Files:
gnutls-bin.install gnutls-bin.manpages gnutls-cli-debug.1
gnutls-cli.1 gnutls-serv.1 gnutls-srpcrypt.1
libgnutls7-dev.install libgnutls7.install
Removed Files:
gnutls-bin.files libgnutls-doc.docs libgnutls7-dev.files
libgnutls7.docs libgnutls7.files
Log Message:
* debian/rules:
* Rewritten to use CDBS, and its simple-patchsystem.mk.
* Build HTML documentation again.
* debian/control: Added cdbs to build dependencies.
* debian/libgnutls-doc.docs, debian/libgnutls7.docs: Removed.
* debian/*.files: Renamed to *.install, contents changed to properly
support dh_install.
* debian/libgnutls-doc.doc-base: Added index to HTML documentation.
* debian/libgnutls-doc.manpages; debian/*.1: Added simple manpages for
the programs in the gnutls-bin package. (Closes: #213758)
* debian/patches/001_library.tex.diff: Fix "it's" -> "its" in the
manual. (Closes: #197475)
* debian/patches/{002,003,004}*.diff: Patches from the previous versions
of the Debian package.
* debian/patches/005_versioned_symbols.diff: Make public symbols
versioned. This is a backport of the upstream changes for 0.9.9x,
using version "GNUTLS_0_8".
* debian/patches/006_gnutls-cli_fatal_errors.diff: Handle non-fatal
errors after handshake phase. This is a backport of the upstream
changes for 0.9.9x. (Closes: #210358)
--- /cvsroot/pkg-gnutls/gnutls7/changelog 2003/10/20 17:59:18 1.1.1.1
+++ /cvsroot/pkg-gnutls/gnutls7/changelog 2003/10/27 19:36:48 1.2
@@ -1,3 +1,31 @@
+gnutls7 (0.8.12-1) experimental; urgency=low
+
+ * New upstream version:
+ * Handles non-unix newline characters in X.509 certificates.
+ (Closes: #202454)
+ * debian/rules:
+ * Rewritten to use CDBS, and its simple-patchsystem.mk.
+ * Build HTML documentation again.
+ * debian/control: Added cdbs to build dependencies.
+ * debian/libgnutls-doc.docs, debian/libgnutls7.docs: Removed.
+ * debian/*.files: Renamed to *.install, contents changed to properly
+ support dh_install.
+ * debian/libgnutls-doc.doc-base: Added index to HTML documentation.
+ * debian/libgnutls-doc.manpages; debian/*.1: Added simple manpages for
+ the programs in the gnutls-bin package. (Closes: #213758)
+ * debian/patches/001_library.tex.diff: Fix "it's" -> "its" in the
+ manual. (Closes: #197475)
+ * debian/patches/{002,003,004}*.diff: Patches from the previous versions
+ of the Debian package.
+ * debian/patches/005_versioned_symbols.diff: Make public symbols
+ versioned. This is a backport of the upstream changes for 0.9.9x,
+ using version "GNUTLS_0_8".
+ * debian/patches/006_gnutls-cli_fatal_errors.diff: Handle non-fatal
+ errors after handshake phase. This is a backport of the upstream
+ changes for 0.9.9x. (Closes: #210358)
+
+ -- Ivo Timmermans <ivo@debian.org> Mon, 27 Oct 2003 20:29:38 +0100
+
gnutls7 (0.8.9-2) unstable; urgency=high
* debian/control: Added Build-Conflicts for libgnutls-dev.
--- /cvsroot/pkg-gnutls/gnutls7/control 2003/10/20 17:59:17 1.1.1.1
+++ /cvsroot/pkg-gnutls/gnutls7/control 2003/10/27 19:36:48 1.2
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Ivo Timmermans <ivo@debian.org>
Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>> 3.0.0), libgcrypt-dev (>= 1.1.12-0), zlib1g-dev, libtasn1-dev, libopencdk-dev (>= 0.4.0-1), liblzo-dev
+Build-Depends: debhelper (>= 4), libgcrypt-dev (>= 1.1.12-0), zlib1g-dev, libtasn1-dev, libopencdk8-dev, liblzo-dev, cdbs, automake1.7, autoconf, libtool
+Build-Depends-Indep: tetex-bin, latex2html, tetex-extra, automake1.7, autoconf, libtool
Build-Conflicts: libgnutls-dev
Standards-Version: 3.5.10
--- /cvsroot/pkg-gnutls/gnutls7/libgnutls-doc.doc-base 2003/10/20 17:59:17 1.1.1.1
+++ /cvsroot/pkg-gnutls/gnutls7/libgnutls-doc.doc-base 2003/10/27 19:36:48 1.2
@@ -5,3 +5,7 @@
Format: PostScript
Files: /usr/share/doc/libgnutls-doc/gnutls.ps.gz
+
+Format: HTML
+Files: /usr/share/doc/libgnutls-doc/html/
+Index: /usr/share/doc/libgnutls-doc/html/index.html
--- /cvsroot/pkg-gnutls/gnutls7/libgnutls-doc.examples 2003/10/20 17:59:17 1.1.1.1
+++ /cvsroot/pkg-gnutls/gnutls7/libgnutls-doc.examples 2003/10/27 19:36:48 1.2
@@ -1,12 +1,12 @@
-src/cli-gaa.c
-src/cli.c
-src/common.c
-src/crypt-gaa.c
-src/crypt.c
-src/prime-gaa.c
-src/prime.c
-src/serv-gaa.c
-src/serv.c
-src/tests.c
-src/tls_test-gaa.c
-src/tls_test.c
+build-tree/gnutls-0.8.12/src/cli-gaa.c
+build-tree/gnutls-0.8.12/src/cli.c
+build-tree/gnutls-0.8.12/src/common.c
+build-tree/gnutls-0.8.12/src/crypt-gaa.c
+build-tree/gnutls-0.8.12/src/crypt.c
+build-tree/gnutls-0.8.12/src/prime-gaa.c
+build-tree/gnutls-0.8.12/src/prime.c
+build-tree/gnutls-0.8.12/src/serv-gaa.c
+build-tree/gnutls-0.8.12/src/serv.c
+build-tree/gnutls-0.8.12/src/tests.c
+build-tree/gnutls-0.8.12/src/tls_test-gaa.c
+build-tree/gnutls-0.8.12/src/tls_test.c
--- /cvsroot/pkg-gnutls/gnutls7/rules 2003/10/20 17:59:17 1.1.1.1
+++ /cvsroot/pkg-gnutls/gnutls7/rules 2003/10/27 19:36:48 1.2
@@ -1,151 +1,29 @@
-#!/usr/bin/make -f
+#! /usr/bin/make -f
# Build the gnutls package for Debian.
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-
-# configure parameters
-confflags += --enable-shared=yes --enable-static=yes
-
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-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
-
-
-# compilation tweakings
-export DEB_BUILD_OPTIONS
-
-CFLAGS ?= -g -Wall
-LDFLAGS ?= -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-endif
-
-STRIP ?= yes
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- STRIP = no
-endif
-
ifeq ($(DEB_BUILD_ARCH),hppa)
CFLAGS += -fno-gcse
endif
+DEB_TAR_SRCDIR = gnutls-0.8.12
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/tarball.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no
+
+build/libgnutls-doc::
+ cd $(DEB_SRCDIR)/doc/tex && $(MAKE) gnutls.ps gnutls.html
+
+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/
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --with-mcrypt=no \
- $(confflags)
-
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-maintainerclean: clean
- # Requires libtool 1.4.2-7.1 or later because of interlibrary
- # dependencies.
- dpkg --compare-versions `dpkg -l libtool | awk '$$2=="libtool" {print $$3} // {}'` ge 1.4.2-7.1
-
- libtoolize --force --copy
- aclocal-1.7
- autoheader
- automake-1.7
- autoconf
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-# install -m 755 -o root -g root -d debian/tmp/usr/lib/gnutls
-# for i in serv cli crypt prime asn1c CertificateExample CrlExample ; do \
-# install -m 755 -o root -g root src/.libs/$$i debian/tmp/usr/lib/gnutls/$$i ;\
-# done
-
-# Build architecture-independent files here.
-binary-indep:
- dh_testdir
- dh_testroot
-
- dh_installdocs -i
- install -m 755 -o root -g root -d debian/libgnutls-doc/usr/share/doc/libgnutls-doc/
- install -m 644 -o root -g root doc/tex/gnutls.ps debian/libgnutls-doc/usr/share/doc/libgnutls-doc/
-# install -m 644 -o root -g root doc/tex/gnutls.html debian/gnutls-doc/usr/share/doc/gnutls-doc/
-# install -m 644 -o root -g root doc/tex/gnutls.css debian/gnutls-doc/usr/share/doc/gnutls-doc/
-
- dh_installexamples -i
-
- rm -f debian/libgnutls-doc/usr/share/doc/libgnutls-doc/examples/srp/Makefile*
- rm -f debian/libgnutls-doc/usr/share/doc/libgnutls-doc/examples/x509/Makefile*
-
- dh_installman
- dh_installinfo
- dh_installchangelogs -i ChangeLog
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_movefiles -a
-
-# mkdir -p $(CURDIR)/debian/libgnutls7-dev/usr/share/doc
-# rm -rf $(CURDIR)/debian/libgnutls7-dev/usr/share/doc/libgnutls7-dev
-# ln -s libgnutls7 $(CURDIR)/debian/libgnutls7-dev/usr/share/doc/libgnutls7-dev
-
- dh_installdocs -a
- dh_installmenu -a
- dh_installman -a
- dh_installinfo -a
-# dh_undocumented
- dh_installchangelogs -a ChangeLog
- dh_link -a
- if test "$(STRIP)" = "yes" ; then \
- dh_strip -a ;\
- fi
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+pre-build::
+ cd $(DEB_SRCDIR) && libtoolize --force --copy && aclocal && autoheader && automake --force --copy && autoconf
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure