Freeze exception for clutter 1.2.12-3
Hi,
I'm uploading a new revision of clutter that fixes an RC bug. The
debdiff is minimal as you can see below. Please let it migrate.
Thanks,
Emilio
Index: debian/patches/series
===================================================================
--- debian/patches/series (revisión: 24814)
+++ debian/patches/series (copia de trabajo)
@@ -1,2 +1,3 @@
01_fix_build_on_not_linux.patch
+02_disable_armv5t_specific_optimization.patch
90_autoreconf.patch
Index: debian/patches/02_disable_armv5t_specific_optimization.patch
===================================================================
--- debian/patches/02_disable_armv5t_specific_optimization.patch (revisión: 0)
+++ debian/patches/02_disable_armv5t_specific_optimization.patch (revisión: 0)
@@ -0,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
Index: debian/changelog
===================================================================
--- debian/changelog (revisión: 24816)
+++ debian/changelog (copia de trabajo)
@@ -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@debian.org> Sat, 07 Aug 2010 00:54:09 +0200
+
clutter-1.0 (1.2.12-2) unstable; urgency=low
* Fix build on !linux
@@ -61,6 +74,19 @@
-- Emilio Pozuelo Monfort <pochu@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@debian.org> Fri, 02 Jul 2010 01:01:58 +0200
+
clutter-1.0 (1.0.8-1) unstable; urgency=low
* New upstream release
Index: debian/rules
===================================================================
--- debian/rules (revisión: 24806)
+++ debian/rules (copia de trabajo)
@@ -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)
Reply to: