[Pkg-gnutls-commits] r1598 - /packages/gnutls26/trunk/debian/

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sun Nov 11 08:29:02 UTC 2012 

Author: ametzler
Date: Sun Nov 11 08:29:00 2012
New Revision: 1598

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1598
Log:
Fix documentation packaging. gnutls-doc is built from the GnuTLS 3.x
packages. Add a new gnutls26-doc package which drops manpages and info
format documentation in favour of being is co-installable with
gnutls-doc.

Added:
    packages/gnutls26/trunk/debian/gnutls26-doc.doc-base
      - copied, changed from r1597, packages/gnutls26/trunk/debian/gnutls-doc.doc-base
    packages/gnutls26/trunk/debian/gnutls26-doc.doc-base.apireference
      - copied, changed from r1597, packages/gnutls26/trunk/debian/gnutls-doc.doc-base.apireference
    packages/gnutls26/trunk/debian/gnutls26-doc.docs
      - copied unchanged from r1597, packages/gnutls26/trunk/debian/gnutls-doc.docs
    packages/gnutls26/trunk/debian/gnutls26-doc.examples
      - copied unchanged from r1597, packages/gnutls26/trunk/debian/gnutls-doc.examples
    packages/gnutls26/trunk/debian/gnutls26-doc.install
      - copied, changed from r1597, packages/gnutls26/trunk/debian/gnutls-doc.install
