r18367 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in epiphany-browser.README.Debian epiphany-webkit.links epiphany-webkit.menu epiphany-webkit.postinst epiphany-webkit.prerm rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Feb 15 01:15:08 UTC 2009 

Author: joss
Date: Sun Feb 15 01:15:08 2009
New Revision: 18367

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18367
Log:
Drop epiphany-webkit build for now as it has gone away from the 2.24 
branch. Don’t worry, it will be soon back for good in experimental.

Removed:
    desktop/experimental/epiphany-browser/debian/epiphany-webkit.links
    desktop/experimental/epiphany-browser/debian/epiphany-webkit.menu
    desktop/experimental/epiphany-browser/debian/epiphany-webkit.postinst
    desktop/experimental/epiphany-browser/debian/epiphany-webkit.prerm
Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/control
    desktop/experimental/epiphany-browser/debian/control.in
    desktop/experimental/epiphany-browser/debian/epiphany-browser.README.Debian
    desktop/experimental/epiphany-browser/debian/rules

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=18367&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Sun Feb 15 01:15:08 2009
@@ -13,6 +13,8 @@
   * 10_smart_bookmarks.patch: new patch to fix the smart bookmarks 
     behavior. Always use the text from the entry to initiate a search, 
     and fill it automatically when using middle-click.
+  * Drop epiphany-webkit build for now as it has gone away from the 2.24 
+    branch. Don’t worry, it will be soon back for good in experimental.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 15 Feb 2009 01:37:24 +0100
 

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=18367&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Sun Feb 15 01:15:08 2009
@@ -33,7 +33,6 @@
                quilt,
                libenchant-dev (>= 1.0),
                libavahi-gobject-dev (>= 0.6.22),
-               libwebkit-dev,
                gtk-doc-tools (>= 1.0),
                lsb-release,
                zip
@@ -42,7 +41,7 @@
 
 Package: epiphany-browser
 Architecture: all
-Depends: epiphany-gecko | epiphany-webkit
+Depends: epiphany-gecko
 Description: Intuitive web browser - dummy package
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards
@@ -80,37 +79,6 @@
  .
  This version uses the Gecko backend to render web pages.
 
-Package: epiphany-webkit
-Architecture: any
-Depends: epiphany-browser-data (>= ${gnome:Version}),
-         epiphany-browser-data (<< ${gnome:NextVersion}),
-         ${shlibs:Depends},
-         gnome-icon-theme (>= 2.9.90),
-         dbus-x11,
-         iso-codes,
-         ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20)
-Recommends: yelp
-Suggests: mozplugger
-Provides: www-browser, gnome-www-browser
-Description: Intuitive GNOME web browser - webkit version
- Epiphany is a simple yet powerful GNOME web browser targeted at
- non-technical users. Its principles are simplicity and standards
- compliance. Simplicity is achieved by a well designed user interface and
- reliance on external applications for performing external tasks (such as
- reading email). Simplicity should not mean less powerful.  Standards
- compliance is achieved on the HTML side by using the Gecko
- rendering engine, as developed for the Mozilla and Iceweasel browsers; and
- on the user interface side by closely following the GNOME Human Interface
- Guidelines (HIG) and by close integration with the GNOME desktop.
- .
- This version uses the Webkit backend to render web pages.
- .
- WARNING: the Webkit backend is still experimental, and while this 
- version is suitable for basic tasks, many features are missing. For a 
- complete browsing experience, you should use the epiphany-gecko 
- package.
-
 Package: epiphany-browser-data
 Architecture: all
 Depends: ${misc:Depends}
@@ -140,8 +108,8 @@
 Architecture: any
 Section: gnome
 Priority: extra
-Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version})
-Recommends: xulrunner-1.9-dbg | libwebkitgtk1d-dbg
+Depends: epiphany-gecko (= ${binary:Version})
+Recommends: xulrunner-1.9-dbg
 Description: Debugging symbols for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=18367&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Sun Feb 15 01:15:08 2009
@@ -33,7 +33,6 @@
                quilt,
                libenchant-dev (>= 1.0),
                libavahi-gobject-dev (>= 0.6.22),
-               libwebkit-dev,
                gtk-doc-tools (>= 1.0),
                lsb-release,
                zip
@@ -42,7 +41,7 @@
 
 Package: epiphany-browser
 Architecture: all
