r24953 - in /packages/unstable/clutter-1.0/debian: changelog patches/02_disable_armv5t_specific_optimization.patch patches/series rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Aug  7 00:31:46 2010
New Revision: 24953

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24953
Log:
* Acknowledge 1.0.8-1.1 NMU, thanks gregor herrmann and Heiko Stuebner.
  Closes: #580106
* debian/patches/0002-fix-spelling-errors.patch:
  - Removed, fixed upstream.
* debian/patches/0001-disable-armv5t-specific-optimization.patch:
  - Renamed to 02_disable_armv5t_specific_optimization.patch.
    Also don't comment all the code in the #if block, just change 
    #if __arm__ to #if 0.
* Non-maintainer upload.
* 0001-disable-armv5t-specific-optimization.patch:
  Fix armv4t compatiblity (Closes: #580106)
* 0002-fix-spelling-errors.patch:
  Fix spelling errors causing a failing build (Closes: #583465)

Added:
    packages/unstable/clutter-1.0/debian/patches/02_disable_armv5t_specific_optimization.patch
Modified:
    packages/unstable/clutter-1.0/debian/changelog
    packages/unstable/clutter-1.0/debian/patches/series
    packages/unstable/clutter-1.0/debian/rules

Modified: packages/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/changelog?rev=24953&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/changelog [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/changelog [utf-8] Sat Aug  7 00:31:46 2010
@@ -1,3 +1,16 @@
+clutter-1.0 (1.2.12-3) unstable; urgency=low
+
+  * Acknowledge 1.0.8-1.1 NMU, thanks gregor herrmann and Heiko Stuebner.
+    Closes: #580106
+  * debian/patches/0002-fix-spelling-errors.patch:
+    - Removed, fixed upstream.
+  * debian/patches/0001-disable-armv5t-specific-optimization.patch:
+    - Renamed to 02_disable_armv5t_specific_optimization.patch.
+      Also don't comment all the code in the #if block, just change 
+      #if __arm__ to #if 0.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 07 Aug 2010 00:54:09 +0200
+
 clutter-1.0 (1.2.12-2) unstable; urgency=low
 
   * Fix build on !linux
@@ -60,6 +73,19 @@
     - GNOMEify.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 21 Mar 2010 13:27:56 +0100
+
+clutter-1.0 (1.0.8-1.1) unstable; urgency=low
+
+  [ gregor herrmann ]
+  * Non-maintainer upload.
+
+  [ Heiko Stuebner ]
+  * 0001-disable-armv5t-specific-optimization.patch:
+    Fix armv4t compatiblity (Closes: #580106)
+  * 0002-fix-spelling-errors.patch:
+    Fix spelling errors causing a failing build (Closes: #583465)
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 02 Jul 2010 01:01:58 +0200
 
 clutter-1.0 (1.0.8-1) unstable; urgency=low
 

Added: packages/unstable/clutter-1.0/debian/patches/02_disable_armv5t_specific_optimization.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/patches/02_disable_armv5t_specific_optimization.patch?rev=24953&op=file
==============================================================================
--- packages/unstable/clutter-1.0/debian/patches/02_disable_armv5t_specific_optimization.patch (added)
+++ packages/unstable/clutter-1.0/debian/patches/02_disable_armv5t_specific_optimization.patch [utf-8] Sat Aug  7 00:31:46 2010
@@ -1,0 +1,14 @@
+Bug: http://bugzilla.clutter-project.org/show_bug.cgi?id=2256
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=580106
+
+--- a/clutter/cogl/cogl/cogl-fixed.c
++++ b/clutter/cogl/cogl/cogl-fixed.c
+@@ -626,7 +626,7 @@
+ 	/*
+ 	 * Find the highest bit set
+ 	 */
+-#if __arm__
++#if 0
+ 	/* This actually requires at least arm v5, but gcc does not seem
+ 	 * to set the architecture defines correctly, and it is I think
+ 	 * very unlikely that anyone will want to use clutter on anything

Modified: packages/unstable/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/patches/series?rev=24953&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/patches/series [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/patches/series [utf-8] Sat Aug  7 00:31:46 2010
@@ -1,2 +1,3 @@
 01_fix_build_on_not_linux.patch
+02_disable_armv5t_specific_optimization.patch
 90_autoreconf.patch

Modified: packages/unstable/clutter-1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/rules?rev=24953&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/rules [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/rules [utf-8] Sat Aug  7 00:31:46 2010
@@ -16,10 +16,6 @@
 				--enable-introspection=yes	\
 				--with-json=system
 
-CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-ifeq ($(CPU),arm)
-CFLAGS += -march=armv5t
-endif
 
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
 	dh_girepository -p$(cdbs_curpkg)