rev 4559 - in kde-extras/kbfx/trunk/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-09-25 15:51:12 +0000 (Mon, 25 Sep 2006)
New Revision: 4559

Added:
   kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff
Removed:
   kde-extras/kbfx/trunk/debian/patches/10_fix_autoconf.diff
   kde-extras/kbfx/trunk/debian/source.lintian-overrides
Modified:
   kde-extras/kbfx/trunk/debian/changelog
   kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff
Log:
prepare kbfx 0.4.9.2 rc2

Modified: kde-extras/kbfx/trunk/debian/changelog
===================================================================
--- kde-extras/kbfx/trunk/debian/changelog	2006-09-25 11:29:14 UTC (rev 4558)
+++ kde-extras/kbfx/trunk/debian/changelog	2006-09-25 15:51:12 UTC (rev 4559)
@@ -1,8 +1,11 @@
-kbfx (0.4.9.1+20060611cvs-2) UNRELEASED; urgency=low
+kbfx (0.4.9.2~rc2-1) unstable; urgency=low
 
   * Fix kbfxconfig.desktop categories (Closes: #384257)
+  * Remove autoconf 2.60 patch, merged upstream
+  * Add patch to install desktop file in xdg apps dir
+  * Remove source.lintian-overrides, CVS dir fixed
 
- -- Fathi Boudra <fboudra at free.fr>  Wed, 23 Aug 2006 11:40:17 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Mon, 25 Sep 2006 16:00:59 +0200
 
 kbfx (0.4.9.1+20060611cvs-1) unstable; urgency=low
 

Deleted: kde-extras/kbfx/trunk/debian/patches/10_fix_autoconf.diff

Added: kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff
===================================================================
--- kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff	                        (rev 0)
+++ kde-extras/kbfx/trunk/debian/patches/10_use_xdg_appsdir.diff	2006-09-25 15:51:12 UTC (rev 4559)
@@ -0,0 +1,24 @@
+diff -Nur kbfx-0.4.9.2/kbfxconfigapp/Makefile.am kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.am
+--- kbfx-0.4.9.2/kbfxconfigapp/Makefile.am	2006-09-19 21:38:17.000000000 +0200
++++ kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.am	2006-09-25 17:11:48.000000000 +0200
+@@ -46,7 +46,7 @@
+ kbfxconfigapp_LDADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
+ 
+ # this is where the desktop file will go 
+-shelldesktopdir = $(kde_appsdir)/Utilities
++shelldesktopdir = $(xdg_appsdir)
+ shelldesktop_DATA = kbfxconfigapp.desktop
+ 
+ # this is where the shell's XML-GUI resource file goes
+diff -Nur kbfx-0.4.9.2/kbfxconfigapp/Makefile.in kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.in
+--- kbfx-0.4.9.2/kbfxconfigapp/Makefile.in	2006-09-22 13:19:38.000000000 +0200
++++ kbfx-0.4.9.2.new/kbfxconfigapp/Makefile.in	2006-09-25 17:12:25.000000000 +0200
+@@ -381,7 +381,7 @@
+ kbfxconfigapp_LDADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
+ 
+ # this is where the desktop file will go 
+-shelldesktopdir = $(kde_appsdir)/Utilities
++shelldesktopdir = $(xdg_appsdir)
+ shelldesktop_DATA = kbfxconfigapp.desktop
+ 
+ # this is where the shell's XML-GUI resource file goes

Modified: kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff
===================================================================
--- kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff	2006-09-25 11:29:14 UTC (rev 4558)
+++ kde-extras/kbfx/trunk/debian/patches/11_fix_desktop_categories.diff	2006-09-25 15:51:12 UTC (rev 4559)
@@ -1,9 +1,9 @@
-diff -Nur kbfx-0.4.9.1+20060611cvs/kbfxconfigapp/kbfxconfig.desktop kbfx-0.4.9.1+20060611cvs.new/kbfxconfigapp/kbfxconfig.desktop
---- kbfx-0.4.9.1+20060611cvs/kbfxconfigapp/kbfxconfig.desktop	2006-04-17 09:25:48.000000000 +0200
-+++ kbfx-0.4.9.1+20060611cvs.new/kbfxconfigapp/kbfxconfig.desktop	2006-08-23 11:38:36.000000000 +0200
+diff -Nur kbfx-0.4.9.2/kbfxconfigapp/kbfxconfigapp.desktop kbfx-0.4.9.2.new/kbfxconfigapp/kbfxconfigapp.desktop
+--- kbfx-0.4.9.2/kbfxconfigapp/kbfxconfigapp.desktop	2006-09-19 22:00:33.000000000 +0200
++++ kbfx-0.4.9.2.new/kbfxconfigapp/kbfxconfigapp.desktop	2006-09-25 16:27:08.000000000 +0200
 @@ -5,4 +5,4 @@
- Icon=kcmkbfxnew
- Exec=kbfxconfigapp
+ Icon=kbfxconfigapp
  Type=Application
--Categories=Qt;KDE;Configuration;
+ Comment=KBFX Configuration Utility
+-Categories=Qt;KDE;System;Configuration;
 +Categories=Qt;KDE;Settings;

Deleted: kde-extras/kbfx/trunk/debian/source.lintian-overrides