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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-02-03 07:47:51 +0100 (Sat, 03 Feb 2007)
New Revision: 5520

Added:
   kde-extras/basket/trunk/debian/patches/12_desktop.diff
Modified:
   kde-extras/basket/trunk/debian/changelog
   kde-extras/basket/trunk/debian/control
   kde-extras/basket/trunk/debian/patches/series
   kde-extras/basket/trunk/debian/rules
Log:
last changes for basket.


Modified: kde-extras/basket/trunk/debian/changelog
===================================================================
--- kde-extras/basket/trunk/debian/changelog	2007-02-02 14:02:18 UTC (rev 5519)
+++ kde-extras/basket/trunk/debian/changelog	2007-02-03 06:47:51 UTC (rev 5520)
@@ -1,8 +1,9 @@
 basket (1.0~beta3-1) experimental; urgency=low
 
-  [ Ana Beatriz Guerrero Lopez ]
   * New upstream version. (Closes: #395900)
   * Package now maintained by the Debian KDE Extras Team.
+  
+  [ Ana Beatriz Guerrero Lopez ]
   * Remove unnecessary file debian/Makefile.
   * Update compat to 5.
   * Bumped Standards-Version to 3.7.2, no changes required.
@@ -15,14 +16,10 @@
   * Not install empty file NEWS.
   * Rewrite debian/rules file.
   * Improve debian/copyright file.
+  * Versioned build-deps in kdelibs4-dev and kdepim-dev to build against 3.5.6
+    (so Sune's changes will work).
+  * Patched desktop file to include Categories and moved to right place.
 
-  * TODO:
-    - surely, some more changes in the debian/rules
-    - install desktop in right place.
-    - ana needs to nitpick Sunes Changelog entries
-    - Correct maintainer field of this changelog
-
-
   [ Sune Vuorela ]
   * Add quilt to build-dep - we better need a patch system. This also required
     changes to rules.
@@ -37,7 +34,7 @@
     (New libtool put in thru patch 02, patch 03 fixes build system relying on 
     broken libtool and the big buildprep as patch 98.
 
- -- Sune Vuorela <debian at pusling.com>  Wed, 31 Jan 2007 10:01:11 +0100
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 03 Feb 2007 07:41:48 +0100
 
 basket (0.5.0-6) unstable; urgency=low
 

Modified: kde-extras/basket/trunk/debian/control
===================================================================
--- kde-extras/basket/trunk/debian/control	2007-02-02 14:02:18 UTC (rev 5519)
+++ kde-extras/basket/trunk/debian/control	2007-02-03 06:47:51 UTC (rev 5520)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
-Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev, kdepim-dev, libgpgme11-dev, quilt ( >= 0.40 )
+Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev (>= 4:3.5.6), kdepim-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40)
 Standards-Version: 3.7.2
 
 Package: basket

Added: kde-extras/basket/trunk/debian/patches/12_desktop.diff
===================================================================
--- kde-extras/basket/trunk/debian/patches/12_desktop.diff	2007-02-02 14:02:18 UTC (rev 5519)
+++ kde-extras/basket/trunk/debian/patches/12_desktop.diff	2007-02-03 06:47:51 UTC (rev 5520)
@@ -0,0 +1,7 @@
+--- basket/src/basket.desktop	2007-02-02 15:24:00.000000000 +0100
++++ basket/src/basket.desktop	2007-02-02 15:28:20.000000000 +0100
+@@ -25,3 +25,4 @@
+ Comment[pt]=Cuidando das suas ideias.
+ Comment[ru]=Заботимся о ваших идеях.
+ Comment[xx]=xxTaking care of your ideas.xx
++Categories=KDE;Application;Utility;TextEditor;

Modified: kde-extras/basket/trunk/debian/patches/series
===================================================================
--- kde-extras/basket/trunk/debian/patches/series	2007-02-02 14:02:18 UTC (rev 5519)
+++ kde-extras/basket/trunk/debian/patches/series	2007-02-03 06:47:51 UTC (rev 5520)
@@ -2,4 +2,5 @@
 03_lib_link.diff
 10_dont_spam_stderr.diff
 11_match_kde3.5.6_kontact.diff
+12_desktop.diff
 98_buildprep.diff

Modified: kde-extras/basket/trunk/debian/rules
===================================================================
--- kde-extras/basket/trunk/debian/rules	2007-02-02 14:02:18 UTC (rev 5519)
+++ kde-extras/basket/trunk/debian/rules	2007-02-03 06:47:51 UTC (rev 5520)
@@ -65,6 +65,8 @@
 	# Install into package-build-dir
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/basket
 
+	mkdir -p $(CURDIR)/debian/basket/usr/share/applications/kde/
+	mv $(CURDIR)/debian/basket/usr/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket/usr/share/applications/kde/
 
 binary-indep: build install