rev 15097 - in kde-extras/knmap/tags: . 2.1-3/debian 2.1-3/debian/patches

Fathi Boudra fabo at alioth.debian.org
Sat Jul 4 09:11:59 UTC 2009 

Author: fabo
Date: 2009-07-04 09:11:58 +0000 (Sat, 04 Jul 2009)
New Revision: 15097

Added:
   kde-extras/knmap/tags/2.1-3/
   kde-extras/knmap/tags/2.1-3/debian/changelog
   kde-extras/knmap/tags/2.1-3/debian/patches/00_autoconf2.6.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/01_automake1.10.1.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/02_fix_ld-flags.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/03_no_encoding_in_desktop.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/04_report_bugs.diff
   kde-extras/knmap/tags/2.1-3/debian/rules
Removed:
   kde-extras/knmap/tags/2.1-3/debian/changelog
   kde-extras/knmap/tags/2.1-3/debian/debiandirs
   kde-extras/knmap/tags/2.1-3/debian/dirs
   kde-extras/knmap/tags/2.1-3/debian/patches/00_autoconf2.6.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/01_automake1.10.1.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/02_fix_ld-flags.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/03_no_encoding_in_desktop.diff
   kde-extras/knmap/tags/2.1-3/debian/patches/04_report_bugs.diff
   kde-extras/knmap/tags/2.1-3/debian/rules
Log:
Tagging knmap 2.1-3

