r15667 - in /desktop/experimental/epiphany-browser/debian: README.Debian changelog control control.in flashblock.tar.base64 rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Apr 17 19:09:45 UTC 2008
Author: joss
Date: Thu Apr 17 19:09:45 2008
New Revision: 15667
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15667
Log:
* Upload to unstable; drop check-dist include.
* Re-enable epiphany-webkit.
* Drop flashblock for now, it should go in its own package.
* Require libwebkit-dev svn31841.
Removed:
desktop/experimental/epiphany-browser/debian/flashblock.tar.base64
Modified:
desktop/experimental/epiphany-browser/debian/README.Debian
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/control.in
desktop/experimental/epiphany-browser/debian/rules
Modified: desktop/experimental/epiphany-browser/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/README.Debian?rev=15667&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/README.Debian (original)
+++ desktop/experimental/epiphany-browser/debian/README.Debian Thu Apr 17 19:09:45 2008
@@ -1,18 +1,5 @@
Epiphany for Debian
===================
-
-Flash blocker
--------------
-
-To enable flashblock, choose Edit, Preferences, Fonts & Style, and check the
-"Use custom stylesheet" box. Then click "Edit Stylesheet..." and insert the
-following text into the stylesheet:
-
- @import url(chrome://flashblock/content/flashblock.css);
-
-then save the file and close your editor. To test whether it worked, go to a
-page such as <http://www.macromedia.com/shockwave/welcome/>.
-
Epiphany and NetworkManager
---------------------------
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=15667&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Thu Apr 17 19:09:45 2008
@@ -1,4 +1,4 @@
-epiphany-browser (2.22.1.1-1) experimental; urgency=low
+epiphany-browser (2.22.1.1-1) unstable; urgency=low
[ Sam Morris ]
* New upstream release.
@@ -21,6 +21,12 @@
* New upstream bugfix release:
+ debian/patches/99_autoreconf.patch:
- Updated for the new version.
+
+ [ Josselin Mouette ]
+ * Upload to unstable; drop check-dist include.
+ * Re-enable epiphany-webkit.
+ * Drop flashblock for now, it should go in its own package.
+ * Require libwebkit-dev svn31841.
-- Sebastian Dröge <slomo at debian.org> Thu, 17 Apr 2008 09:34:24 +0200
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=15667&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Thu Apr 17 19:09:45 2008
@@ -32,7 +32,7 @@
quilt,
libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
-# libwebkitgtk-dev (>= 0~svn29752),
+ libwebkit-dev (>= 0~svn31841),
gtk-doc-tools (>= 1.0),
lsb-release,
zip
@@ -76,33 +76,33 @@
This version uses the Gecko backend to render web pages.
Homepage: http://www.gnome.org/projects/epiphany/
-#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,
-# 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.
-#Homepage: http://www.gnome.org/projects/epiphany/
-#
+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,
+ 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.
+Homepage: http://www.gnome.org/projects/epiphany/
+
Package: epiphany-browser-data
Architecture: all
Depends: ${misc:Depends}
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=15667&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Thu Apr 17 19:09:45 2008
@@ -32,7 +32,7 @@
quilt,
libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
-# libwebkitgtk-dev (>= 0~svn29752),
+ libwebkit-dev (>= 0~svn31841),
gtk-doc-tools (>= 1.0),
lsb-release,
zip
@@ -76,33 +76,33 @@
This version uses the Gecko backend to render web pages.
Homepage: http://www.gnome.org/projects/epiphany/
-#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,
-# 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.
-#Homepage: http://www.gnome.org/projects/epiphany/
-#
+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,
+ 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.
+Homepage: http://www.gnome.org/projects/epiphany/
+
Package: epiphany-browser-data
Architecture: all
Depends: ${misc:Depends}
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=15667&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Thu Apr 17 19:09:45 2008
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
@@ -20,7 +18,7 @@
CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-FLAVORS := gecko #webkit
+FLAVORS := gecko webkit
common_configure_flags := \
--prefix=/usr \
@@ -97,7 +95,7 @@
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-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 && \
@@ -107,13 +105,6 @@
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/#' {} \;
-# flashblock
- cd debian && \
- perl -MMIME::Base64 -e 'print decode_base64(join("", <>))' < flashblock.tar.base64 | tar x && \
- cd flashblock/source && \
- zip -oqrX9 flashblock.jar content locale -x '*/CVS/*' '*~'
- cp debian/flashblock/source/flashblock.jar debian/epiphany-browser-data/usr/share/epiphany-browser/chrome
- echo 'content flashblock jar:file:///usr/share/epiphany-browser/chrome/flashblock.jar!/content/flashblock/' > debian/epiphany-browser-data/usr/share/epiphany-browser/chrome/flashblock.manifest
# Make both epiphanies installable together
for f in $(FLAVORS); do \
@@ -138,7 +129,6 @@
rm -f po/.intltool-merge-cache
rm -f intltool-extract intltool-update intltool-merge
rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR)
- rm -rf debian/flashblock
dh_clean
binary: binary-arch binary-indep
More information about the pkg-gnome-commits
mailing list