rev 11026 - in kde-extras/kipi-plugins/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2008-06-13 23:43:20 +0000 (Fri, 13 Jun 2008)
New Revision: 11026

Removed:
   kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff
   kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
   kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
Modified:
   kde-extras/kipi-plugins/trunk/debian/changelog
   kde-extras/kipi-plugins/trunk/debian/patches/series
   kde-extras/kipi-plugins/trunk/debian/rules
Log:
* (NOT RELEASED YET)
* New upstream release
* debian/patches/40* incorporated upstream

Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog	2008-06-13 23:37:09 UTC (rev 11025)
+++ kde-extras/kipi-plugins/trunk/debian/changelog	2008-06-13 23:43:20 UTC (rev 11026)
@@ -1,3 +1,11 @@
+kipi-plugins (0.1.6~beta1-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET)
+  * New upstream release
+  * debian/patches/40* incorporated upstream
+
+ -- Mark Purcell <msp at debian.org>  Fri, 13 Jun 2008 22:28:23 +1000
+
 kipi-plugins (0.1.5-1) unstable; urgency=low
 
   * New upstream release

Deleted: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786355_timeadjusst_fix_filestat.diff

Deleted: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff

Deleted: kde-extras/kipi-plugins/trunk/debian/patches/40_kdesvn786549_99_rawDecoding_jpeg_compression.diff

Modified: kde-extras/kipi-plugins/trunk/debian/patches/series
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/series	2008-06-13 23:37:09 UTC (rev 11025)
+++ kde-extras/kipi-plugins/trunk/debian/patches/series	2008-06-13 23:43:20 UTC (rev 11026)
@@ -1,5 +1,2 @@
 10_use-icedove-instead-of-thunderbird.diff
 20_420mpeg2.diff
-40_kdesvn786355_timeadjusst_fix_filestat.diff
-40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
-40_kdesvn786549_99_rawDecoding_jpeg_compression.diff

Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules	2008-06-13 23:37:09 UTC (rev 11025)
+++ kde-extras/kipi-plugins/trunk/debian/rules	2008-06-13 23:43:20 UTC (rev 11026)
@@ -11,6 +11,15 @@
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 
+# GCC42_HERE:= powerpc
+# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483137
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(GCC42_HERE)))
+   CC=gcc-4.2
+   CPP=cpp-4.2
+   CXX=g++-4.2
+endif
+
 clean ::
 	rm -f po/*/*.gmo