[epiphany-extensions] release: 2.29.6

[Diego Escalante Urrelo <diegoe src gnome org>]

commit 037f7507c4d86abbf3049f357a134a2775d4e6f8
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Thu Jan 28 13:16:20 2010 -0500

    release: 2.29.6
    
    Remove lot of cruft from build files and prepare for release.

 Makefile.am         |    9 ---------
 NEWS                |   36 ++++++++++++++++++++++++++++++++++++
 configure.ac        |   14 +++-----------
 include/Makefile.am |   14 ++++----------
 po/POTFILES.in      |    2 +-
 5 files changed, 44 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0347242..a3b7c37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,21 +25,12 @@ DISTCLEANFILES = 		\
 	$(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--with-extensions=really-all	\
-	--with-gecko=$(MOZILLA)		\
 	--disable-scrollkeeper		\
 	--disable-schemas-install
 
-# Build ChangeLog from SVN history (r1572 was the first ChangeLog-less checkin).
-# Only build this when in an svn checkout.
-
 ChangeLog:
 	if test -f $(top_srcdir)/.git/HEAD; then \
 		git log --stat > $@; \
-	elif test -f $(top_srcdir)/.svn/entries; then \
-		svn log -v --xml -r HEAD:1572 $(SVN_ROOT)/$(SVN_MODULE)/$(SVN_BRANCH) | \
-			xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
-				 --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \
 	fi
 
 .PHONY: ChangeLog
diff --git a/NEWS b/NEWS
index 2ba9b96..97250d8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,40 @@
 ==========================
+Epiphany Extensions 2.29.6
+==========================
+
+This release updates most extensions to work with Epiphany master, highlights
+are the return of gestures, rss and the new youtube-to-html5 extension.
+
+New extension:
+    - html5tube: view YouTube videos without Flash, using the internal media
+      player.
+
+Re-enabled extensions:
+    - Re-enable gestures extension.
+    - Re-enable rss extension.
+
+Changes and fixes:
+    - push-scroller: don't jump on drag-start.
+    - push-scroller: avoid eating middle-clicks for paste-open urls.
+    - rss: fix a crasher when showing the subscription dialog a second time.
+    - rss: don't show subscribe button for every link.
+    - greasemonkey: don't show install user script button for every link.
+
+Added/updated translations:
+    - bn_IN, courtesy of Runa Bhattacharjee
+    - ca, courtesy of David Planella
+    - de, courtesy of Christian Kirbach
+    - de, courtesy of Mario Blättermann
+    - gu, courtesy of Sweta Kothari
+    - kn, courtesy of Shankar Prasad
+    - or, courtesy of Manoj Kumar Giri
+    - pt_BR, courtesy of Djavan Fagundes
+    - ro, courtesy of MiÈ?u Moldovan
+    - sl, courtesy of Andrej ŽnidarÅ¡iÄ?
+    - ta, courtesy of I. Felix
+    - te, courtesy of Krishna Babu K
+
+==========================
 Epiphany Extensions 2.28.0
 ==========================
 
diff --git a/configure.ac b/configure.ac
index 7185516..3549380 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 m4_define([e_e_version_major],[2])
 m4_define([e_e_version_minor],[29])
-m4_define([e_e_version_micro],[5])
+m4_define([e_e_version_micro],[6])
 m4_define([e_e_version],[e_e_version_major.e_e_version_minor.e_e_version_micro])
 
 # This can be either "trunk" or "branches/gnome-x-y"
@@ -172,8 +172,8 @@ AM_CONDITIONAL([HAVE_OPENSP],[test "x$enable_opensp" = "xyes"])
 AC_MSG_CHECKING([which extensions to build])
 
 ALL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures greasemonkey html5tube java-console livehttpheaders page-info permissions push-scroller rss sample select-stylesheet sidebar smart-bookmarks soup-fly tab-groups tab-states"
-USEFUL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui html5tube java-console page-info push-scroller select-stylesheet smart-bookmarks soup-fly tab-groups tab-states"
-DEFAULT_EXTENSIONS="actions adblock auto-scroller certificates error-viewer extensions-manager-ui html5tube java-console page-info push-scroller select-stylesheet smart-bookmarks soup-fly tab-groups tab-states greasemonkey rss"
+USEFUL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates extensions-manager-ui html5tube java-console page-info push-scroller select-stylesheet smart-bookmarks soup-fly tab-groups tab-states"
+DEFAULT_EXTENSIONS="actions adblock auto-reload auto-scroller certificates extensions-manager-ui greasemonkey gestures html5tube push-scroller soup-fly tab-groups tab-states rss"
 
 MOZILLA_ALL_EXTENSIONS="error-viewer java-console livehttpheaders page-info select-stylesheet smart-bookmarks"
 
@@ -267,14 +267,6 @@ else
   AC_DEFINE_UNQUOTED([EXTENSIONS_DATA_DIR], ["${datadir}/${PACKAGE}-${EPIPHANY_EXTENSIONS_MAJOR}"], [Directory of data files])
 fi
 
-# ****************************
-# SVN for ChangeLog generation
-# ****************************
-
-AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
-AC_SUBST([SVN_MODULE],[epiphany-extensions])
-AC_SUBST([SVN_BRANCH],[e_e_branch])
-
 # **************************
 # gtk-builder-convert binary
 # **************************
diff --git a/include/Makefile.am b/include/Makefile.am
index 1d9a45a..6b2cc5f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,17 +1,11 @@
 SUBDIRS =
 
 EXTRA_DIST =				\
-	EphyUtils.h			\
-	ephy-bookmarks-menu.h		\
+	eel-gconf-extensions.h		\
 	ephy-debug.h			\
-	ephy-embed-dialog.h		\
+	ephy-dnd.h              \
+	ephy-file-chooser.h		\
 	ephy-file-helpers.h		\
-	eel-gconf-extensions.h		\
-	egg-editable-toolbar.h		\
-	egg-toolbars-model.h		\
-	ephy-favicon-cache.h		\
 	ephy-gui.h			\
 	ephy-prefs.h			\
-	ephy-file-chooser.h		\
-	ephy-string.h			\
-	ephy-dnd.h
+	ephy-string.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 00d12b0..03da59e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,7 +32,7 @@ extensions/permissions/ephy-permissions-dialog.c
 extensions/permissions/ephy-permissions-extension.c
 extensions/rss/ephy-rss-extension.c
 extensions/rss/rss-ui.c
-extensions/rss/rss-ui.glade
+extensions/rss/rss-ui.ui
 extensions/select-stylesheet/ephy-css-menu.c
 extensions/select-stylesheet/mozilla/mozilla-helpers.cpp
 extensions/sidebar/ephy-sidebar.c