clone 503907 -1 -2 -3 retitle -1 epiphany-webkit: Epiphany should not provide webkit in a stable release reassign -1 epiphany-browser severity -1 serious retitle -2 liferea-webkit: Liferea should not provide webkit in a stable release reassign -2 liferea severity -2 serious retitle -3 kazehakase-webkit: Kazehakase should not provide webkit in a stable release reassign -3 kazehakase severity -3 serious severity 503907 important thanks After quite a bit of discussion and investigation about #503907, I've come to the view that: * Webkit as currently in testing is insufficient at dealing with general HTML. * Webkit may be used as the renderer for a known subset of HTML (eg: use as a help viewer) as it can be verified as working. * The version in experimental contains too large a diff to be released with lenny. Thus, packages epiphany-webkit, liferea-webkit and kazehakase-webkit should not be provided in a stable release. This bug should be fixed for webkit, but as it currently doesn't appear in any of the use cases in Debian apart from the above three browsers, it can release. Hence setting the severity to important. Browser maintainers: This is RC for lenny. I have NMUs ready which drop the -webkit variants should you want them. Patches attached if you want to do it yourself. Thanks, Neil -- automake: the emo of Debian software. "You just don't understand me."
diff -u liferea-1.4.18/debian/changelog liferea-1.4.18/debian/changelog
--- liferea-1.4.18/debian/changelog
+++ liferea-1.4.18/debian/changelog
@@ -1,3 +1,10 @@
+liferea (1.4.18-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Disable webkit plugin as it's not releasing with lenny
+
+ -- Neil McGovern <neilm@debian.org> Sun, 04 Jan 2009 14:44:35 +0000
+
liferea (1.4.18-1) unstable; urgency=low
* New Upstream Release.
diff -u liferea-1.4.18/debian/control liferea-1.4.18/debian/control
--- liferea-1.4.18/debian/control
+++ liferea-1.4.18/debian/control
@@ -7,7 +7,7 @@
libgconf2-dev, libdbus-glib-1-dev, libsm-dev, libgnutls-dev,
liblua5.1-0-dev, libnotify-dev, libxml-parser-perl, libxslt1-dev,
libsqlite3-dev (>= 3.3.9), libglade2-dev, libgtk2.0-dev (>= 2.8.0),
- libwebkit-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64],
intltool
Standards-Version: 3.8.0
Homepage: http://liferea.sourceforge.net/
@@ -36,16 +36,6 @@
This package contains the debug symbols for liferea. It's useful if you
find a bug in the application and want to help fix it.
-Package: liferea-webkit
-Architecture: any
-Depends: liferea (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: webkit rendering engine for liferea
- This package provides the webkit based rendering engine plugin for the
- liferea RSS reader.
- .
- Please note that this plugin is highly experimental and not recommended for
- everyday use.
-
Package: liferea-xulrunner
Architecture: all
Description: transitional dummy package
diff -u liferea-1.4.18/debian/rules liferea-1.4.18/debian/rules
--- liferea-1.4.18/debian/rules
+++ liferea-1.4.18/debian/rules
@@ -36,7 +36,7 @@
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"\
./configure $(SYSTEM) --prefix=/usr \
--mandir=\$${prefix}/share/man --sysconfdir=/etc \
- --disable-gecko --disable-gtkhtml2 --enable-xulrunner --enable-webkit\
+ --disable-gecko --disable-gtkhtml2 --enable-xulrunner --disable-webkit\
--enable-sm --enable-gnutls --enable-lua --enable-libnotify \
$(ENABLE_NM)
ln -s $(CURDIR)/man/liferea.1 $(CURDIR)/debian/liferea-bin.1
diff -u kazehakase-0.5.4/debian/control kazehakase-0.5.4/debian/control
--- kazehakase-0.5.4/debian/control
+++ kazehakase-0.5.4/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hidetaka Iwai <tyuyu@debian.or.jp>
Uploaders: Andres Salomon <dilinger@debian.org>
-Build-Depends: debhelper(>> 4.0.0), dpatch, libatk1.0-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, xulrunner-dev (>= 1.9~rc2-3), libgnutls-dev (>= 1.2.6), ruby1.8, ruby1.8-dev, libgtk2-ruby, libgettext-ruby1.8, libxml-parser-perl, libwebkit-dev
+Build-Depends: debhelper(>> 4.0.0), dpatch, libatk1.0-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, xulrunner-dev (>= 1.9~rc2-3), libgnutls-dev (>= 1.2.6), ruby1.8, ruby1.8-dev, libgtk2-ruby, libgettext-ruby1.8, libxml-parser-perl
Standards-Version: 3.7.3
Package: kazehakase
@@ -11,7 +11,7 @@
Suggests: migemo
Recommends: hyperestraier
Provides: www-browser
-Depends: ${shlibs:Depends}, kazehakase-gecko | kazehakase-webkit, ruby1.8, libgtk2-ruby, libgettext-ruby1.8
+Depends: ${shlibs:Depends}, kazehakase-gecko, ruby1.8, libgtk2-ruby, libgettext-ruby1.8
Conflicts: kazehakase-migemo
Description: GTK+-base web browser that allows pluggable rendering engines
Kazehakase is a web browser that can use either Gecko or WebKit as
@@ -32,10 +31,0 @@
-
-Package: kazehakase-webkit
-Architecture: any
-Depends: ${webkit:Depends}
-Description: WebKit rendering engine for kazehakase
- Kazehakase is a web browser that can use either Gecko or WebKit as
- its rendering engine.
- .
- This is the WebKit rendering engine plugin. NOTE: IT IS STILL VERY
- UNSTABLE. DO NOT USE THIS YET UNLESS YOU ENJOY DEBUGGING.
diff -u kazehakase-0.5.4/debian/rules kazehakase-0.5.4/debian/rules
--- kazehakase-0.5.4/debian/rules
+++ kazehakase-0.5.4/debian/rules
@@ -128,9 +128,6 @@
dpkg-shlibdeps -T$(CURDIR)/debian/kazehakase-gecko.substvars \
-pgecko -xkazehakase \
$(CURDIR)/debian/kazehakase-gecko/usr/lib/kazehakase/embed/gecko.so
- dpkg-shlibdeps -T$(CURDIR)/debian/kazehakase-webkit.substvars \
- -pwebkit -xkazehakase \
- $(CURDIR)/debian/kazehakase-webkit/usr/lib/kazehakase/embed/webkit_gtk.so
dh_gencontrol
dh_md5sums
dh_builddeb
diff -u kazehakase-0.5.4/debian/changelog kazehakase-0.5.4/debian/changelog
--- kazehakase-0.5.4/debian/changelog
+++ kazehakase-0.5.4/debian/changelog
@@ -1,3 +1,10 @@
+kazehakase (0.5.4-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Disable building of webkit stuff as it's not going to be in lenny
+
+ -- Neil McGovern <neilm@debian.org> Sun, 04 Jan 2009 14:55:13 +0000
+
kazehakase (0.5.4-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u epiphany-browser-2.22.3/debian/control.in epiphany-browser-2.22.3/debian/control.in
--- epiphany-browser-2.22.3/debian/control.in
+++ epiphany-browser-2.22.3/debian/control.in
@@ -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
diff -u epiphany-browser-2.22.3/debian/control epiphany-browser-2.22.3/debian/control
--- epiphany-browser-2.22.3/debian/control
+++ epiphany-browser-2.22.3/debian/control
@@ -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
diff -u epiphany-browser-2.22.3/debian/changelog epiphany-browser-2.22.3/debian/changelog
--- epiphany-browser-2.22.3/debian/changelog
+++ epiphany-browser-2.22.3/debian/changelog
@@ -1,3 +1,10 @@
+epiphany-browser (2.22.3-8.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Disable webkit version, lenny isn't releasing with webkit.
+
+ -- Neil McGovern <neilm@debian.org> Sun, 04 Jan 2009 15:08:02 +0000
+
epiphany-browser (2.22.3-8) unstable; urgency=low
* The “high hopes” release.
diff -u epiphany-browser-2.22.3/debian/rules epiphany-browser-2.22.3/debian/rules
--- epiphany-browser-2.22.3/debian/rules
+++ epiphany-browser-2.22.3/debian/rules
@@ -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
@@ -101,7 +101,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 && \
Attachment:
signature.asc
Description: Digital signature