Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

3 files changed, 13 insertions, 8 deletions

diff --git a/ubuntu/precise/applications/keep/debian/control b/ubuntu/precise/applications/keep/debian/control
index f3213cd45..17e87e581 100644
--- a/ubuntu/precise/applications/keep/debian/control
+++ b/ubuntu/precise/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: keep-trinity
diff --git a/ubuntu/precise/applications/keep/debian/keep.xml b/ubuntu/precise/applications/keep/debian/keep.xml
index 0f07da7f0..0e97d35b3 100644
--- a/ubuntu/precise/applications/keep/debian/keep.xml
+++ b/ubuntu/precise/applications/keep/debian/keep.xml
@@ -24,7 +24,7 @@
   </refmeta>
   <refnamediv>
     <refname>keep</refname>
-    <refpurpose>backup system for KDE</refpurpose>
+    <refpurpose>backup system for TDE</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -33,14 +33,14 @@
         <option><replaceable>Qt-options</replaceable></option>
       </arg>
       <arg choice="opt">
-        <option><replaceable>KDE-options</replaceable></option>
+        <option><replaceable>TDE-options</replaceable></option>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      backup system for KDE.
+      backup system for TDE.
     </para>
     <para>
       The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
@@ -49,7 +49,7 @@
   <refsect1>
     <title>OPTIONS</title>
     <para>
-      All <productname>KDE</productname> and <productname>Qt</productname>
+      All <productname>TDE</productname> and <productname>Qt</productname>
       programs accept a some common command-line options. keep has no
       application-specific options.
     </para>
@@ -65,8 +65,8 @@
           <listitem> <para>Show Qt specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
-          <term> <option>--help-kde</option> </term>
-          <listitem> <para>Show KDE specific options</para> </listitem>
+          <term> <option>--help-tde</option> </term>
+          <listitem> <para>Show TDE specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
           <term> <option>--help-all</option> </term>
diff --git a/ubuntu/precise/applications/keep/debian/rules b/ubuntu/precise/applications/keep/debian/rules
index 1b5054df6..c08262790 100755
--- a/ubuntu/precise/applications/keep/debian/rules
+++ b/ubuntu/precise/applications/keep/debian/rules
@@ -31,8 +31,13 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-build/keep::
+build/keep-trinity::
 	/usr/bin/docbook2x-man debian/keep.xml
 
+install/keep-trinity::
+	dh_installman keep.1
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
 clean::
+	rm -f debian/stamp-bootstrap
 	rm -f keep.1