[Pkg-gnupg-commit] r81 - in /gnupg/branches/experimental/debian: changelog gnupg.examples gnupg.manpages gpg-convert-from-106.1 rules

[thijs at users.alioth.debian.org]

Author: thijs
Date: Mon Jul 28 17:16:49 2008
New Revision: 81

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=81
Log:
No longer install gpg-convert-from-106 in the path, but ship
this script to convert from GnuPG 1.0.6 and earlier as an
example.

Added:
    gnupg/branches/experimental/debian/gnupg.examples
Removed:
    gnupg/branches/experimental/debian/gpg-convert-from-106.1
Modified:
    gnupg/branches/experimental/debian/changelog
    gnupg/branches/experimental/debian/gnupg.manpages
    gnupg/branches/experimental/debian/rules

Modified: gnupg/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/changelog?rev=81&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/changelog (original)
+++ gnupg/branches/experimental/debian/changelog Mon Jul 28 17:16:49 2008
@@ -16,8 +16,11 @@
   * We don't install setuid root anymore, and have not even built
     with capability support anyway in recent times. Drop libcap-dev
     build-dependency and associated patches. (Closes: #492622).
-
- -- Thijs Kinkhorst <thijs at debian.org>  Mon, 28 Jul 2008 18:40:51 +0200
+  * No longer install gpg-convert-from-106 in the path, but ship
+    this script to convert from GnuPG 1.0.6 and earlier as an
+    example.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 28 Jul 2008 19:08:19 +0200
 
 gnupg (1.4.9-3) unstable; urgency=low
 

Added: gnupg/branches/experimental/debian/gnupg.examples
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg.examples?rev=81&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gnupg.examples (added)
+++ gnupg/branches/experimental/debian/gnupg.examples Mon Jul 28 17:16:49 2008
@@ -1,0 +1,1 @@
+tools/convert-from-106

Modified: gnupg/branches/experimental/debian/gnupg.manpages
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg.manpages?rev=81&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/gnupg.manpages (original)
+++ gnupg/branches/experimental/debian/gnupg.manpages Mon Jul 28 17:16:49 2008
@@ -1,4 +1,3 @@
-debian/gpg-convert-from-106.1
 debian/gpgsplit.1
 debian/lspgpot.1
 debian/gpg-zip.1

Modified: gnupg/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/rules?rev=81&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/rules (original)
+++ gnupg/branches/experimental/debian/rules Mon Jul 28 17:16:49 2008
@@ -72,14 +72,12 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) -C build-deb install DESTDIR=$(CURDIR)/debian/gnupg
-	# rm debian/tmp/usr/share/info/*
 	: # Move localized manpages to FHS compliant locations
 	mv debian/gnupg/usr/share/man/man1/gpg.ru.1 debian/gnupg/usr/share/man/ru/man1/gpg.1
 	: # Remove from /usr/share/gnupg what we install into /usr/share/doc/gnupg/
 	rm -f debian/gnupg/usr/share/gnupg/FAQ \
 	      debian/gnupg/usr/share/gnupg/faq.html
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/gnupg/usr/bin/lspgpot
-	sed -e "s#../g10/gpg#gpg#" < tools/convert-from-106 > debian/gnupg/usr/bin/gpg-convert-from-106
 	sed -e "s#/usr/local/#/usr/#" -i debian/gnupg/usr/share/man/man1/gpg.1
 	find debian/gnupg/ -type d -empty | xargs rmdir
 
@@ -96,6 +94,7 @@
 	done
 	install -m 644 ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.toplevel
 	dh_installdocs
+	dh_installexamples
 	dh_install -pgnupg-udeb -pgpgv-udeb --sourcedir=build-udeb/g10
 	dh_movefiles -pgpgv --sourcedir=debian/gnupg
 	dh_movefiles -pgpgv-udeb --sourcedir=debian/gnupg-udeb