r18598 - in /desktop/experimental/epiphany-webkit/debian: ./ bug/

kov at users.alioth.debian.org kov at users.alioth.debian.org
Tue Mar 3 13:17:54 UTC 2009 

Author: kov
Date: Tue Mar  3 13:17:54 2009
New Revision: 18598

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18598
Log:
Initial setup of the epiphany-webkit source package.

Added:
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.dirs
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.docs
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.docs
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.gconf-defaults
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.install
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.install
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.links
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dbg.links
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-dbg.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.dirs
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit-dev.links
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.README.Debian
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser.README.Debian
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.install
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser.install
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.links
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-browser.links
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.menu
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-gecko.menu
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.postinst
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-gecko.postinst
    desktop/experimental/epiphany-webkit/debian/epiphany-webkit.prerm
      - copied unchanged from r18597, desktop/experimental/epiphany-webkit/debian/epiphany-gecko.prerm
Removed:
    desktop/experimental/epiphany-webkit/debian/certManager.js
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.docs
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.gconf-defaults
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.install
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-data.links
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-dbg.links
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.dirs
    desktop/experimental/epiphany-webkit/debian/epiphany-browser-dev.links
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.README.Debian
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.install
    desktop/experimental/epiphany-webkit/debian/epiphany-browser.links
    desktop/experimental/epiphany-webkit/debian/epiphany-gecko.menu
    desktop/experimental/epiphany-webkit/debian/epiphany-gecko.postinst
    desktop/experimental/epiphany-webkit/debian/epiphany-gecko.prerm
Modified:
    desktop/experimental/epiphany-webkit/debian/bug/control
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/control.in
    desktop/experimental/epiphany-webkit/debian/rules

Modified: desktop/experimental/epiphany-webkit/debian/bug/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/bug/control?rev=18598&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/bug/control (original)
+++ desktop/experimental/epiphany-webkit/debian/bug/control Tue Mar  3 13:17:54 2009
@@ -1,1 +1,1 @@
-report-with: epiphany-gecko epiphany-webkit
+report-with: epiphany-webkit

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=18598&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog Tue Mar  3 13:17:54 2009
@@ -1,3 +1,9 @@
+epiphany-webkit (2.27.0~svn.8837-1) experimental; urgency=low
+
+  * Upstream development snapshot
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Mar 2009 09:55:26 -0300
+
 epiphany-browser (2.24.3-2) UNRELEASED; urgency=low
 
   * Fix .pc file by hand so that extensions build correctly.

Modified: desktop/experimental/epiphany-webkit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/control.in?rev=18598&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control.in (original)
+++ desktop/experimental/epiphany-webkit/debian/control.in Tue Mar  3 13:17:54 2009
@@ -1,4 +1,4 @@
-Source: epiphany-browser
+Source: epiphany-webkit
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
@@ -21,7 +21,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               xulrunner-dev (>= 1.9~rc2-3),
+               libwebkit-dev (>= 1.1.1),
                iso-codes (>= 0.35),
                python-dev (>= 2.3),
                python-gtk2-dev (>= 2.7.1),
@@ -39,26 +39,14 @@
 Standards-Version: 3.8.0
 Homepage: http://www.gnome.org/projects/epiphany/
 
-Package: epiphany-browser
-Architecture: all
-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
- compliance.
- .
- This dummy package installs Epiphany with the Gecko backend by default.
-
-Package: epiphany-gecko
+Package: epiphany-webkit
 Architecture: any
-Depends: epiphany-browser-data (>= ${gnome:Version}),
-         epiphany-browser-data (<< ${gnome:NextVersion}),
+Depends: epiphany-webkit-data (>= ${gnome:Version}),
+         epiphany-webkit-data (<< ${gnome:NextVersion}),
          ${shlibs:Depends},
          gnome-icon-theme (>= 2.9.90),
          dbus-x11,
          iso-codes,
-         xulrunner-1.9 (>= 1.9~rc2-3),
-         xulrunner-1.9-gnome-support,
          ${misc:Depends}
 Conflicts: epiphany-browser (<< 2.20),
            epiphany-extensions (<< 2.22.1-3),
@@ -66,23 +54,23 @@
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser
-Description: Intuitive GNOME web browser - Gecko version
+Description: Intuitive GNOME web browser - WebKitGTK+ 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.
+ 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
+ WebKitGTK+ rendering engine; 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 Gecko backend to render web pages.
+ This version uses the WebKitGTK+ backend to render web pages.
 
-Package: epiphany-browser-data
+Package: epiphany-webkit-data
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: epiphany-browser
+Recommends: epiphany-webkit
 Conflicts: epiphany-browser (<< 2.20)
 Replaces: epiphany-browser (<< 2.20)
 Description: Data files for the GNOME web browser
@@ -93,10 +81,10 @@
  This package contains the common files, artwork and translations for
  Epiphany.
 
-Package: epiphany-browser-dev
+Package: epiphany-webkit-dev
 Architecture: all
 Section: devel
-Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
+Depends: epiphany-webkit (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
 Description: Development files 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
@@ -104,12 +92,12 @@
  .
  This package is required to develop extensions for Epiphany.
 
-Package: epiphany-browser-dbg
+Package: epiphany-webkit-dbg
 Architecture: any
 Section: gnome
 Priority: extra
-Depends: epiphany-gecko (= ${binary:Version})
-Recommends: xulrunner-1.9-dbg
+Depends: epiphany-webkit (= ${binary:Version})
+Recommends: libwebkit-1.0-2-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-webkit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/rules?rev=18598&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/rules (original)
+++ desktop/experimental/epiphany-webkit/debian/rules Tue Mar  3 13:17:54 2009
@@ -23,7 +23,7 @@
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-FLAVORS := gecko
+FLAVORS := webkit
 
 QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
@@ -49,10 +49,7 @@
 	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-gecko_configure_flags := $(common_configure_flags) \
-		--libexecdir=\$${prefix}/lib/epiphany-gecko \
-		--with-engine=mozilla \
-		--with-gecko=libxul-embedding \
+webkit_configure_flags := $(common_configure_flags) \
 		--enable-gtk-doc \
 		--enable-spell-checker
 
@@ -96,38 +93,36 @@
 
 install: install-clean $(addprefix install-, $(FLAVORS))
 	dh_installdirs
-	mv debian/epiphany-gecko/usr/include debian/epiphany-browser-dev/usr/
-	mv debian/epiphany-gecko/usr/lib/pkgconfig debian/epiphany-browser-dev/usr/lib/
-	cd debian/epiphany-gecko/usr/share && \
-		mv aclocal pygtk gtk-doc $(CURDIR)/debian/epiphany-browser-dev/usr/share/
-	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-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 && \
-		mv epiphany.1 epiphany-browser.1
+	mv debian/epiphany-webkit/usr/include debian/epiphany-webkit-dev/usr/
+	mv debian/epiphany-webkit/usr/lib/pkgconfig debian/epiphany-webkit-dev/usr/lib/
+	cd debian/epiphany-webkit/usr/share && \
+		mv aclocal pygtk gtk-doc $(CURDIR)/debian/epiphany-webkit-dev/usr/share/
+	mv debian/epiphany-webkit/etc/* debian/epiphany-webkit-data/etc
+	rmdir debian/epiphany-webkit/etc
+	mv debian/epiphany-webkit/usr/share debian/epiphany-webkit-data/usr/
+	cd debian/epiphany-webkit-data/usr/share/epiphany-webkit && \
+		mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-webkit-data/etc/gnome/epiphany/
+	cd debian/epiphany-webkit-data/usr/share/man/man1 && \
+		mv epiphany.1 epiphany-webkit.1
 	# Correct help file paths
-	cd debian/epiphany-browser-data/usr/share/omf && mv epiphany epiphany-browser
-	cd debian/epiphany-browser-data/usr/share/gnome/help && mv epiphany epiphany-browser
-	find debian/epiphany-browser-data/usr/share/omf/epiphany-browser/ \
-		-name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-browser/#' {} \;
+	cd debian/epiphany-webkit-data/usr/share/omf && mv epiphany epiphany-webkit
+	cd debian/epiphany-webkit-data/usr/share/gnome/help && mv epiphany epiphany-webkit
+	find debian/epiphany-webkit-data/usr/share/omf/epiphany-webkit/ \
+		-name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-webkit/#' {} \;
 	# Make both epiphanies installable together
 	for f in $(FLAVORS); do \
 		F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \
 		mkdir -p debian/epiphany-$$f/usr/share/applications ; \
 		( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \
-			debian/epiphany-browser-data/usr/share/applications/epiphany.desktop \
-			| sed "s,epiphany-browser,epiphany-$$f," \
+			debian/epiphany-webkit-data/usr/share/applications/epiphany.desktop \
+			| sed "s,epiphany-webkit,epiphany-$$f," \
 			| grep -v ^TryExec | grep -v ^MimeType ; \
 			echo NoDisplay=true ) \
 		> debian/epiphany-$$f/usr/share/applications/epiphany-$$f.desktop ; \
 		done
 	dh_install
-	cd debian/epiphany-browser/usr/bin && \
-		mv epiphany.sh epiphany
-	# Temporary fix for 2.24.3, should be removed for 2.26
-	sed -i s, at with_engine@,mozilla, debian/epiphany-browser-dev/usr/lib/pkg-config/epiphany-*.pc
+	#cd debian/epiphany-webkit/usr/bin && \
+	#	mv epiphany.sh epiphany
 
 clean::
 	dh_testdir
@@ -144,8 +139,8 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs -pepiphany-browser-data ChangeLog 
-	dh_installchangelogs -i -Nepiphany-browser-data
+	dh_installchangelogs -pepiphany-webkit-data ChangeLog
+	dh_installchangelogs -i -Nepiphany-webkit-data
 	dh_installdocs -i
 	dh_installman -i
 	dh_installmenu -i
@@ -171,7 +166,7 @@
 	dh_scrollkeeper -a
 	dh_gconf -a
 	dh_desktop -a
-	dh_strip -a --dbg-package=epiphany-browser-dbg
+	dh_strip -a --dbg-package=epiphany-webkit-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a

More information about the pkg-gnome-commits mailing list