rev 13696 - branches/kde4.2/packages/kdesdk/debian

[Modestas Vainius]

Author: modax-guest
Date: 2009-02-01 16:49:02 +0000 (Sun, 01 Feb 2009)
New Revision: 13696

Modified:
   branches/kde4.2/packages/kdesdk/debian/changelog
   branches/kde4.2/packages/kdesdk/debian/control
   branches/kde4.2/packages/kdesdk/debian/installgen
   branches/kde4.2/packages/kdesdk/debian/kdesdk-scripts.install
   branches/kde4.2/packages/kdesdk/debian/kmtrace.install
   branches/kde4.2/packages/kdesdk/debian/poxml.install
Log:
* Move a few misplaced manual pages from kdesdk-scripts back to their
  real owner packages. Also ignore a few manual pages as they describe
  non-existant binaries/scripts (Closes: #513780).
* Tweak kdesdk-scripts suggests/recommends a bit. In particular, move
  cvs to recommends and recommend svn instead. Suggest qt4-doc instead
  of qt3-doc.

Modified: branches/kde4.2/packages/kdesdk/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/changelog	2009-02-01 16:34:31 UTC (rev 13695)
+++ branches/kde4.2/packages/kdesdk/debian/changelog	2009-02-01 16:49:02 UTC (rev 13696)
@@ -1,3 +1,14 @@
+kdesdk (4:4.2.0-2) UNRELEASED; urgency=low
+
+  * Move a few misplaced manual pages from kdesdk-scripts back to their
+    real owner packages. Also ignore a few manual pages as they describe
+    non-existant binaries/scripts (Closes: #513780).
+  * Tweak kdesdk-scripts suggests/recommends a bit. In particular, move
+    cvs to recommends and recommend svn instead. Suggest qt4-doc instead
+    of qt3-doc.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Feb 2009 18:39:54 +0200
+
 kdesdk (4:4.2.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4.2/packages/kdesdk/debian/control
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/control	2009-02-01 16:34:31 UTC (rev 13695)
+++ branches/kde4.2/packages/kdesdk/debian/control	2009-02-01 16:49:02 UTC (rev 13696)
@@ -168,8 +168,8 @@
 Architecture: all
 Section: devel
 Depends: ${perl:Depends}, python
-Recommends: cvs, gawk
-Suggests: khelpcenter, dmalloc, gdb, kdelibs5-doc, qt3-doc, valgrind, devscripts, xsltproc
+Recommends: svn, gawk
+Suggests: cvs, khelpcenter4, dmalloc, gdb, kdelibs5-doc, qt4-doc, valgrind, devscripts, xsltproc
 Enhances: kate
 Description: scripts and data files for KDE 4 development
  This package contains scripts and data files to facilitate development of
@@ -201,6 +201,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, less
+Replaces: kdesdk-scripts (= 4:4.2.0-1)
 Description: memory leak tracer for KDE 4
  KMtrace is a KDE tool to assist with malloc debugging using glibc's
  "mtrace" functionality.
@@ -250,6 +251,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
+Replaces: kdesdk-scripts (= 4:4.2.0-1)
 Description: tools for translating DocBook XML files with gettext
  This is a collection of tools that facilitate translating DocBook XML
  files using gettext message files (PO-files).

Modified: branches/kde4.2/packages/kdesdk/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/installgen	2009-02-01 16:34:31 UTC (rev 13695)
+++ branches/kde4.2/packages/kdesdk/debian/installgen	2009-02-01 16:49:02 UTC (rev 13696)
@@ -1,5 +1,11 @@
+[useless-manpages_virtual]
+# Manual pages are there, but scripts aren't
+missing dst:usr/share/man/man1/(?:fixincludes|reportview|transxx)\.1
+
 [kmtrace]
 from:/kmtrace/
+# Claim our manual page which is in doc/scripts/
+dst:usr/share/man/man1/demangle.1
 
 [kdesdk-misc]
 from:/kdeaccounts-plugin/
@@ -37,9 +43,6 @@
 [kdesdk-kio-plugins]
 from:/kioslave/
 
-[kdesdk-scripts]
-from:/scripts/
-
 [kdesdk-strigi-plugins]
 from:/strigi-analyzer/
 
@@ -51,6 +54,8 @@
 
 [poxml]
 from:/poxml/
+# Claim man pages which are in doc/scripts/
+dst:usr/share/man/man1/(po2xml|split2po|swappo|xml2pot)\.1
 
 [umbrello]
 from:/umbrello/
@@ -60,3 +65,6 @@
 
 [kpartloader]
 from:/kpartloader/
+
+[kdesdk-scripts]
+from:/scripts/

Modified: branches/kde4.2/packages/kdesdk/debian/kdesdk-scripts.install
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/kdesdk-scripts.install	2009-02-01 16:34:31 UTC (rev 13695)
+++ branches/kde4.2/packages/kdesdk/debian/kdesdk-scripts.install	2009-02-01 16:49:02 UTC (rev 13696)
@@ -71,13 +71,6 @@
 usr/share/man/man1/demangle.1
 usr/share/man/man1/extend_dmalloc.1
 usr/share/man/man1/extractrc.1
-usr/share/man/man1/fixincludes.1
-usr/share/man/man1/po2xml.1
 usr/share/man/man1/pruneemptydirs.1
 usr/share/man/man1/qtdoc.1
-usr/share/man/man1/reportview.1
-usr/share/man/man1/split2po.1
-usr/share/man/man1/swappo.1
-usr/share/man/man1/transxx.1
-usr/share/man/man1/xml2pot.1
 usr/share/man/man1/zonetab2pot.py.1

Modified: branches/kde4.2/packages/kdesdk/debian/kmtrace.install
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/kmtrace.install	2009-02-01 16:34:31 UTC (rev 13695)
+++ branches/kde4.2/packages/kdesdk/debian/kmtrace.install	2009-02-01 16:49:02 UTC (rev 13696)
@@ -7,3 +7,4 @@
 usr/lib/libktrace.so.4
 usr/lib/libktrace.so.4.2.0
 usr/share/kde4/apps/kmtrace/kde.excludes
+usr/share/man/man1/demangle.1

Modified: branches/kde4.2/packages/kdesdk/debian/poxml.install
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/poxml.install	2009-02-01 16:34:31 UTC (rev 13695)
+++ branches/kde4.2/packages/kdesdk/debian/poxml.install	2009-02-01 16:49:02 UTC (rev 13696)
@@ -4,3 +4,7 @@
 usr/bin/xml2pot
 usr/lib/libantlr.so.4
 usr/lib/libantlr.so.4.2.0
+usr/share/man/man1/po2xml.1
+usr/share/man/man1/split2po.1
+usr/share/man/man1/swappo.1
+usr/share/man/man1/xml2pot.1