r18192 - in /desktop/unstable/epiphany-browser/debian: README.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
Tue Jan 6 09:20:35 UTC 2009 

Author: joss
Date: Tue Jan  6 09:20:35 2009
New Revision: 18192

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18192
Log:
* Drop epiphany-webkit build for the lenny release. Closes: #510764.
* Move README.Debian (which doesn’t get installed) to 
  epiphany-browser.README.Debian (which has become irrelevant).

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

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=18192&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Tue Jan  6 09:20:35 2009
@@ -1,3 +1,11 @@
+epiphany-browser (2.22.3-9) unstable; urgency=low
+
+  * Drop epiphany-webkit build for the lenny release. Closes: #510764.
+  * Move README.Debian (which doesn’t get installed) to 
+    epiphany-browser.README.Debian (which has become irrelevant).
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 06 Jan 2009 10:21:58 +0100
+
 epiphany-browser (2.22.3-8) unstable; urgency=low
 
   * The “high hopes” release.

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=18192&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control (original)
+++ desktop/unstable/epiphany-browser/debian/control Tue Jan  6 09:20:35 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/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=18192&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in (original)
+++ desktop/unstable/epiphany-browser/debian/control.in Tue Jan  6 09:20:35 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/unstable/epiphany-browser/debian/epiphany-browser.README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.README.Debian?rev=18192&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.README.Debian (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.README.Debian Tue Jan  6 09:20:35 2009
@@ -1,19 +1,15 @@
 Epiphany for Debian
 ===================
 
-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.
+Epiphany and NetworkManager
+---------------------------
 
-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”).
+Epiphany uses NetworkManager to detect an active network
+connection. If NetworkManager isn't set up correctly and doesn't
+detect the network, this might result in Epiphany starting in offline
+mode, or randomly going offline.
 
-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.
-
--- Josselin Mouette <joss at debian.org>,  Fri, 20 Jun 2008 10:25:11 +0200
+To correct this, either set up NetworkManager correctly by following
+the documentation in /usr/share/doc/network-manager or disable this
+functionality in Epiphany by setting the gconf key
+/apps/epiphany/general/managed_network to false.

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=18192&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules (original)
+++ desktop/unstable/epiphany-browser/debian/rules Tue Jan  6 09:20:35 2009
@@ -18,7 +18,7 @@
 
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
-FLAVORS := gecko webkit
+FLAVORS := gecko
 
 QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
@@ -49,10 +49,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:
@@ -101,7 +97,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/
 	cd debian/epiphany-browser-data/usr/share/man/man1 && \

More information about the pkg-gnome-commits mailing list