rev 11095 - kde-extras/digikam/trunk/debian

[Mark Purcell]

Author: msp
Date: 2008-06-21 05:41:22 +0000 (Sat, 21 Jun 2008)
New Revision: 11095

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/rules
Log:
* Fixed-upstream:
  - digikam crashes when using light table (Closes: #437021)
  - digikam fails to build with gcc-4.3 on powerpc -
  libgreycstoration_la.all_cpp.lo (Closes: #483137)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2008-06-21 05:26:44 UTC (rev 11094)
+++ kde-extras/digikam/trunk/debian/changelog	2008-06-21 05:41:22 UTC (rev 11095)
@@ -2,6 +2,10 @@
 
   * NOT RELEASED YET
   * New upstream release
+  * Fixed-upstream:
+    - digikam crashes when using light table (Closes: #437021)
+    - digikam fails to build with gcc-4.3 on powerpc -
+    libgreycstoration_la.all_cpp.lo (Closes: #483137)
 
  -- Mark Purcell <msp at debian.org>  Sat, 21 Jun 2008 15:25:31 +1000
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2008-06-21 05:26:44 UTC (rev 11094)
+++ kde-extras/digikam/trunk/debian/control	2008-06-21 05:41:22 UTC (rev 11095)
@@ -7,7 +7,6 @@
  libtiff4-dev, libgphoto2-2-dev, libkipi0-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev (>= 0.16),
- gcc-4.2 [powerpc], g++-4.2 [powerpc],
  libkdcraw-dev (>= 0.1.4)
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk/

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2008-06-21 05:26:44 UTC (rev 11094)
+++ kde-extras/digikam/trunk/debian/rules	2008-06-21 05:41:22 UTC (rev 11095)
@@ -7,15 +7,6 @@
 
 TARBALL_EXT=tar.bz2
 
-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
-
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp