rev 16183 - kde-extras/knmap/trunk/debian

[Ryan Kavanagh]

Author: ryanakca-guest
Date: 2009-10-29 17:03:33 +0000 (Thu, 29 Oct 2009)
New Revision: 16183

Added:
   kde-extras/knmap/trunk/debian/knmap-docs.install
Removed:
   kde-extras/knmap/trunk/debian/knmap-data.install
   kde-extras/knmap/trunk/debian/knmap.lintian-overrides
Modified:
   kde-extras/knmap/trunk/debian/changelog
   kde-extras/knmap/trunk/debian/control
   kde-extras/knmap/trunk/debian/knmap.install
   kde-extras/knmap/trunk/debian/rules
Log:
Switched from knmap-data to knmap-docs

Modified: kde-extras/knmap/trunk/debian/changelog
===================================================================
--- kde-extras/knmap/trunk/debian/changelog	2009-10-27 19:33:26 UTC (rev 16182)
+++ kde-extras/knmap/trunk/debian/changelog	2009-10-29 17:03:33 UTC (rev 16183)
@@ -10,12 +10,11 @@
   * License file is /usr/share/common-licenses/GPL-2 instead of
     /usr/share/common-licenses/GPL
   * Updated my copyright to 2008, 2009
-  * Since we have lots of architecture independent data, by Debian Policy
-    Manual 6.7.5, we now have an Arch: all knmap-data package.
-  * Moving the manpage to knmap-data required the addition of the
-    binary-without-manpage to knmap's lintian-overrides
+  * Since we have lots of architecture independent data and most of it is the
+    DocBook documentation and associated icons, by Debian Policy Manual 6.7.5, we
+    now have an Arch: all knmap-docs package.
 
- -- Ryan Kavanagh <ryanakca at kubuntu.org>  Sun, 25 Oct 2009 11:30:30 -0400
+ -- Ryan Kavanagh <ryanakca at kubuntu.org>  Thu, 29 Oct 2009 12:38:57 -0400
 
 knmap (2.1-3) unstable; urgency=low
 

Modified: kde-extras/knmap/trunk/debian/control
===================================================================
--- kde-extras/knmap/trunk/debian/control	2009-10-27 19:33:26 UTC (rev 16182)
+++ kde-extras/knmap/trunk/debian/control	2009-10-29 17:03:33 UTC (rev 16183)
@@ -12,7 +12,8 @@
 
 Package: knmap
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nmap, knmap-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, nmap
+Recommends: knmap-docs
 Description: KDE interface to nmap, the Network Mapper
  Knmap is a KDE-based interface to the 'nmap' facility available at
  http://www.insecure.org/nmap.
@@ -29,10 +30,10 @@
  auditing. It supports ping scanning (determine which hosts are up), many port
  scanning techniques, version detection, and TCP/IP fingerprinting.
 
-Package: knmap-data
+Package: knmap-docs
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: KDE interface to nmap, the Network Mapper — data files
- This package contains the data files, such as icons, documentation, etc. 
- required by Knmap, a KDE interface to nmap, the Network Mapper. See the 'knmap' 
- package's description for more details.
+Description: KDE interface to nmap, the Network Mapper — manual
+ This package contains the DocBook manual and associated icons for Knmap, a KDE
+ interface to nmap, the Network Mapper. See the 'knmap' package's description
+ for more details.

Copied: kde-extras/knmap/trunk/debian/knmap-docs.install (from rev 16168, kde-extras/knmap/trunk/debian/knmap-data.install)
===================================================================
--- kde-extras/knmap/trunk/debian/knmap-docs.install	                        (rev 0)
+++ kde-extras/knmap/trunk/debian/knmap-docs.install	2009-10-29 17:03:33 UTC (rev 16183)
@@ -0,0 +1,2 @@
+usr/share/doc/kde/*
+usr/share/doc/kde/HTML/*

Modified: kde-extras/knmap/trunk/debian/knmap.install
===================================================================
--- kde-extras/knmap/trunk/debian/knmap.install	2009-10-27 19:33:26 UTC (rev 16182)
+++ kde-extras/knmap/trunk/debian/knmap.install	2009-10-29 17:03:33 UTC (rev 16183)
@@ -1 +1,3 @@
 usr/bin/*
+usr/share/icons/*
+usr/share/apps/*

Modified: kde-extras/knmap/trunk/debian/rules
===================================================================
--- kde-extras/knmap/trunk/debian/rules	2009-10-27 19:33:26 UTC (rev 16182)
+++ kde-extras/knmap/trunk/debian/rules	2009-10-29 17:03:33 UTC (rev 16183)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_INSTALL_MANPAGES_knmap-data = knmap.1
+DEB_INSTALL_MANPAGES_knmap = knmap.1
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 
 post-patches::
@@ -14,7 +14,7 @@
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	$(MAKE) -f Makefile.cvs
 
-build/knmap-data::
+build/knmap::
 	docbook2x-man debian/manpages/knmap.1.xml
 
 install/knmap::
@@ -22,7 +22,7 @@
 	dh_install debian/menu usr/share/menu/knmap
 	rm -rf debian/knmap/usr/share/applnk
 
-install/knmap-data::
+install/knmap-docs::
 	dh_link usr/share/doc/kde/HTML/en/knmap usr/share/doc/knmap/html
 
 clean::