[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.15+dfsg-2-12-g00a56ed

[Julian Taylor]

The following commit has been merged in the master branch:
commit d2e6eea88d7b2fc0dd7e21b42c65a3fab8903245
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Jun 21 18:43:29 2011 +0200

    split out -doc package

diff --git a/debian/control b/debian/control
index 8fae597..eb34f0b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,23 @@ Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/keepass2.git;a=summa
 Package: keepass2
 Architecture: all
 Depends: ${cli:Depends}, ${misc:Depends}
+Suggests: xdotool, keepass2-doc
+Description: Password manager
+ KeePass is a easy-to-use password manager for Windows, Linux, Mac OS X and
+ mobile devices. You can store your passwords in highly-encrypted databases,
+ which can only be unlocked with one master password and/or a key file.
+ A database consists of only one file that can be transferred from one computer
+ to another easily.
+ KeePass can import data from various file formats. The password list can be
+ exported to various formats, including TXT, HTML, XML and CSV files.
+
+Package: keepass2-doc
+Architecture: all
+Section: doc
+Depends: ${cli:Depends}, ${misc:Depends}
 Suggests: xdotool
+Replaces: keepass2 (<< 2.15+dfsg-3)
+Breaks: keepass2 (<< 2.15+dfsg-3)
 Description: Password manager
  KeePass is a easy-to-use password manager for Windows, Linux, Mac OS X and
  mobile devices. You can store your passwords in highly-encrypted databases,
@@ -28,3 +44,5 @@ Description: Password manager
  to another easily.
  KeePass can import data from various file formats. The password list can be
  exported to various formats, including TXT, HTML, XML and CSV files.
+ .
+ This package contains the documentation.
diff --git a/debian/keepass2.doc-base b/debian/keepass2-doc.doc-base
similarity index 100%
rename from debian/keepass2.doc-base
rename to debian/keepass2-doc.doc-base
diff --git a/debian/keepass2.docs b/debian/keepass2-doc.docs
similarity index 100%
rename from debian/keepass2.docs
rename to debian/keepass2-doc.docs
diff --git a/debian/rules b/debian/rules
index 6bd571d..fa0b07a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,8 @@ override_dh_installchangelogs:
 
 override_dh_installdocs:
 	# skip signing key readme
-	dh_installdocs -XReadMe_PFX.txt
+	dh_installdocs -pkeepass2 -XReadMe_PFX.txt
+	dh_installdocs -pkeepass2-doc -XReadMe_PFX.txt --link-doc=keepass2
 
 override_dh_clideps:
 	dh_clideps --exclude-moduleref=KeePassLibC32.dll --exclude-moduleref=KeePassLibC64.dll\

-- 
keepass2