-Depends: epiphany-gecko | epiphany-webkit
+Depends: epiphany-gecko
 Description: Intuitive web browser - dummy package
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards
@@ -80,37 +79,6 @@
  .
  This version uses the Gecko backend to render web pages.
 
-Package: epiphany-webkit
-Architecture: any
-Depends: epiphany-browser-data (>= ${gnome:Version}),
-         epiphany-browser-data (<< ${gnome:NextVersion}),
-         ${shlibs:Depends},
-         gnome-icon-theme (>= 2.9.90),
-         dbus-x11,
-         iso-codes,
-         ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20)
-Recommends: yelp
-Suggests: mozplugger
-Provides: www-browser, gnome-www-browser
-Description: Intuitive GNOME web browser - webkit version
- Epiphany is a simple yet powerful GNOME web browser targeted at
- non-technical users. Its principles are simplicity and standards
- compliance. Simplicity is achieved by a well designed user interface and
- reliance on external applications for performing external tasks (such as
- reading email). Simplicity should not mean less powerful.  Standards
- compliance is achieved on the HTML side by using the Gecko
- rendering engine, as developed for the Mozilla and Iceweasel browsers; and
- on the user interface side by closely following the GNOME Human Interface
- Guidelines (HIG) and by close integration with the GNOME desktop.
- .
- This version uses the Webkit backend to render web pages.
- .
- WARNING: the Webkit backend is still experimental, and while this 
- version is suitable for basic tasks, many features are missing. For a 
- complete browsing experience, you should use the epiphany-gecko 
- package.
-
 Package: epiphany-browser-data
 Architecture: all
 Depends: ${misc:Depends}
@@ -140,8 +108,8 @@
 Architecture: any
 Section: gnome
 Priority: extra
-Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version})
-Recommends: xulrunner-1.9-dbg | libwebkitgtk1d-dbg
+Depends: epiphany-gecko (= ${binary:Version})
+Recommends: xulrunner-1.9-dbg
 Description: Debugging symbols for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards

Modified: desktop/experimental/epiphany-browser/debian/epiphany-browser.README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/epiphany-browser.README.Debian?rev=18367&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/epiphany-browser.README.Debian (original)
+++ desktop/experimental/epiphany-browser/debian/epiphany-browser.README.Debian Sun Feb 15 01:15:08 2009
@@ -1,23 +1,5 @@
 Epiphany for Debian
 ===================
-
-Rendering backends
-------------------
-
-Currently, two versions of Epiphany are provided in Debian. The default 
-uses the Gecko engine (in package epiphany-gecko), and another one using 
-the webkit engine (in package epiphany-webkit) is available as well as a 
-feature preview.
-
-Both can be installed at once. In this case, you can switch the default 
-version, using “update-alternatives --config epiphany-browser”. You can 
-also enable the icons for one or the other version using the menu editor 
-(launch “alacarte” or right-click on the main menu and click “Edit the 
-menus”).
-
-Beware that you can only have one instance of epiphany launched at once. 
-If epiphany-gecko is launched and you try to launch epiphany-webkit, it 
-will only open a new window of epiphany-gecko.
 
 Epiphany and NetworkManager
 ---------------------------

Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=18367&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Sun Feb 15 01:15:08 2009
@@ -20,7 +20,7 @@
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-FLAVORS := gecko webkit
+FLAVORS := gecko
 
 QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
@@ -52,10 +52,6 @@
 		--with-gecko=libxul-embedding \
 		--enable-gtk-doc \
 		--enable-spell-checker
-
-webkit_configure_flags := $(common_configure_flags) \
-		--libexecdir=\$${prefix}/lib/epiphany-webkit \
-		--with-engine=webkit
 
 patch: $(STAMP_DIR)/patch-stamp
 $(STAMP_DIR)/patch-stamp:
@@ -104,7 +100,6 @@
 	mv debian/epiphany-gecko/etc/* debian/epiphany-browser-data/etc
 	rmdir debian/epiphany-gecko/etc
 	mv debian/epiphany-gecko/usr/share debian/epiphany-browser-data/usr/
-	cd debian/epiphany-webkit && rm -rf etc usr/share usr/lib/pkgconfig usr/include
 	cd debian/epiphany-browser-data/usr/share/epiphany-browser && \
 		mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/
 	# Add Debian version to the user agent

More information about the pkg-gnome-commits mailing list