rev 15866 - in kde-extras/basket/trunk/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-09-01 19:35:10 +0000 (Tue, 01 Sep 2009)
New Revision: 15866

Added:
   kde-extras/basket/trunk/debian/patches/06_autoconf2.64.diff
   kde-extras/basket/trunk/debian/patches/17_mimetype.diff
Modified:
   kde-extras/basket/trunk/debian/changelog
   kde-extras/basket/trunk/debian/menu
   kde-extras/basket/trunk/debian/patches/05_allow_newer_automake_and_autoconf.diff
   kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff
   kde-extras/basket/trunk/debian/patches/series
Log:
* Hack around autoconf2.64 changes. More hacks. Thanks to pld-linux.
* Allow automake 1.11 usage. and 1.12. and 1.13. and...
  (Closes: #543095)
* Adapt to new menu structure. (Closes: 496058)
* Add ; to desktop file. (Closes: 507803)

Modified: kde-extras/basket/trunk/debian/changelog
===================================================================
--- kde-extras/basket/trunk/debian/changelog	2009-09-01 17:09:35 UTC (rev 15865)
+++ kde-extras/basket/trunk/debian/changelog	2009-09-01 19:35:10 UTC (rev 15866)
@@ -1,3 +1,13 @@
+basket (1.0.2-8) unstable; urgency=low
+
+  * Hack around autoconf2.64 changes. More hacks. Thanks to pld-linux.
+  * Allow automake 1.11 usage. and 1.12. and 1.13. and...
+    (Closes: #543095)
+  * Adapt to new menu structure. (Closes: 496058)
+  * Add ; to desktop file. (Closes: 507803)
+
+ -- Sune Vuorela <debian at pusling.com>  Tue, 01 Sep 2009 21:25:53 +0200
+
 basket (1.0.2-7) unstable; urgency=low
 
   * Hack around teh libtool changes. Now builds. But kind of a hack.

Modified: kde-extras/basket/trunk/debian/menu
===================================================================
--- kde-extras/basket/trunk/debian/menu	2009-09-01 17:09:35 UTC (rev 15865)
+++ kde-extras/basket/trunk/debian/menu	2009-09-01 19:35:10 UTC (rev 15866)
@@ -1,2 +1,2 @@
-?package(basket):needs="X11" section="Apps/Tools" \
+?package(basket):needs="X11" section="Applications/Data Management" \
   title="basket" command="/usr/bin/basket"

Modified: kde-extras/basket/trunk/debian/patches/05_allow_newer_automake_and_autoconf.diff
===================================================================
--- kde-extras/basket/trunk/debian/patches/05_allow_newer_automake_and_autoconf.diff	2009-09-01 17:09:35 UTC (rev 15865)
+++ kde-extras/basket/trunk/debian/patches/05_allow_newer_automake_and_autoconf.diff	2009-09-01 19:35:10 UTC (rev 15866)
@@ -7,7 +7,7 @@
      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.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;

Added: kde-extras/basket/trunk/debian/patches/06_autoconf2.64.diff
===================================================================
--- kde-extras/basket/trunk/debian/patches/06_autoconf2.64.diff	                        (rev 0)
+++ kde-extras/basket/trunk/debian/patches/06_autoconf2.64.diff	2009-09-01 19:35:10 UTC (rev 15866)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -46,6 +46,8 @@ dnl generate the config header
+ AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+ 
+ dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_CXX
+ AC_CHECK_COMPILERS
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)

Modified: kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff
===================================================================
--- kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff	2009-09-01 17:09:35 UTC (rev 15865)
+++ kde-extras/basket/trunk/debian/patches/16_basket_kontact_compat.diff	2009-09-01 19:35:10 UTC (rev 15866)
@@ -1,8 +1,6 @@
-Index: b/kontact_plugin/basket.desktop
-===================================================================
 --- a/kontact_plugin/basket.desktop
 +++ b/kontact_plugin/basket.desktop
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ Icon=basket
  ServiceTypes=Kontact/Plugin,KPluginInfo
  
  X-KDE-Library=libkontact_basket

Added: kde-extras/basket/trunk/debian/patches/17_mimetype.diff
===================================================================
--- kde-extras/basket/trunk/debian/patches/17_mimetype.diff	                        (rev 0)
+++ kde-extras/basket/trunk/debian/patches/17_mimetype.diff	2009-09-01 19:35:10 UTC (rev 15866)
@@ -0,0 +1,11 @@
+--- a/src/basket.desktop
++++ b/src/basket.desktop
+@@ -3,7 +3,7 @@ Encoding=UTF-8
+ Type=Application
+ 
+ Exec=basket %f
+-MimeType=application/x-basket-archive;application/x-basket-template
++MimeType=application/x-basket-archive;application/x-basket-template;
+ Icon=basket
+ 
+ Name=BasKet Note Pads

Modified: kde-extras/basket/trunk/debian/patches/series
===================================================================
--- kde-extras/basket/trunk/debian/patches/series	2009-09-01 17:09:35 UTC (rev 15865)
+++ kde-extras/basket/trunk/debian/patches/series	2009-09-01 19:35:10 UTC (rev 15866)
@@ -1,8 +1,10 @@
 03_lib_link.diff
 04_am_maintainer_mode.diff
 05_allow_newer_automake_and_autoconf.diff
+06_autoconf2.64.diff
 12_desktop.diff
 13_add_da.po.diff
 14_update_es_po.diff
 15_fix_gcc4.3.diff
 16_basket_kontact_compat.diff
+17_mimetype.diff