rev 16168 - in kde-extras/knmap/trunk/debian: . manpages patches
Ryan Kavanagh
ryanakca-guest at alioth.debian.org
Sun Oct 25 15:31:47 UTC 2009
Author: ryanakca-guest
Date: 2009-10-25 15:31:46 +0000 (Sun, 25 Oct 2009)
New Revision: 16168
Added:
kde-extras/knmap/trunk/debian/README.source
kde-extras/knmap/trunk/debian/knmap-data.install
kde-extras/knmap/trunk/debian/knmap.install
kde-extras/knmap/trunk/debian/knmap.lintian-overrides
kde-extras/knmap/trunk/debian/patches/01_automake1.11.diff
kde-extras/knmap/trunk/debian/patches/05_spelling_in_binary.diff
Removed:
kde-extras/knmap/trunk/debian/patches/01_automake1.10.1.diff
Modified:
kde-extras/knmap/trunk/debian/changelog
kde-extras/knmap/trunk/debian/compat
kde-extras/knmap/trunk/debian/control
kde-extras/knmap/trunk/debian/copyright
kde-extras/knmap/trunk/debian/manpages/knmap.1.xml
kde-extras/knmap/trunk/debian/patches/series
kde-extras/knmap/trunk/debian/rules
Log:
Lots of changes required by the policy manual, updated automake patch to fix a FTBFS.
Added: kde-extras/knmap/trunk/debian/README.source
===================================================================
--- kde-extras/knmap/trunk/debian/README.source (rev 0)
+++ kde-extras/knmap/trunk/debian/README.source 2009-10-25 15:31:46 UTC (rev 16168)
@@ -0,0 +1,8 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build. Please see:
+
+ /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or
+remove a patch.
Modified: kde-extras/knmap/trunk/debian/changelog
===================================================================
--- kde-extras/knmap/trunk/debian/changelog 2009-10-24 18:39:21 UTC (rev 16167)
+++ kde-extras/knmap/trunk/debian/changelog 2009-10-25 15:31:46 UTC (rev 16168)
@@ -1,3 +1,22 @@
+knmap (2.1-4) unstable; urgency=low
+
+ * Added a README.source, as required by Debian Policy Manual section 4.14
+ * Bumped standards from 3.8.2 to 3.8.3
+ * Renamed and updated 01_automake1.10.1.diff to 01_automake1.11.diff so that
+ we can use automake version 1.11. Fixes a FTBFS (Closes: #543021)
+ * 05_spelling_in_binary.diff fixes spelling errors spotted by Lintian in the
+ knmap binary
+ * Fixed hyphen used as minus error in manpage.
+ * 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
+
+ -- Ryan Kavanagh <ryanakca at kubuntu.org> Sun, 25 Oct 2009 11:30:30 -0400
+
knmap (2.1-3) unstable; urgency=low
* Add the Debian KDE Extras Team to Uploaders.
Modified: kde-extras/knmap/trunk/debian/compat
===================================================================
--- kde-extras/knmap/trunk/debian/compat 2009-10-24 18:39:21 UTC (rev 16167)
+++ kde-extras/knmap/trunk/debian/compat 2009-10-25 15:31:46 UTC (rev 16168)
@@ -1 +1 @@
-5
+7
Modified: kde-extras/knmap/trunk/debian/control
===================================================================
--- kde-extras/knmap/trunk/debian/control 2009-10-24 18:39:21 UTC (rev 16167)
+++ kde-extras/knmap/trunk/debian/control 2009-10-25 15:31:46 UTC (rev 16168)
@@ -3,16 +3,16 @@
Priority: extra
Maintainer: Ryan Kavanagh <ryanakca at kubuntu.org>
Uploaders: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.51), cdbs, libtool, automake, autoconf,
+Build-Depends: debhelper (>= 7), cdbs, libtool, automake, autoconf,
autotools-dev, kdelibs4-dev, quilt, docbook2x, docbook
Homepage: http://sourceforge.net/projects/knmap
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/knmap/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/knmap/
Package: knmap
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nmap
+Depends: ${shlibs:Depends}, ${misc:Depends}, nmap, knmap-data
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.
@@ -28,3 +28,11 @@
Nmap ("Network Mapper") is a utility for network exploration or security
auditing. It supports ping scanning (determine which hosts are up), many port
scanning techniques, version detection, and TCP/IP fingerprinting.
+
+Package: knmap-data
+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.
Modified: kde-extras/knmap/trunk/debian/copyright
===================================================================
--- kde-extras/knmap/trunk/debian/copyright 2009-10-24 18:39:21 UTC (rev 16167)
+++ kde-extras/knmap/trunk/debian/copyright 2009-10-25 15:31:46 UTC (rev 16168)
@@ -8,7 +8,7 @@
Copyright (C) 2005, 2006 Kevin Gilbert <kev.gilbert at cdu.edu.au>
debian/knmap.1.docbook :
Copyright (C) 2005, 2006 Raphaël Pinson <raphink at raphink.net>
- Copyright (C) 2008 Ryan Kavanagh <ryanakca at kubuntu.org>
+ Copyright (C) 2008, 2009 Ryan Kavanagh <ryanakca at kubuntu.org>
License:
@@ -27,5 +27,5 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
Added: kde-extras/knmap/trunk/debian/knmap-data.install
===================================================================
--- kde-extras/knmap/trunk/debian/knmap-data.install (rev 0)
+++ kde-extras/knmap/trunk/debian/knmap-data.install 2009-10-25 15:31:46 UTC (rev 16168)
@@ -0,0 +1,4 @@
+usr/share/icons/*
+usr/share/doc/kde/*
+usr/share/apps/*
+usr/share/doc/kde/HTML/*
Added: kde-extras/knmap/trunk/debian/knmap.install
===================================================================
--- kde-extras/knmap/trunk/debian/knmap.install (rev 0)
+++ kde-extras/knmap/trunk/debian/knmap.install 2009-10-25 15:31:46 UTC (rev 16168)
@@ -0,0 +1 @@
+usr/bin/*
Added: kde-extras/knmap/trunk/debian/knmap.lintian-overrides
===================================================================
--- kde-extras/knmap/trunk/debian/knmap.lintian-overrides (rev 0)
+++ kde-extras/knmap/trunk/debian/knmap.lintian-overrides 2009-10-25 15:31:46 UTC (rev 16168)
@@ -0,0 +1 @@
+knmap: binary-without-manpage usr/bin/knmap
Modified: kde-extras/knmap/trunk/debian/manpages/knmap.1.xml
===================================================================
--- kde-extras/knmap/trunk/debian/manpages/knmap.1.xml 2009-10-24 18:39:21 UTC (rev 16167)
+++ kde-extras/knmap/trunk/debian/manpages/knmap.1.xml 2009-10-25 15:31:46 UTC (rev 16168)
@@ -39,7 +39,7 @@
</legalnotice>
<!-- XXX IMPORTANT XXX -->
<!-- Keep this date up to date: -->
- <date>2008-05-07</date>
+ <date>2009-08-29</date>
<!-- ^^^^^^^^^^ -->
</refentryinfo>
<refmeta>
@@ -299,7 +299,7 @@
</term>
<listitem>
<para>running under a debugger can cause an implicit
--nograb, use -dograb to override</para>
+ <option>-nograb</option>, use <option>-dograb</option> to override</para>
</listitem>
</varlistentry>
<varlistentry>
Copied: kde-extras/knmap/trunk/debian/patches/01_automake1.11.diff (from rev 15110, kde-extras/knmap/trunk/debian/patches/01_automake1.10.1.diff)
===================================================================
--- kde-extras/knmap/trunk/debian/patches/01_automake1.11.diff (rev 0)
+++ kde-extras/knmap/trunk/debian/patches/01_automake1.11.diff 2009-10-25 15:31:46 UTC (rev 16168)
@@ -0,0 +1,16 @@
+## 01_automake1.10.1.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+## Description: Allow us to use automake*1.11*
+Index: knmap-2.1/admin/cvs.sh
+===================================================================
+--- knmap-2.1.orig/admin/cvs.sh 2009-08-30 02:34:35.562156140 +0000
++++ knmap-2.1/admin/cvs.sh 2009-08-30 02:35:08.186155303 +0000
+@@ -64,7 +64,8 @@
+ echo "*** KDE requires automake 1.6.1 or newer"
+ exit 1
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* ) : ;;
++ automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* | \
++ automake*1.10* | automake*1.11* ) : ;;
+ "" )
+ echo "*** AUTOMAKE NOT FOUND!."
+ echo "*** KDE requires automake 1.6.1 or newer"
Added: kde-extras/knmap/trunk/debian/patches/05_spelling_in_binary.diff
===================================================================
--- kde-extras/knmap/trunk/debian/patches/05_spelling_in_binary.diff (rev 0)
+++ kde-extras/knmap/trunk/debian/patches/05_spelling_in_binary.diff 2009-10-25 15:31:46 UTC (rev 16168)
@@ -0,0 +1,15 @@
+## 05_spelling_in_binary.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+## Description: Fix spelling error in binary
+Index: knmap-2.1/src/pandsoptions.cpp
+===================================================================
+--- knmap-2.1.orig/src/pandsoptions.cpp 2009-08-29 22:52:44.586157311 -0400
++++ knmap-2.1/src/pandsoptions.cpp 2009-08-29 22:52:56.994154810 -0400
+@@ -51,7 +51,7 @@
+ m_ackCheckBox = new QCheckBox( i18n( "TCP ACK (-PA)" ), this, "ack check" );
+ m_ackLineEdit = new QLineEdit( this, "ack edit" );
+ m_arpCheckBox = new QCheckBox( i18n( "ARP (-PR)" ), this, "arp check" );
+- m_dontPingCheckBox = new QCheckBox( i18n( "Don't ping (-P0)" ), this, "dont ping check" );
++ m_dontPingCheckBox = new QCheckBox( i18n( "Don't ping (-P0)" ), this, "don't ping check" );
+ m_echoCheckBox = new QCheckBox( i18n( "ICMP echo (-PE)" ), this, "icmp echo check" );
+ m_netmaskCheckBox = new QCheckBox( i18n( "ICMP netmask (-PM)" ), this, "icmp netmask check" );
+ m_synCheckBox = new QCheckBox( i18n( "TCP SYN (-PS)" ), this, "syn check" );
Modified: kde-extras/knmap/trunk/debian/patches/series
===================================================================
--- kde-extras/knmap/trunk/debian/patches/series 2009-10-24 18:39:21 UTC (rev 16167)
+++ kde-extras/knmap/trunk/debian/patches/series 2009-10-25 15:31:46 UTC (rev 16168)
@@ -1,5 +1,6 @@
00_autoconf2.6.diff
-01_automake1.10.1.diff
+01_automake1.11.diff
02_fix_ld-flags.diff
03_no_encoding_in_desktop.diff
04_report_bugs.diff
+05_spelling_in_binary.diff
Modified: kde-extras/knmap/trunk/debian/rules
===================================================================
--- kde-extras/knmap/trunk/debian/rules 2009-10-24 18:39:21 UTC (rev 16167)
+++ kde-extras/knmap/trunk/debian/rules 2009-10-25 15:31:46 UTC (rev 16168)
@@ -5,7 +5,8 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_INSTALL_MANPAGES_knmap = knmap.1
+DEB_INSTALL_MANPAGES_knmap-data = knmap.1
+DEB_DESTDIR = $(CURDIR)/debian/tmp
post-patches::
# regenerating files to build app
@@ -13,12 +14,15 @@
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
$(MAKE) -f Makefile.cvs
-build/knmap::
+build/knmap-data::
docbook2x-man debian/manpages/knmap.1.xml
install/knmap::
dh_install src/knmap.desktop usr/share/applications/kde
+ dh_install debian/menu usr/share/menu/knmap
rm -rf debian/knmap/usr/share/applnk
+
+install/knmap-data::
dh_link usr/share/doc/kde/HTML/en/knmap usr/share/doc/knmap/html
clean::
More information about the pkg-kde-commits
mailing list