rev 15096 - in kde-extras/knmap/trunk/debian: . patches

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

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

Removed:
   kde-extras/knmap/trunk/debian/debiandirs
   kde-extras/knmap/trunk/debian/dirs
Modified:
   kde-extras/knmap/trunk/debian/changelog
   kde-extras/knmap/trunk/debian/patches/00_autoconf2.6.diff
   kde-extras/knmap/trunk/debian/patches/01_automake1.10.1.diff
   kde-extras/knmap/trunk/debian/patches/02_fix_ld-flags.diff
   kde-extras/knmap/trunk/debian/patches/03_no_encoding_in_desktop.diff
   kde-extras/knmap/trunk/debian/patches/04_report_bugs.diff
   kde-extras/knmap/trunk/debian/rules
Log:
cleanup before uploading.


Modified: kde-extras/knmap/trunk/debian/changelog
===================================================================
--- kde-extras/knmap/trunk/debian/changelog	2009-07-04 08:41:41 UTC (rev 15095)
+++ kde-extras/knmap/trunk/debian/changelog	2009-07-04 09:11:08 UTC (rev 15096)
@@ -1,10 +1,10 @@
-knmap (2.1-3) UNRELEASED; urgency=low
+knmap (2.1-3) unstable; urgency=low
 
-  * Add the Debian KDE Extras Team to Uploaders
-  * Add Vcs-Svn and Vcs-Browser to control
-  * Bumped standards from 3.8.0 to 3.8.2
-  * Removed backslashes in control file, (Closes: #535304).
-  * Added description headers to the patches. 
+  * 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
 

Modified: kde-extras/knmap/trunk/debian/patches/00_autoconf2.6.diff
===================================================================
--- kde-extras/knmap/trunk/debian/patches/00_autoconf2.6.diff	2009-07-04 08:41:41 UTC (rev 15095)
+++ kde-extras/knmap/trunk/debian/patches/00_autoconf2.6.diff	2009-07-04 09:11:08 UTC (rev 15096)
@@ -1,10 +1,8 @@
 ## 00_autoconf2.6.diff by Jonathan Riddell <jriddell at ubuntu.com>
 ## Description: Allow us to use autoconf2.6
-Index: knmap-2.1/admin/cvs.sh
-===================================================================
---- knmap-2.1.orig/admin/cvs.sh	2008-06-07 17:44:33.000000000 -0400
-+++ knmap-2.1/admin/cvs.sh	2008-06-07 17:45:07.000000000 -0400
-@@ -29,7 +29,7 @@
+--- 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
@@ -13,7 +11,7 @@
    "" )
      echo "*** AUTOCONF NOT FOUND!."
      echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ esac
   
  AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
  case $AUTOHEADER_VERSION in

Modified: kde-extras/knmap/trunk/debian/patches/01_automake1.10.1.diff
===================================================================
--- kde-extras/knmap/trunk/debian/patches/01_automake1.10.1.diff	2009-07-04 08:41:41 UTC (rev 15095)
+++ kde-extras/knmap/trunk/debian/patches/01_automake1.10.1.diff	2009-07-04 09:11:08 UTC (rev 15096)
@@ -1,10 +1,8 @@
 ## 01_automake1.10.1.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
 ## Description: Allow us to use automake*1.10*
-Index: knmap-2.1/admin/cvs.sh
-===================================================================
---- knmap-2.1.orig/admin/cvs.sh	2008-06-07 17:49:35.000000000 -0400
-+++ knmap-2.1/admin/cvs.sh	2008-06-07 17:49:53.000000000 -0400
-@@ -64,7 +64,8 @@
+--- 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
      ;;

Modified: kde-extras/knmap/trunk/debian/patches/02_fix_ld-flags.diff
===================================================================
--- kde-extras/knmap/trunk/debian/patches/02_fix_ld-flags.diff	2009-07-04 08:41:41 UTC (rev 15095)
+++ kde-extras/knmap/trunk/debian/patches/02_fix_ld-flags.diff	2009-07-04 09:11:08 UTC (rev 15096)
@@ -1,10 +1,8 @@
 ## 02_fix_ld-flags.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
 ## Description: We don't need useless linking
-Index: knmap-2.1/src/Makefile.am
-===================================================================
---- knmap-2.1.orig/src/Makefile.am	2008-06-12 06:36:04.000000000 -0400
-+++ knmap-2.1/src/Makefile.am	2008-06-12 06:36:23.000000000 -0400
-@@ -30,7 +30,7 @@
+--- 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

Modified: kde-extras/knmap/trunk/debian/patches/03_no_encoding_in_desktop.diff
===================================================================
--- kde-extras/knmap/trunk/debian/patches/03_no_encoding_in_desktop.diff	2009-07-04 08:41:41 UTC (rev 15095)
+++ kde-extras/knmap/trunk/debian/patches/03_no_encoding_in_desktop.diff	2009-07-04 09:11:08 UTC (rev 15096)
@@ -1,9 +1,7 @@
 ## 03_text_files.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
 ## Description: Remove encoding tag
-Index: knmap-2.1/src/knmap.desktop
-===================================================================
---- knmap-2.1.orig/src/knmap.desktop	2008-06-07 18:32:07.000000000 -0400
-+++ knmap-2.1/src/knmap.desktop	2008-06-07 18:32:17.000000000 -0400
+--- a/src/knmap.desktop
++++ b/src/knmap.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8

Modified: kde-extras/knmap/trunk/debian/patches/04_report_bugs.diff
===================================================================
--- kde-extras/knmap/trunk/debian/patches/04_report_bugs.diff	2009-07-04 08:41:41 UTC (rev 15095)
+++ kde-extras/knmap/trunk/debian/patches/04_report_bugs.diff	2009-07-04 09:11:08 UTC (rev 15096)
@@ -1,10 +1,8 @@
 ## 01_automake1.10.1.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
 ## Description: Submit bugs to Debian instead of KDE.
-Index: knmap-2.1/src/main.cpp
-===================================================================
---- knmap-2.1.orig/src/main.cpp	2008-06-07 20:26:13.000000000 -0400
-+++ knmap-2.1/src/main.cpp	2008-06-07 20:27:28.000000000 -0400
-@@ -59,6 +59,7 @@
+--- 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" );

Modified: kde-extras/knmap/trunk/debian/rules
===================================================================
--- kde-extras/knmap/trunk/debian/rules	2009-07-04 08:41:41 UTC (rev 15095)
+++ kde-extras/knmap/trunk/debian/rules	2009-07-04 09:11:08 UTC (rev 15096)
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-cdbs_kde_enable_debug = --disable-debug 
-
 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
 
@@ -19,6 +18,7 @@
 
 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::

More information about the pkg-kde-commits mailing list