rev 18890 - in kde-extras/kraft/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2011-06-10 07:31:44 +0000 (Fri, 10 Jun 2011)
New Revision: 18890

Removed:
   kde-extras/kraft/trunk/debian/patches/02_fix_desktop_file.patch
Modified:
   kde-extras/kraft/trunk/debian/changelog
   kde-extras/kraft/trunk/debian/control
   kde-extras/kraft/trunk/debian/patches/series
   kde-extras/kraft/trunk/debian/rules
   kde-extras/kraft/trunk/debian/watch
Log:
* New upstream release
* Update Build-Depends: libboost1.46-dev
* Drop 02_fix_desktop_file.patch - fixed upstream
* Drop private icons folder - fixed upstream

Modified: kde-extras/kraft/trunk/debian/changelog
===================================================================
--- kde-extras/kraft/trunk/debian/changelog	2011-06-06 11:17:07 UTC (rev 18889)
+++ kde-extras/kraft/trunk/debian/changelog	2011-06-10 07:31:44 UTC (rev 18890)
@@ -1,14 +1,18 @@
-kraft (0.40-2) UNRELEASED; urgency=low
+kraft (0.43-1) unstable; urgency=low
 
+  * New upstream release
+
   [ Mark Purcell ]
   * Update debian/copyright
+  * Update Build-Depends: libboost1.46-dev
+  * Drop 02_fix_desktop_file.patch - fixed upstream
+  * Drop private icons folder - fixed upstream
 
   [ Felix Geyer ]
-  * Pass -Skde to dh_auto_install.
   * Add 03_fix_ftbfs_no-add-needed.patch to link kraft against libakonadi-kde.
     (Closes: #615737)
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 08 Jan 2011 15:49:26 +0100
+ -- Mark Purcell <msp at debian.org>  Fri, 10 Jun 2011 17:28:53 +1000
 
 kraft (0.40-1) unstable; urgency=low
 

Modified: kde-extras/kraft/trunk/debian/control
===================================================================
--- kde-extras/kraft/trunk/debian/control	2011-06-06 11:17:07 UTC (rev 18889)
+++ kde-extras/kraft/trunk/debian/control	2011-06-10 07:31:44 UTC (rev 18890)
@@ -12,7 +12,7 @@
                kdepimlibs5-dev,
                libqt4-sql-sqlite,
                libctemplate-dev,
-               libboost1.42-dev
+               libboost1.46-dev
 Standards-Version: 3.8.4
 Homepage: http://volle-kraft-voraus.de/
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kraft/trunk

Modified: kde-extras/kraft/trunk/debian/patches/series
===================================================================
--- kde-extras/kraft/trunk/debian/patches/series	2011-06-06 11:17:07 UTC (rev 18889)
+++ kde-extras/kraft/trunk/debian/patches/series	2011-06-10 07:31:44 UTC (rev 18890)
@@ -1,3 +1,2 @@
 01_dont_install_cmake_script.patch
-02_fix_desktop_file.patch
 03_fix_ftbfs_no-add-needed.patch

Modified: kde-extras/kraft/trunk/debian/rules
===================================================================
--- kde-extras/kraft/trunk/debian/rules	2011-06-06 11:17:07 UTC (rev 18889)
+++ kde-extras/kraft/trunk/debian/rules	2011-06-10 07:31:44 UTC (rev 18890)
@@ -5,19 +5,3 @@
 
 %:
 	dh --parallel --with kde $@
-
-override_dh_auto_install:
-	dh_auto_install -Skde
-
-	# move these icons to private icons folder to prevent possible conflicts
-	mv debian/kraft/usr/share/icons/hicolor/16x16/actions/demand.png \
-	    debian/kraft/usr/share/kde4/apps/kraft/icons/hicolor/16x16/actions
-	mv debian/kraft/usr/share/icons/hicolor/16x16/actions/alternative.png \
-	    debian/kraft/usr/share/kde4/apps/kraft/icons/hicolor/16x16/actions
-	rmdir debian/kraft/usr/share/icons/hicolor/16x16/actions
-
-	mv debian/kraft/usr/share/icons/crystalsvg/16x16/actions/demand.png \
-	    debian/kraft/usr/share/kde4/apps/kraft/icons/crystalsvg/16x16/actions
-	mv debian/kraft/usr/share/icons/crystalsvg/16x16/actions/alternative.png \
-	    debian/kraft/usr/share/kde4/apps/kraft/icons/crystalsvg/16x16/actions
-	rmdir debian/kraft/usr/share/icons/crystalsvg/16x16/actions

Modified: kde-extras/kraft/trunk/debian/watch
===================================================================
--- kde-extras/kraft/trunk/debian/watch	2011-06-06 11:17:07 UTC (rev 18889)
+++ kde-extras/kraft/trunk/debian/watch	2011-06-10 07:31:44 UTC (rev 18890)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/kraft/ kraft-(\d[\d_.]+)\.tar\.(?:bz2|gz)
+http://sf.net/kraft/ kraft-(\d[\d_.]+)\.tar\.(?:bz2|gz) debian svn-upgrade