r39371 - in /desktop/experimental/clutter-1.0/debian: changelog patches/fix_test_data_path.patch patches/git_cally_weak_pointer.patch patches/git_fbo_size_check.patch patches/git_limit_offscreen_fbo_size.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Aug 28 11:55:13 2013
New Revision: 39371

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39371
Log:
* Unfuzz fix_test_data_path.patch
* Drop patches from upstream now included in release:
  - git_limit_offscreen_fbo_size.patch
  - git_fbo_size_check.patch
  - git_cally_weak_pointer.patch

Removed:
    desktop/experimental/clutter-1.0/debian/patches/git_cally_weak_pointer.patch
    desktop/experimental/clutter-1.0/debian/patches/git_fbo_size_check.patch
    desktop/experimental/clutter-1.0/debian/patches/git_limit_offscreen_fbo_size.patch
Modified:
    desktop/experimental/clutter-1.0/debian/changelog
    desktop/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch
    desktop/experimental/clutter-1.0/debian/patches/series

Modified: desktop/experimental/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/changelog?rev=39371&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/changelog	[utf-8] Wed Aug 28 11:55:13 2013
@@ -4,6 +4,11 @@
   * Bump build-dependencies according to configure.ac
     - libcogl-dev (>= 1.15.1)
     - libglib2.0-dev (>= 2.37.3)
+  * Unfuzz fix_test_data_path.patch
+  * Drop patches from upstream now included in release:
+    - git_limit_offscreen_fbo_size.patch
+    - git_fbo_size_check.patch
+    - git_cally_weak_pointer.patch
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 27 Aug 2013 16:06:33 +0200
 

Modified: desktop/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch?rev=39371&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch	[utf-8] Wed Aug 28 11:55:13 2013
@@ -2,11 +2,9 @@
  their data files when they run.
 Author: Alexandros Frantzis <alexandros.frantzis at linaro.org>
 Last-Update: 2010-06-28
-Index: clutter-1.11.4/tests/interactive/Makefile.am
-===================================================================
---- clutter-1.11.4.orig/tests/interactive/Makefile.am	2012-06-06 05:47:44.000000000 +1200
-+++ clutter-1.11.4/tests/interactive/Makefile.am	2012-06-08 16:07:23.368419687 +1200
-@@ -149,7 +149,7 @@
+--- a/tests/interactive/Makefile.am
++++ b/tests/interactive/Makefile.am
+@@ -148,7 +148,7 @@
  nodist_test_interactive_SOURCES = test-unit-names.h
  test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS)
  test_interactive_CPPFLAGS = \
@@ -14,4 +12,4 @@
 +	-DTESTS_DATADIR=\""/usr/share/clutter-1.0/tests/data"\" \
  	-DG_DISABLE_SINGLE_INCLUDES \
  	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
- 	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
+ 	-DCOGL_DISABLE_DEPRECATION_WARNINGS \

Modified: desktop/experimental/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/patches/series?rev=39371&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/patches/series	[utf-8] Wed Aug 28 11:55:13 2013
@@ -1,4 +1 @@
 fix_test_data_path.patch
-git_limit_offscreen_fbo_size.patch
-git_fbo_size_check.patch
-git_cally_weak_pointer.patch