SOURCES (AC-branch): epiphany-configure.patch (NEW), epiphany-desk...

[baggins]

Author: baggins                      Date: Mon May 15 16:04:21 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   epiphany-configure.patch (NONE -> 1.2.4.1)  (NEW), epiphany-desktop.patch (1.3 -> 1.3.4.1) 

---- Diffs:

================================================================
Index: SOURCES/epiphany-configure.patch
diff -u /dev/null SOURCES/epiphany-configure.patch:1.2.4.1
--- /dev/null	Mon May 15 18:04:21 2006
+++ SOURCES/epiphany-configure.patch	Mon May 15 18:04:16 2006
@@ -0,0 +1,17 @@
+diff -aurN epiphany-1.9.6.orig/configure.ac epiphany-1.9.6/configure.ac
+--- epiphany-1.9.6.orig/configure.ac	2006-01-30 22:30:55.000000000 +0100
++++ epiphany-1.9.6/configure.ac	2006-02-01 18:11:03.231476000 +0100
+@@ -450,11 +430,11 @@
+ 	AC_MSG_RESULT([$PYGTK_DEFSDIR])
+ 
+ 	AC_MSG_CHECKING([for pygtk codegen])
+-	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
++	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.pyc"
+ 	AC_MSG_RESULT([$PYGTK_CODEGEN])
+ 
+ 	AC_MSG_CHECKING([for pygtk h2def])
+-	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
++	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.pyc"
+ 	AC_MSG_RESULT([$PYGTK_H2DEF])
+ 	
+ 	AC_SUBST([PYGTK_DEFSDIR])

================================================================
Index: SOURCES/epiphany-desktop.patch
diff -u SOURCES/epiphany-desktop.patch:1.3 SOURCES/epiphany-desktop.patch:1.3.4.1
--- SOURCES/epiphany-desktop.patch:1.3	Mon Mar 14 11:19:43 2005
+++ SOURCES/epiphany-desktop.patch	Mon May 15 18:04:16 2006
@@ -1,30 +1,19 @@
-diff -aurN epiphany-1.3.0.orig/data/bme.desktop.in epiphany-1.3.0/data/bme.desktop.in
---- epiphany-1.3.0.orig/data/bme.desktop.in	2003-07-02 19:56:40.000000000 +0200
-+++ epiphany-1.3.0/data/bme.desktop.in	2004-06-12 12:12:42.642358200 +0200
-@@ -11,4 +11,4 @@
- X-GNOME-Bugzilla-Bugzilla=GNOME
+diff -aurN epiphany-1.9.5.1.orig/data/bme.desktop.in.in epiphany-1.9.5.1/data/bme.desktop.in.in
+--- epiphany-1.9.5.1.orig/data/bme.desktop.in.in	2005-11-29 13:53:29.000000000 +0100
++++ epiphany-1.9.5.1/data/bme.desktop.in.in	2006-01-29 22:11:47.933612000 +0100
+@@ -12,4 +12,4 @@
  X-GNOME-Bugzilla-Product=epiphany
  X-GNOME-Bugzilla-Component=General
+ X-GNOME-Bugzilla-Version=@VERSION@
 -Categories=Application;Network;GNOME;GTK;
 +Categories=GNOME;GTK;Network;
-diff -aurN epiphany-1.3.0.orig/data/epiphany.desktop.in epiphany-1.3.0/data/epiphany.desktop.in
---- epiphany-1.3.0.orig/data/epiphany.desktop.in	2003-07-02 19:56:40.000000000 +0200
-+++ epiphany-1.3.0/data/epiphany.desktop.in	2004-06-12 12:17:22.643791512 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Epiphany Web Browser
-+_Name=Epiphany
- _GenericName=Web Browser
--_Comment=Browse the web
-+_Comment=Web Browser
- Exec=epiphany %U
- StartupNotify=true
- Terminal=false
-@@ -11,5 +11,5 @@
- X-GNOME-Bugzilla-Bugzilla=GNOME
+diff -aurN epiphany-1.9.5.1.orig/data/epiphany.desktop.in.in epiphany-1.9.5.1/data/epiphany.desktop.in.in
+--- epiphany-1.9.5.1.orig/data/epiphany.desktop.in.in	2005-11-29 13:53:29.000000000 +0100
++++ epiphany-1.9.5.1/data/epiphany.desktop.in.in	2006-01-29 22:12:59.123612000 +0100
+@@ -12,5 +12,5 @@
  X-GNOME-Bugzilla-Product=epiphany
  X-GNOME-Bugzilla-Component=General
+ X-GNOME-Bugzilla-Version=@VERSION@
 -Categories=Application;Network;GNOME;GTK;WebBrowser;
 +Categories=GNOME;GTK;Network;WebBrowser;
  MimeType=text/html;text/xml;application/xhtml+xml;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/epiphany-desktop.patch?r1=1.3&r2=1.3.4.1&f=u