r18622 - in /desktop/experimental/epiphany-webkit/debian: changelog patches/15_webkit_temporary_gettext_domain_rename.patch patches/99_autoreconf.patch patches/series

kov at users.alioth.debian.org kov at users.alioth.debian.org
Tue Mar 3 21:41:29 UTC 2009 

Author: kov
Date: Tue Mar  3 21:41:29 2009
New Revision: 18622

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18622
Log:
rename gettext package name; update autoreconf accordingly

Added:
    desktop/experimental/epiphany-webkit/debian/patches/15_webkit_temporary_gettext_domain_rename.patch
Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch
    desktop/experimental/epiphany-webkit/debian/patches/series

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=18622&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog Tue Mar  3 21:41:29 2009
@@ -20,6 +20,9 @@
   * 14_webkit_temporary_gconf_rename.patch:
   - patch to rename all gconf keys used by epiphany, to allow sane
     parallel installation with the gecko version
+  * 15_webkit_temporary_gettext_domain_rename.patch:
+  - patch to make epiphany look for translations in epiphany-webkit.mo
+    files instead of epiphany.mo
   * debian/epiphany-webkit-data.gconf-defaults, debian/rules: updated
     accordingly
 

Added: desktop/experimental/epiphany-webkit/debian/patches/15_webkit_temporary_gettext_domain_rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/15_webkit_temporary_gettext_domain_rename.patch?rev=18622&op=file
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/15_webkit_temporary_gettext_domain_rename.patch (added)
+++ desktop/experimental/epiphany-webkit/debian/patches/15_webkit_temporary_gettext_domain_rename.patch Tue Mar  3 21:41:29 2009
@@ -1,0 +1,13 @@
+Index: epiphany-webkit-2.27.0~svn.8831/configure.ac
+===================================================================
+--- epiphany-webkit-2.27.0~svn.8831.orig/configure.ac	2009-03-03 17:32:43.000000000 -0300
++++ epiphany-webkit-2.27.0~svn.8831/configure.ac	2009-03-03 17:34:47.000000000 -0300
+@@ -477,7 +477,7 @@
+ 	AC_MSG_ERROR([iso-codes is required])
+ fi
+ 
+-GETTEXT_PACKAGE=epiphany
++GETTEXT_PACKAGE=epiphany-webkit
+ AC_SUBST([GETTEXT_PACKAGE])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+ AM_GLIB_GNU_GETTEXT

Modified: desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch?rev=18622&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/99_autoreconf.patch Tue Mar  3 21:41:29 2009
@@ -2,10 +2,10 @@
 aclocal-1.10 -I m4
 automake-1.10
 autoconf
-Index: epiphany-webkit-2.27.0~svn.8837/configure
+Index: epiphany-webkit-2.27.0~svn.8831/configure
 ===================================================================
---- epiphany-webkit-2.27.0~svn.8837.orig/configure	2009-03-03 10:52:39.000000000 -0300
-+++ epiphany-webkit-2.27.0~svn.8837/configure	2009-03-03 11:36:52.000000000 -0300
+--- epiphany-webkit-2.27.0~svn.8831.orig/configure	2009-03-03 17:31:12.000000000 -0300
++++ epiphany-webkit-2.27.0~svn.8831/configure	2009-03-03 17:35:30.000000000 -0300
 @@ -749,7 +749,7 @@
  
  # Identity of this package.
@@ -33,10 +33,19 @@
   VERSION='2.27.0'
  
  
-Index: epiphany-webkit-2.27.0~svn.8837/lib/Makefile.in
+@@ -25681,7 +25681,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-GETTEXT_PACKAGE=epiphany
++GETTEXT_PACKAGE=epiphany-webkit
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+Index: epiphany-webkit-2.27.0~svn.8831/lib/Makefile.in
 ===================================================================
---- epiphany-webkit-2.27.0~svn.8837.orig/lib/Makefile.in	2009-03-03 10:52:36.000000000 -0300
-+++ epiphany-webkit-2.27.0~svn.8837/lib/Makefile.in	2009-03-03 11:36:56.000000000 -0300
+--- epiphany-webkit-2.27.0~svn.8831.orig/lib/Makefile.in	2009-03-03 17:31:12.000000000 -0300
++++ epiphany-webkit-2.27.0~svn.8831/lib/Makefile.in	2009-03-03 17:35:34.000000000 -0300
 @@ -397,7 +397,7 @@
  	-I$(top_srcdir)/lib/egg			\
  	-DDATADIR="\"$(datadir)\""		\
@@ -46,10 +55,10 @@
  	$(AM_CPPFLAGS)
  
  libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-webkit-2.27.0~svn.8837/ltmain.sh
+Index: epiphany-webkit-2.27.0~svn.8831/ltmain.sh
 ===================================================================
---- epiphany-webkit-2.27.0~svn.8837.orig/ltmain.sh	2009-02-11 06:34:16.000000000 -0200
-+++ epiphany-webkit-2.27.0~svn.8837/ltmain.sh	2008-04-29 18:33:55.000000000 -0300
+--- epiphany-webkit-2.27.0~svn.8831.orig/ltmain.sh	2009-03-03 17:31:12.000000000 -0300
++++ epiphany-webkit-2.27.0~svn.8831/ltmain.sh	2008-04-29 18:33:55.000000000 -0300
 @@ -43,8 +43,8 @@
  
  PROGRAM=ltmain.sh
@@ -85,10 +94,10 @@
  	  esac
  	  ;;
  	no)
-Index: epiphany-webkit-2.27.0~svn.8837/src/Makefile.in
+Index: epiphany-webkit-2.27.0~svn.8831/src/Makefile.in
 ===================================================================
---- epiphany-webkit-2.27.0~svn.8837.orig/src/Makefile.in	2009-03-03 10:52:37.000000000 -0300
-+++ epiphany-webkit-2.27.0~svn.8837/src/Makefile.in	2009-03-03 11:36:57.000000000 -0300
+--- epiphany-webkit-2.27.0~svn.8831.orig/src/Makefile.in	2009-03-03 17:31:12.000000000 -0300
++++ epiphany-webkit-2.27.0~svn.8831/src/Makefile.in	2009-03-03 17:35:35.000000000 -0300
 @@ -507,8 +507,8 @@
  	-I$(top_srcdir)/lib/egg		\
  	-I$(top_srcdir)/lib/widgets   	\

Modified: desktop/experimental/epiphany-webkit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/series?rev=18622&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/series (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/series Tue Mar  3 21:41:29 2009
@@ -10,5 +10,6 @@
 12_safetypes.patch
 13_gtk-doc_fix.patch
 14_webkit_temporary_gconf_rename.patch
+15_webkit_temporary_gettext_domain_rename.patch
 99_autoreconf.patch
 99_ltmain_as-needed.patch

More information about the pkg-gnome-commits mailing list