Copied: kde-extras/knmap/tags/2.1-3/debian/changelog (from rev 15096, kde-extras/knmap/trunk/debian/changelog)
===================================================================
--- kde-extras/knmap/tags/2.1-3/debian/changelog	                        (rev 0)
+++ kde-extras/knmap/tags/2.1-3/debian/changelog	2009-07-04 09:11:58 UTC (rev 15097)
@@ -0,0 +1,79 @@
+knmap (2.1-3) unstable; urgency=low
+
+  * Add the Debian KDE Extras Team to Uploaders.
+  * Add Vcs-Svn and Vcs-Browser to control.
+  * Bump standards from 3.8.0 to 3.8.2.
+  * Remove backslashes in control file, (Closes: #535304).
+  * Add description headers to the patches.
+
+ -- Ryan Kavanagh <ryanakca at kubuntu.org>  Fri, 03 Jul 2009 19:24:53 -0400
+
+knmap (2.1-2) unstable; urgency=low
+
+  * New maintainer (Closes: #484542)
+  * Fix short description (Kde -> KDE) (Closes: #466812)
+  * Update the standards, the dependency versions and move homepage from long
+    description to the Homepage field in debian/control
+  * Merge in contributions from Kubuntu:
+    + Merge the Kubuntu manpage (better description) and the current manpage
+    + Change debian/rules to CDBS to make maintaining the package easier
+    + Updated the long description to prevent confusion between the old knmap
+      and the new rewrite.
+  * We need to relibtoolize :
+    + When we relibtoolize, we should use autoconf*2.6*; Kubuntu's 
+      00_autoconf2.6.diff
+    + Debian doesn't have automake 1.6 anymore (which is what admin/cvs.sh
+      asks for), so we need to patch it to use 1.10.1; 01_automake1.10.1.diff
+  * Patch Makefile.am to remove useless linking, this is preferable to
+    --as-needed for KDE3 aps; 02_fix_ld-flags.diff
+  * Use quilt to maintain all these patches.
+  * Change the priority from `optional' to `extra' to conform to section 2.5
+    of the Policy (we depend on nmap which has the priority of `extra').
+  * Change `Apps' to `Applications' in the menu file to remove the
+    `menu-item-uses-apps-section' warning; and change `Net' to
+    `Network/Monitoring'.
+  * Remove the Encoding tag from the desktop file;
+    03_no_encoding_in_desktop.diff
+  * Change ``http://bugs.kde.org'' to ``http://bugs.debian.org''  in
+    src/main.cpp; 04_report_bugs.diff (Closes: #466814)
+  * Drop the creation of /usr/share/bug/ & /usr/share/bug/knmap/ since
+    they are empty and serve no purpose.
+  * Update the standards version from 3.7.3 to 3.8.0
+  * Add more files that upstream doesn't clean up to our clean:: (in
+    debian/rules)
+
+ -- Ryan Kavanagh <ryanakca at kubuntu.org>  Sat, 14 Jun 2008 20:59:20 -0400
+
+knmap (2.1-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Fixed debian/watch file
+
+ -- Claudio Moratti <maxer at knio.it>  Sat, 21 Jan 2006 20:07:05 +0100
+
+knmap (2.0-1) unstable; urgency=low
+
+  * New Upstream Release  (Closes: #347834)
+
+ -- Claudio Moratti <maxer at knio.it>  Fri, 13 Jan 2006 11:54:27 +0100
+
+knmap (1.99-1) unstable; urgency=low
+
+  * New Upstream Release (2.0-beta)
+
+ -- Claudio Moratti <maxer at knio.it>  Mon, 19 Dec 2005 12:23:55 +0100
+
+knmap (1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Added libtool patch
+  * Added Categories to .desktop file
+
+ -- Claudio Moratti <maxer at knio.it>  Mon,  5 Dec 2005 15:44:48 +0100
+
+knmap (1.0-beta1-1) unstable; urgency=low
+
+  * Initial release 
+
+ -- Claudio Moratti <maxer at knio.it>  Wed,  9 Nov 2005 18:59:04 +0100
+

Copied: kde-extras/knmap/tags/2.1-3/debian/patches/00_autoconf2.6.diff (from rev 15096, kde-extras/knmap/trunk/debian/patches/00_autoconf2.6.diff)
===================================================================
--- kde-extras/knmap/tags/2.1-3/debian/patches/00_autoconf2.6.diff	                        (rev 0)
+++ kde-extras/knmap/tags/2.1-3/debian/patches/00_autoconf2.6.diff	2009-07-04 09:11:58 UTC (rev 15097)
@@ -0,0 +1,22 @@
+## 00_autoconf2.6.diff by Jonathan Riddell <jriddell at ubuntu.com>
+## Description: Allow us to use autoconf2.6
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -29,7 +29,7 @@ check_autotool_versions()
+ {
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* ) : ;;
++  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+   "" )
+     echo "*** AUTOCONF NOT FOUND!."
+     echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
+@@ -44,7 +44,7 @@ esac
+  
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"

Copied: kde-extras/knmap/tags/2.1-3/debian/patches/01_automake1.10.1.diff (from rev 15096, kde-extras/knmap/trunk/debian/patches/01_automake1.10.1.diff)
===================================================================
--- kde-extras/knmap/tags/2.1-3/debian/patches/01_automake1.10.1.diff	                        (rev 0)
+++ kde-extras/knmap/tags/2.1-3/debian/patches/01_automake1.10.1.diff	2009-07-04 09:11:58 UTC (rev 15097)
@@ -0,0 +1,14 @@
+## 01_automake1.10.1.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+## Description: Allow us to use automake*1.10*
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -64,7 +64,8 @@ case $AUTOMAKE_STRING in
+     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* ) : ;;
+   "" )
+     echo "*** AUTOMAKE NOT FOUND!."
+     echo "*** KDE requires automake 1.6.1 or newer"

Copied: kde-extras/knmap/tags/2.1-3/debian/patches/02_fix_ld-flags.diff (from rev 15096, kde-extras/knmap/trunk/debian/patches/02_fix_ld-flags.diff)
===================================================================
--- kde-extras/knmap/tags/2.1-3/debian/patches/02_fix_ld-flags.diff	                        (rev 0)
+++ kde-extras/knmap/tags/2.1-3/debian/patches/02_fix_ld-flags.diff	2009-07-04 09:11:58 UTC (rev 15097)
@@ -0,0 +1,13 @@
+## 02_fix_ld-flags.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+## Description: We don't need useless linking
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -30,7 +30,7 @@ knmap_SOURCES = main.cpp knmap.cpp mainw
+ 					profiledialog.cpp loggingoptions.cpp simpleoptions.cpp pandsoptions.cpp whatsthis.cpp \
+ 					tabwidgetptrlist.cpp tabwidgetdata.cpp scanwidget.cpp indexwidget.cpp scannamedialog.cpp \
+ 			scanstack.cpp scanmonitor.cpp scanmonitorevent.cpp nmapoutputbuffer.cpp
+-knmap_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++knmap_LDFLAGS = #$(KDE_RPATH) $(all_libraries)
+ knmap_LDADD = $(LIB_KIO) $(LIB_KHTML)
+ 
+ # this is where the desktop file will go 

Copied: kde-extras/knmap/tags/2.1-3/debian/patches/03_no_encoding_in_desktop.diff (from rev 15096, kde-extras/knmap/trunk/debian/patches/03_no_encoding_in_desktop.diff)
===================================================================
--- kde-extras/knmap/tags/2.1-3/debian/patches/03_no_encoding_in_desktop.diff	                        (rev 0)
+++ kde-extras/knmap/tags/2.1-3/debian/patches/03_no_encoding_in_desktop.diff	2009-07-04 09:11:58 UTC (rev 15097)
@@ -0,0 +1,10 @@
+## 03_text_files.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+## Description: Remove encoding tag
+--- a/src/knmap.desktop
++++ b/src/knmap.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=knmap
+ Name[xx]=xxknmapxx
+ Exec=knmap

Copied: kde-extras/knmap/tags/2.1-3/debian/patches/04_report_bugs.diff (from rev 15096, kde-extras/knmap/trunk/debian/patches/04_report_bugs.diff)
===================================================================
--- kde-extras/knmap/tags/2.1-3/debian/patches/04_report_bugs.diff	                        (rev 0)
+++ kde-extras/knmap/tags/2.1-3/debian/patches/04_report_bugs.diff	2009-07-04 09:11:58 UTC (rev 15097)
@@ -0,0 +1,12 @@
+## 01_automake1.10.1.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+## Description: Submit bugs to Debian instead of KDE.
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -59,6 +59,7 @@ int main( int argc, string argv[])
+ 					 "Initial rewrite released as version 1.0\nVersions 2.0, 2.1",
+ 					 "kev.gilbert at cdu.edu.au",
+ 					 "http://informatics.cdu.edu.au/staff/kgilbert" );
++    about.setBugAddress( "http://bugs.debian.org/" );
+ 	KCmdLineArgs::init( argc, argv, &about );
+ 	KCmdLineArgs::addCmdLineOptions( options );
+ 	KApplication app;

Copied: kde-extras/knmap/tags/2.1-3/debian/rules (from rev 15096, kde-extras/knmap/trunk/debian/rules)
===================================================================
--- kde-extras/knmap/tags/2.1-3/debian/rules	                        (rev 0)
+++ kde-extras/knmap/tags/2.1-3/debian/rules	2009-07-04 09:11:58 UTC (rev 15097)
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_INSTALL_MANPAGES_knmap = knmap.1
+
+post-patches::
+	# regenerating files to build app
+	libtoolize --copy --force
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	$(MAKE) -f Makefile.cvs
+
+build/knmap::
+	docbook2x-man debian/manpages/knmap.1.xml
+
+install/knmap::
+	dh_install src/knmap.desktop usr/share/applications/kde
+	rm -rf debian/knmap/usr/share/applnk
+	dh_link usr/share/doc/kde/HTML/en/knmap usr/share/doc/knmap/html
+
+clean::
+	rm -f knmap.1
+	# removing files not cleaned by upstream
+	rm -f configure
+	rm -f doc/en/Makefile.in
+	rm -f src/Makefile.in
+	rm -f Makefile.in
+	rm -f subdirs
+	rm -f aclocal.m4
+	rm -f config.h.in
+	rm -f acinclude.m4
+	rm -f po/Makefile.in
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
+	rm -f doc/Makefile.in

More information about the pkg-kde-commits mailing list