Removed:
    packages/gnutls26/trunk/debian/gnutls-doc.doc-base
    packages/gnutls26/trunk/debian/gnutls-doc.doc-base.apireference
    packages/gnutls26/trunk/debian/gnutls-doc.docs
    packages/gnutls26/trunk/debian/gnutls-doc.examples
    packages/gnutls26/trunk/debian/gnutls-doc.info
    packages/gnutls26/trunk/debian/gnutls-doc.install
    packages/gnutls26/trunk/debian/gnutls-doc.links
    packages/gnutls26/trunk/debian/gnutls-doc.manpages
Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/control
    packages/gnutls26/trunk/debian/rules

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1598&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sun Nov 11 08:29:00 2012
@@ -1,3 +1,12 @@
+gnutls26 (2.12.21-2) experimental; urgency=low
+
+  * Fix documentation packaging. gnutls-doc is built from the GnuTLS 3.x
+    packages. Add a new gnutls26-doc package which drops manpages and info
+    format documentation in favour of being is co-installable with
+    gnutls-doc.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 11 Nov 2012 09:23:27 +0100
+
 gnutls26 (2.12.21-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/gnutls26/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/control?rev=1598&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/control (original)
+++ packages/gnutls26/trunk/debian/control Sun Nov 11 08:29:00 2012
@@ -24,7 +24,7 @@
  libgnutlsxx27 (= ${binary:Version}),libgnutls-openssl27 (= ${binary:Version}),
  libgcrypt11-dev (>= 1.4.0), libc6-dev | libc-dev, zlib1g-dev,
  libtasn1-3-dev (>= 2.14), libp11-kit-dev (>= 0.4), ${misc:Depends}
-Suggests: gnutls-doc
+Suggests: gnutls26-doc
 Conflicts: gnutls-dev
 Replaces: gnutls-dev
 Description: GNU TLS library - development files
@@ -93,12 +93,12 @@
  .
  This package contains the debugger symbols and commandline utilities.
 
-Package: gnutls-doc
+Package: gnutls26-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
 Multi-Arch: foreign
-Description: GNU TLS library - documentation and examples
+Description: GNU TLS library 2.x - documentation and examples
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
  .
@@ -114,7 +114,7 @@
   - all the strong encryption algorithms (including SHA-256/384/512 and
     Camellia (RFC 4132)).
  .
- This package contains all the GnuTLS documentation.
+ This package contains the documentation for the GnuTLS 2.x legacy version.
 
 Package: libgnutlsxx27
 Priority: extra

Copied: packages/gnutls26/trunk/debian/gnutls26-doc.doc-base (from r1597, packages/gnutls26/trunk/debian/gnutls-doc.doc-base)
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/gnutls26-doc.doc-base?rev=1598&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/gnutls-doc.doc-base (original)
+++ packages/gnutls26/trunk/debian/gnutls26-doc.doc-base Sun Nov 11 08:29:00 2012
@@ -1,16 +1,12 @@
-Document: gnutls
-Title: GnuTLS Manual
+Document: gnutls26
+Title: GnuTLS 2.x Manual
 Author: Simon Josefsson
-Abstract: GnuTLS library manual
+Abstract: GnuTLS 2.x library manual
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/gnutls-doc/html/gnutls.html
-Files: /usr/share/doc/gnutls-doc/html/*
+Index: /usr/share/doc/gnutls26-doc/html/gnutls.html
+Files: /usr/share/doc/gnutls26-doc/html/*
 
 Format: PDF
-Files: /usr/share/doc/gnutls-doc/gnutls.pdf
-
-Format: info
-Index: /usr/share/info/gnutls.info.gz
-Files: /usr/share/info/gnutls.info*
+Files: /usr/share/doc/gnutls26-doc/gnutls.pdf

Copied: packages/gnutls26/trunk/debian/gnutls26-doc.doc-base.apireference (from r1597, packages/gnutls26/trunk/debian/gnutls-doc.doc-base.apireference)
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/gnutls26-doc.doc-base.apireference?rev=1598&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/gnutls-doc.doc-base.apireference (original)
+++ packages/gnutls26/trunk/debian/gnutls26-doc.doc-base.apireference Sun Nov 11 08:29:00 2012
@@ -1,9 +1,9 @@
-Document: gnutls-api
-Title: GNU TLS API Reference Manual
+Document: gnutls26-api
+Title: GnuTLS 2.x API Reference Manual
 Author: Simon Josefsson
 Abstract: GNU TLS API Reference Manual
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/gnutls-doc/api-reference/index.html
-Files: /usr/share/doc/gnutls-doc/api-reference/*
+Index: /usr/share/doc/gnutls26-doc/api-reference/index.html
+Files: /usr/share/doc/gnutls26-doc/api-reference/*

Copied: packages/gnutls26/trunk/debian/gnutls26-doc.install (from r1597, packages/gnutls26/trunk/debian/gnutls-doc.install)
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/gnutls26-doc.install?rev=1598&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/gnutls-doc.install (original)
+++ packages/gnutls26/trunk/debian/gnutls26-doc.install Sun Nov 11 08:29:00 2012
@@ -1,7 +1,6 @@
-doc/reference/html/*html usr/share/doc/gnutls-doc/api-reference
-doc/reference/html/*png usr/share/doc/gnutls-doc/api-reference
-doc/reference/html/*.css usr/share/doc/gnutls-doc/api-reference
-doc/reference/html/*.sgml usr/share/doc/gnutls-doc/api-reference
-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/reference/html/*html usr/share/doc/gnutls26-doc/api-reference
+doc/reference/html/*png usr/share/doc/gnutls26-doc/api-reference
+doc/reference/html/*.css usr/share/doc/gnutls26-doc/api-reference
+doc/reference/html/*.sgml usr/share/doc/gnutls26-doc/api-reference
+doc/*.html usr/share/doc/gnutls26-doc/html
+doc/*.png usr/share/doc/gnutls26-doc/html

Modified: packages/gnutls26/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/rules?rev=1598&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/rules (original)
+++ packages/gnutls26/trunk/debian/rules Sun Nov 11 08:29:00 2012
@@ -18,7 +18,7 @@
 
 # pre-clean rule: save gnutls.pdf since it is expensive to regenerate.
 # See README.source
-cleanbuilddir/gnutls-doc::
+cleanbuilddir/gnutls26-doc::
 	if [ -e doc/gnutls.pdf ] ; then mv doc/gnutls.pdf doc/gnutls.pdf.debbackup ; fi
 
 
@@ -35,20 +35,8 @@
 	if [ -e doc/gnutls.pdf.debbackup ] && [ ! -e doc/gnutls.pdf ] ; then mv doc/gnutls.pdf.debbackup doc/gnutls.pdf ; fi
 
 # additional comands for build rule
-build/gnutls-doc::
+build/gnutls26-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
 
 common-install-arch::
 	find debian/tmp/usr/lib/* -name '*.so.*.*' -type f -exec \

More information about the Pkg-gnutls-commits mailing list