commit epiphany-extensions for openSUSE:Factory

26 Mar 2009

Hello community,

here is the log from the commit of package epiphany-extensions for openSUSE:Factory
checked in at Thu Mar 26 01:57:36 CET 2009.


--------

--- GNOME/epiphany-extensions/epiphany-extensions.changes	2009-02-18 13:01:41.000000000 +0100
+++ epiphany-extensions/epiphany-extensions.changes	2009-03-16 14:49:11.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Mar 16 14:46:16 CET 2009 - sbrabec@suse.cz
+
+- Added support for translation-update-upstream (FATE#301344).
+
+-------------------------------------------------------------------
+Sun Mar 15 19:17:32 CET 2009 - vuntz@novell.com
+
+- Update to version 2.26.0:
+  + Remove filterset.G update button from the UI for now.
+- Do not package omf files twice (they are in the lang package
+  too).
+- Remove AutoReqProv: it's default now.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  epiphany-extensions-2.25.91.tar.bz2

New:
----
  epiphany-extensions-2.26.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ epiphany-extensions.spec ++++++
--- /var/tmp/diff_new_pack.uS9087/_old	2009-03-26 01:57:10.000000000 +0100
+++ /var/tmp/diff_new_pack.uS9087/_new	2009-03-26 01:57:10.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package epiphany-extensions (Version 2.25.91)
+# spec file for package epiphany-extensions (Version 2.26.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,7 +21,7 @@
 Name:           epiphany-extensions
 %define xulrunner_version 190
 %define lang_version 2.26
-%define major_version 2.25
+%define major_version 2.26
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  epiphany
 BuildRequires:  epiphany-devel >= 2.25.0
@@ -35,14 +35,14 @@
 BuildRequires:  opensp-devel
 BuildRequires:  pcre-devel
 BuildRequires:  python-devel
-Version:        2.25.91
+BuildRequires:  translation-update-upstream
+Version:        2.26.0
 Release:        1
 Url:            http://www.gnome.org/projects/epiphany/
 Group:          Productivity/Networking/Web/Browsers
 License:        GPL v2 or later; LGPL v2.1 or later
 Summary:        Extensions Collection for Epiphany
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
-AutoReqProv:    on
 Provides:       epiphany-plugins
 Obsoletes:      epiphany-plugins
 Supplements:    epiphany
@@ -69,6 +69,7 @@
 %lang_package
 %prep
 %setup -q
+translation-update-upstream
 
 %build
 %configure \
@@ -100,13 +101,20 @@
 %defattr (-, root, root)
 %doc AUTHORS COPYING COPYING.README ChangeLog NEWS README TODO
 %{_datadir}/epiphany-extensions
-%{_datadir}/omf/epiphany-extensions
 %{_datadir}/epiphany/icons/hicolor/*/status/*.*
 %{_libdir}/epiphany/%{major_version}/extensions
 
 %files lang -f %{name}-%{lang_version}.lang
 
 %changelog
+* Mon Mar 16 2009 sbrabec@suse.cz
+- Added support for translation-update-upstream (FATE#301344).
+* Sun Mar 15 2009 vuntz@novell.com
+- Update to version 2.26.0:
+  + Remove filterset.G update button from the UI for now.
+- Do not package omf files twice (they are in the lang package
+  too).
+- Remove AutoReqProv: it's default now.
 * Tue Feb 17 2009 vuntz@novell.com
 - Update to version 2.25.91:
   + Remove engine check.

++++++ epiphany-extensions-2.25.91.tar.bz2 -> epiphany-extensions-2.26.0.tar.bz2 ++++++
++++ 4712 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/epiphany-extensions-2.25.91/ChangeLog new/epiphany-extensions-2.26.0/ChangeLog
--- old/epiphany-extensions-2.25.91/ChangeLog	2009-02-16 20:20:26.000000000 +0100
+++ new/epiphany-extensions-2.26.0/ChangeLog	2009-03-15 15:11:56.000000000 +0100
@@ -1,3 +1,71 @@
+commit 11a007fe15782aa114672bb254d60f6efdcf4d23
+Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a>
+Date:   Sun Mar 15 13:38:37 2009 +0000
+
+    Really fix ChangeLog rule
+    
+    git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1832 8bf08bfc-de25-0410-bf0f-dff8bc4d630a
+
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4cd07a343ac787d36d36d376f3fd7aaf95ccf958
+Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a>
+Date:   Sun Mar 15 13:15:07 2009 +0000
+
+    Fix ChangeLog generation
+    
+    git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1831 8bf08bfc-de25-0410-bf0f-dff8bc4d630a
+
+ Makefile.am |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ded3b974bb4126141e6a3ba94eff06520b37a807
+Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a>
+Date:   Sun Mar 15 13:12:23 2009 +0000
+
+    Remove SVN ChangeLog rule
+    
+    git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1830 8bf08bfc-de25-0410-bf0f-dff8bc4d630a
+
+ Makefile.am  |    9 +++------
+ configure.ac |   11 -----------
+ 2 files changed, 3 insertions(+), 17 deletions(-)
+
+commit 4cc417d66cedb8813eddbc561166e5460b484cdb
+Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a>
+Date:   Sat Mar 14 15:29:19 2009 +0000
+
+    Remove SVN ChangeLog rule; only keep the git one
+    
+    git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1829 8bf08bfc-de25-0410-bf0f-dff8bc4d630a
+
+ Makefile.am |    4 -
+ svn2cl.xsl  |  295 -----------------------------------------------------------
+ 2 files changed, 0 insertions(+), 299 deletions(-)
+
+commit e239c54a5617f43304aa25d31bef5290b2592e6c
+Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a>
+Date:   Sat Mar 14 15:29:12 2009 +0000
+
+    Version 2.26.0
+    
+    git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1828 8bf08bfc-de25-0410-bf0f-dff8bc4d630a
+
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 04b4b11165ca542ac72295853a04ab2aa05a75b9
+Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a>
+Date:   Sat Mar 14 15:28:56 2009 +0000
+
+    Remove filterset.G update button from the UI for now. Bug #565915
+    
+    git-svn-id: svn+ssh://svn.gnome.org/svn/epiphany-extensions/branches/gnome-2-24@1827 8bf08bfc-de25-0410-bf0f-dff8bc4d630a
+
+ extensions/adblock/adblock.glade |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
 commit d57988bc122c2a3ecca06fc19d5649ba9d0bff4b
 Author: chpe <chpe@8bf08bfc-de25-0410-bf0f-dff8bc4d630a>
 Date:   Mon Feb 16 19:20:08 2009 +0000
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/epiphany-extensions-2.25.91/configure.ac new/epiphany-extensions-2.26.0/configure.ac
--- old/epiphany-extensions-2.25.91/configure.ac	2009-02-16 19:56:55.000000000 +0100
+++ new/epiphany-extensions-2.26.0/configure.ac	2009-03-15 14:10:25.000000000 +0100
@@ -15,13 +15,10 @@
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 m4_define([e_e_version_major],[2])
-m4_define([e_e_version_minor],[25])
-m4_define([e_e_version_micro],[91])
+m4_define([e_e_version_minor],[26])
+m4_define([e_e_version_micro],[0])
 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"
-m4_define([e_e_branch],["branches/gnome-2-24"])
-
 AC_INIT([GNOME Web Browser Extensions],[e_e_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany-extensions],[epiphany-extensions])
 
 EPIPHANY_API_VERSION=2.26
@@ -380,14 +377,6 @@
   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])
-
 # *******************************
 # *******************************
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/epiphany-extensions-2.25.91/extensions/adblock/adblock.glade new/epiphany-extensions-2.26.0/extensions/adblock/adblock.glade
--- old/epiphany-extensions-2.25.91/extensions/adblock/adblock.glade	2008-05-18 19:37:38.000000000 +0200
+++ new/epiphany-extensions-2.26.0/extensions/adblock/adblock.glade	2009-03-14 15:46:45.000000000 +0100
@@ -271,7 +271,6 @@
 
 		      <child>
 			<widget class="GtkHBox" id="hbox3">
-			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">5</property>
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/epiphany-extensions-2.25.91/gnome-doc-utils.make new/epiphany-extensions-2.26.0/gnome-doc-utils.make
--- old/epiphany-extensions-2.25.91/gnome-doc-utils.make	2009-01-25 19:16:45.000000000 +0100
+++ new/epiphany-extensions-2.26.0/gnome-doc-utils.make	2009-03-15 15:10:28.000000000 +0100
@@ -504,14 +504,13 @@
 install-doc-figs:
 	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
 	  for lc in C $(_DOC_REAL_LINGUAS); do \
+	    figsymlink=false; \
 	    if test -f "$$lc/$$fig"; then \
 	      figfile="$$lc/$$fig"; \
 	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
 	      figfile="$(srcdir)/$$lc/$$fig"; \
-	    elif test -f "C/$$fig"; then \
-	      figfile="C/$$fig"; \
 	    else \
-	      figfile="$(srcdir)/C/$$fig"; \
+	      figsymlink=true; \
 	    fi; \
 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
@@ -520,8 +519,13 @@
 	      $(mkinstalldirs) "$$figdir"; \
 	    fi; \
 	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	    $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
+	    if $$figsymlink; then \
+	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
+	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
+	    else \
+	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
+	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
+	    fi; \
 	  done; \
 	done
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/epiphany-extensions-2.25.91/m4/gnome-doc-utils.m4 new/epiphany-extensions-2.26.0/m4/gnome-doc-utils.m4
--- old/epiphany-extensions-2.25.91/m4/gnome-doc-utils.m4	2009-01-25 19:16:45.000000000 +0100
+++ new/epiphany-extensions-2.26.0/m4/gnome-doc-utils.m4	2009-03-15 15:10:28.000000000 +0100
@@ -36,7 +36,8 @@
 # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
 #
 AC_DEFUN([GNOME_DOC_INIT],
-[
+[AC_REQUIRE([AC_PROG_LN_S])dnl
+
 ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
 
 PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/epiphany-extensions-2.25.91/m4/intltool.m4 new/epiphany-extensions-2.26.0/m4/intltool.m4
--- old/epiphany-extensions-2.25.91/m4/intltool.m4	2009-01-25 19:16:45.000000000 +0100
+++ new/epiphany-extensions-2.26.0/m4/intltool.m4	2009-03-15 15:10:27.000000000 +0100
@@ -171,7 +171,7 @@
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
        AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
     fi
     rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/epiphany-extensions-2.25.91/Makefile.am new/epiphany-extensions-2.26.0/Makefile.am
--- old/epiphany-extensions-2.25.91/Makefile.am	2008-09-22 20:40:10.000000000 +0200
+++ new/epiphany-extensions-2.26.0/Makefile.am	2009-03-15 14:38:22.000000000 +0100
@@ -30,16 +30,11 @@
 	--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 \
+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
 
+dist: ChangeLog
+
 .PHONY: ChangeLog


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)