[maemo-commits] [maemo-commits] r17659 - projects/haf/trunk/clutter

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-03-12 18:29:42 +0200 (Thu, 12 Mar 2009)
New Revision: 17659

Added:
   projects/haf/trunk/clutter/fix-upstream-tarball-configure.patch
   projects/haf/trunk/clutter/fix-upstream-tarball-makefile.patch
Removed:
   projects/haf/trunk/clutter/fix-makefile.am
   projects/haf/trunk/clutter/remove-doc-and-po
Modified:
   projects/haf/trunk/clutter/fix-upstream-tarball.sh
Log:
rename files prettier


Deleted: projects/haf/trunk/clutter/fix-makefile.am
===================================================================
--- projects/haf/trunk/clutter/fix-makefile.am	2009-03-12 16:28:05 UTC (rev 17658)
+++ projects/haf/trunk/clutter/fix-makefile.am	2009-03-12 16:29:42 UTC (rev 17659)
@@ -1,20 +0,0 @@
---- clutter/Makefile.am	2009-03-12 14:42:09.000000000 +0200
-+++ ../clutter-tmp/clutter/build-tree/clutter-0.9/Makefile.am	2009-03-12 17:49:03.000000000 +0200
-@@ -1,12 +1,12 @@
- NULL =
- 
--SUBDIRS = build clutter tests po
-+SUBDIRS = build clutter tests
- 
--if BUILD_GTK_DOC
--SUBDIRS += doc
--endif
-+#if BUILD_GTK_DOC
-+#SUBDIRS += doc
-+#endif
- 
--DIST_SUBDIRS = build clutter tests doc po
-+DIST_SUBDIRS = build clutter tests
- 
- ACLOCAL_AMFLAGS = -I build/autotools
- 

Copied: projects/haf/trunk/clutter/fix-upstream-tarball-configure.patch (from rev 17658, projects/haf/trunk/clutter/remove-doc-and-po)

Copied: projects/haf/trunk/clutter/fix-upstream-tarball-makefile.patch (from rev 17658, projects/haf/trunk/clutter/fix-makefile.am)

Modified: projects/haf/trunk/clutter/fix-upstream-tarball.sh
===================================================================
--- projects/haf/trunk/clutter/fix-upstream-tarball.sh	2009-03-12 16:28:05 UTC (rev 17658)
+++ projects/haf/trunk/clutter/fix-upstream-tarball.sh	2009-03-12 16:29:42 UTC (rev 17659)
@@ -4,8 +4,8 @@
 
 mv $BASENAME.tar.gz orig-$BASENAME.tar.gz
 tar xzf orig-$BASENAME.tar.gz
-patch -p0 < fix-makefile.am
-patch -p0 < remove-doc-and-po
+patch -p0 < fix-upstream-tarball-makefile.patch
+patch -p0 < fix-upstream-tarball-configure.patch
 cd clutter
 ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 autoreconf -i -f
 cd ..

Deleted: projects/haf/trunk/clutter/remove-doc-and-po
===================================================================
--- projects/haf/trunk/clutter/remove-doc-and-po	2009-03-12 16:28:05 UTC (rev 17658)
+++ projects/haf/trunk/clutter/remove-doc-and-po	2009-03-12 16:29:42 UTC (rev 17659)
@@ -1,18 +0,0 @@
---- clutter/configure.ac	2009-03-12 14:42:09.000000000 +0200
-+++ ../clutter-tmp/clutter/build-tree/clutter-0.9/configure.ac	2009-03-12 17:50:16.000000000 +0200
-@@ -697,15 +697,6 @@ AC_CONFIG_FILES([
-         tests/interactive/Makefile
-         tests/micro-bench/Makefile
-         tests/tools/Makefile
--        doc/Makefile
--        doc/reference/Makefile
--        doc/reference/clutter/Makefile
--        doc/reference/clutter/version.xml
--        doc/reference/cogl/Makefile
--        doc/reference/cogl/version.xml
--        doc/manual/clutter-manual.xml
--        doc/manual/Makefile
--        po/Makefile.in
-         clutter.pc
- ])
-