[Demudi-commits] r855 - in ktoon/trunk/debian: . patches

[Juan Manuel Garcia Molina]

Author: juanma
Date: 2006-07-02 19:03:35 +0000 (Sun, 02 Jul 2006)
New Revision: 855

Added:
   ktoon/trunk/debian/ktoon.desktop
   ktoon/trunk/debian/patches/
   ktoon/trunk/debian/patches/00list
   ktoon/trunk/debian/patches/10_g++4fix
Modified:
   ktoon/trunk/debian/changelog
   ktoon/trunk/debian/control
   ktoon/trunk/debian/dirs
   ktoon/trunk/debian/rules
Log:
ktoon 0.8.0rc1-2 packaged. Changelog:
* Added patch to fix build against G++ 4.1. Added dpatch support.
* Added Desktop entry and icon, thanks to Free Ekanayaka.


Modified: ktoon/trunk/debian/changelog
===================================================================
--- ktoon/trunk/debian/changelog	2006-07-02 03:18:46 UTC (rev 854)
+++ ktoon/trunk/debian/changelog	2006-07-02 19:03:35 UTC (rev 855)
@@ -1,3 +1,10 @@
+ktoon (0.8.0rc1-2) unstable; urgency=low
+
+  * Added patch to fix build against G++ 4.1. Added dpatch support.
+  * Added Desktop entry and icon, thanks to Free Ekanayaka.
+
+ -- Juan Manuel Garcia Molina <juanma at debian.org>  Sun,  2 Jul 2006 20:10:26 +0200
+
 ktoon (0.8.0rc1-1) unstable; urgency=low
 
   * New upstream release

Modified: ktoon/trunk/debian/control
===================================================================
--- ktoon/trunk/debian/control	2006-07-02 03:18:46 UTC (rev 854)
+++ ktoon/trunk/debian/control	2006-07-02 19:03:35 UTC (rev 855)
@@ -2,8 +2,8 @@
 Section: graphics
 Priority: optional
 Maintainer: Juan Manuel Garcia Molina <juanma at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-dev, libaspell-dev, libaudio-dev, libungif4-dev, libavcodec-dev, libavformat-dev, libglu1-xorg-dev, libqt4-debug-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-dev, libaspell-dev, libaudio-dev, libungif4-dev, libavcodec-dev, libavformat-dev,  libglu1-xorg-dev, libqt4-debug-dev, imagemagick
+Standards-Version: 3.7.2
 
 Package: ktoon
 Architecture: any

Modified: ktoon/trunk/debian/dirs
===================================================================
--- ktoon/trunk/debian/dirs	2006-07-02 03:18:46 UTC (rev 854)
+++ ktoon/trunk/debian/dirs	2006-07-02 19:03:35 UTC (rev 855)
@@ -1,7 +1,9 @@
 usr/bin
 usr/include
 usr/lib
+usr/share/applications
 usr/share/ktoon/data
 usr/share/ktoon/plugins
 usr/share/ktoon/themes
-usr/share/lintian/overrides
\ No newline at end of file
+usr/share/lintian/overrides
+usr/share/pixmaps

Added: ktoon/trunk/debian/ktoon.desktop
===================================================================
--- ktoon/trunk/debian/ktoon.desktop	2006-07-02 03:18:46 UTC (rev 854)
+++ ktoon/trunk/debian/ktoon.desktop	2006-07-02 19:03:35 UTC (rev 855)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=KToon
+Comment=Animation
+Exec=ktoon
+Icon=/usr/share/pixmaps/ktoon.png
+Terminal=false
+Type=Application
+Categories=Application;Graphics;
\ No newline at end of file

Added: ktoon/trunk/debian/patches/00list
===================================================================
--- ktoon/trunk/debian/patches/00list	2006-07-02 03:18:46 UTC (rev 854)
+++ ktoon/trunk/debian/patches/00list	2006-07-02 19:03:35 UTC (rev 855)
@@ -0,0 +1 @@
+10_g++4fix

Added: ktoon/trunk/debian/patches/10_g++4fix
===================================================================
--- ktoon/trunk/debian/patches/10_g++4fix	2006-07-02 03:18:46 UTC (rev 854)
+++ ktoon/trunk/debian/patches/10_g++4fix	2006-07-02 19:03:35 UTC (rev 855)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_g++4fix.dpatch by Juan Manuel Garcia Molina <juanma at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build with G++ 4.
+
+ at DPATCH@
+--- ktoon-0.8.0rc1.orig/src/dlib/dgui/button.h	2006-04-20 17:57:15.000000000 +0200
++++ ktoon-0.8.0rc1/src/dlib/dgui/button.h	2006-07-02 18:42:50.000000000 +0200
+@@ -89,7 +89,7 @@
+     /**Returns the description.*/
+     QString description() const;
+     
+-    QStyleOptionButton Button::styleOption() const;
++    QStyleOptionButton styleOption() const;
+     
+     /**Sets the place of a button.*/
+     void setPlace(Ideal::Place place);

Modified: ktoon/trunk/debian/rules
===================================================================
--- ktoon/trunk/debian/rules	2006-07-02 03:18:46 UTC (rev 854)
+++ ktoon/trunk/debian/rules	2006-07-02 19:03:35 UTC (rev 855)
@@ -9,6 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -28,7 +29,7 @@
 export PATH=/usr/share/qt4/bin:/bin:/usr/bin
 export QTDIR=/usr/share/qt4
 
-config.status: configure
+config.status: patch configure
 	dh_testdir
 	# Add here commands to configure the package.
 	#CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -38,7 +39,7 @@
 
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp:  config.status patch-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -47,7 +48,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -85,6 +86,10 @@
 	rm -rf $(CURDIR)/debian/ktoon/usr/share/ktoon/lib
 	mkdir -p $(CURDIR)/usr/share/lintian/overrides
 	cp $(CURDIR)/debian/ktoon.override $(CURDIR)/debian/ktoon/usr/share/lintian/overrides/ktoon
+	mkdir -p $(CURDIR)/debian/ktoon/usr/share/applications
+	cp $(CURDIR)/debian/ktoon.desktop $(CURDIR)/debian/ktoon/usr/share/applications/ktoon.desktop
+	mkdir -p $(CURDIR)/debian/ktoon/usr/share/pixmaps
+	convert $(CURDIR)/debian/doc/common/logo.png -resize 48x48 $(CURDIR)/debian/ktoon/usr/share/pixmaps/ktoon.png
 
 
 # Build architecture-independent files here.