r10348 - in /packages/unstable/epiphany-extensions/debian:
changelog compat
control control.in patches/01_download_dir.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Apr 25 04:22:18 UTC 2007
Author: slomo
Date: Wed Apr 25 04:22:15 2007
New Revision: 10348
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10348
Log:
* Upload to unstable, drop check-dist include.
* Update to debhelper compat level 5.
* New upstream release.
- Drop patch 30_dont-dist-epilicious and 31_epilicious-import-warning,
merged upstream.
* Depend on python-elementtree (closes: #415554).
* Remove the hardcoded call to dh_pysupport in the 2.14 directory.
* Merge 2.14.1.1-2 and 2.14.1.1-3; SVN r6503:9094.
- Stay without a libosp-dev build-dep; no idea why it was removed, no
idea why it was added.
* New patch, 30_dont-dist-epilicious, stop disting epilicious.py, it's
generated on build; Backported from SVN r1472; GNOME #418041;
closes: #414780.
* New patch, 31_epilicious-import-warning, fixes warning during
byte-compilation; GNOME #418164; closes: #414743.
* New upstream release.
* Build-depend on epiphany-browser-dev 2.18.
* Build-depend on gconf2 so that gconftool-2 is available during
configuration.
* adblock extension is now build by default; remove from configure flags.
* Build the new epilicious extension.
* No need to remove /var in binary-post-install rule since scrollkeeper is
disabled in configure
* Include the new check-dist Makefile to prevent accidental uploads to
unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
* Include CDBS's utils.
* Add a get-orig-source target to retrieve the upstream tarball.
* Set pyversions to 2.3-.
* Build-depend on python (>= 2.3).
* Add ${misc:Depends}.
* 01_download_dir.patch: remove the distinction between download and
save directory, following the change in epiphany.
* Build-depend on librsvg2-common >= 2.16.0-2 for autobuildability.
* New upstream release (closes: #406235).
* Use --disable-scrollkeeper.
* Add watch file.
* New upstream release.
* Rebuild against epiphany 2.16.
* Change maintainer to please Jordi.
* Depend on epiphany-browser (<< 2.17) to avoid the need for a
conflict in the future.
* Build-depend on intltool 0.35.0.
* Remove build-dep on libgnomeui-dev.
* Bump build-dependencies on glib and gtk.
* Build-depend on python-support 0.4 and call it.
* Include gnome-version.mk and build-depend on gnome-pkg-tools 0.6.
+ Use ${gnome:Version} for dependencies.
+ Use it to search for the correct directory in dh_pysupport call.
Added:
packages/unstable/epiphany-extensions/debian/compat
packages/unstable/epiphany-extensions/debian/patches/01_download_dir.patch
Modified:
packages/unstable/epiphany-extensions/debian/changelog
packages/unstable/epiphany-extensions/debian/control
packages/unstable/epiphany-extensions/debian/control.in
packages/unstable/epiphany-extensions/debian/rules
Modified: packages/unstable/epiphany-extensions/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/changelog?rev=10348&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/changelog (original)
+++ packages/unstable/epiphany-extensions/debian/changelog Wed Apr 25 04:22:15 2007
@@ -1,3 +1,107 @@
+epiphany-extensions (2.18.1-2) unstable; urgency=low
+
+ * Upload to unstable, drop check-dist include.
+ * Update to debhelper compat level 5.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 25 Apr 2007 06:12:19 +0200
+
+epiphany-extensions (2.18.1-1) experimental; urgency=low
+
+ * New upstream release.
+ - Drop patch 30_dont-dist-epilicious and 31_epilicious-import-warning,
+ merged upstream.
+
+ -- Loic Minier <lool at dooz.org> Mon, 09 Apr 2007 16:10:39 +0200
+
+epiphany-extensions (2.18.0-4) UNRELEASED; urgency=low
+
+ * Depend on python-elementtree (closes: #415554).
+ * Remove the hardcoded call to dh_pysupport in the 2.14 directory.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 28 Mar 2007 00:25:17 +0200
+
+epiphany-extensions (2.18.0-3) experimental; urgency=low
+
+ * Merge 2.14.1.1-2 and 2.14.1.1-3; SVN r6503:9094.
+ - Stay without a libosp-dev build-dep; no idea why it was removed, no
+ idea why it was added.
+
+ -- Loic Minier <lool at dooz.org> Sun, 18 Mar 2007 19:08:56 +0100
+
+epiphany-extensions (2.18.0-2) experimental; urgency=low
+
+ * New patch, 30_dont-dist-epilicious, stop disting epilicious.py, it's
+ generated on build; Backported from SVN r1472; GNOME #418041;
+ closes: #414780.
+ * New patch, 31_epilicious-import-warning, fixes warning during
+ byte-compilation; GNOME #418164; closes: #414743.
+
+ -- Loic Minier <lool at dooz.org> Wed, 14 Mar 2007 11:38:13 +0100
+
+epiphany-extensions (2.18.0-1) experimental; urgency=low
+
+ [ Sam Morris ]
+ * New upstream release.
+ * Build-depend on epiphany-browser-dev 2.18.
+ * Build-depend on gconf2 so that gconftool-2 is available during
+ configuration.
+ * adblock extension is now build by default; remove from configure flags.
+ * Build the new epilicious extension.
+ * No need to remove /var in binary-post-install rule since scrollkeeper is
+ disabled in configure
+
+ [ Loic Minier ]
+ * Include the new check-dist Makefile to prevent accidental uploads to
+ unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+ * Include CDBS's utils.
+
+ -- Loic Minier <lool at dooz.org> Mon, 12 Mar 2007 16:13:53 +0100
+
+epiphany-extensions (2.16.1-2) experimental; urgency=low
+
+ [ Loic Minier ]
+ * Add a get-orig-source target to retrieve the upstream tarball.
+ * Set pyversions to 2.3-.
+ * Build-depend on python (>= 2.3).
+ * Add ${misc:Depends}.
+
+ [ Josselin Mouette ]
+ * 01_download_dir.patch: remove the distinction between download and
+ save directory, following the change in epiphany.
+
+ [ Loic Minier ]
+ * Build-depend on librsvg2-common >= 2.16.0-2 for autobuildability.
+
+ -- Loic Minier <lool at dooz.org> Mon, 12 Mar 2007 15:09:52 +0100
+
+epiphany-extensions (2.16.1-1) experimental; urgency=low
+
+ * New upstream release (closes: #406235).
+ * Use --disable-scrollkeeper.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 11 Jan 2007 23:34:52 +0100
+
+epiphany-extensions (2.16.0-1) experimental; urgency=low
+
+ [ Loic Minier ]
+ * Add watch file.
+
+ [ Josselin Mouette ]
+ * New upstream release.
+ * Rebuild against epiphany 2.16.
+ * Change maintainer to please Jordi.
+ * Depend on epiphany-browser (<< 2.17) to avoid the need for a
+ conflict in the future.
+ * Build-depend on intltool 0.35.0.
+ * Remove build-dep on libgnomeui-dev.
+ * Bump build-dependencies on glib and gtk.
+ * Build-depend on python-support 0.4 and call it.
+ * Include gnome-version.mk and build-depend on gnome-pkg-tools 0.6.
+ + Use ${gnome:Version} for dependencies.
+ + Use it to search for the correct directory in dh_pysupport call.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 9 Sep 2006 21:36:48 +0200
+
epiphany-extensions (2.14.1.1-3) unstable; urgency=low
* New patch, 50_fr-po, updates for the translation into French; thanks
Added: packages/unstable/epiphany-extensions/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/compat?rev=10348&op=file
==============================================================================
--- packages/unstable/epiphany-extensions/debian/compat (added)
+++ packages/unstable/epiphany-extensions/debian/compat Wed Apr 25 04:22:15 2007
@@ -1,0 +1,1 @@
+5
Modified: packages/unstable/epiphany-extensions/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/control?rev=10348&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/control (original)
+++ packages/unstable/epiphany-extensions/debian/control Wed Apr 25 04:22:15 2007
@@ -1,14 +1,14 @@
Source: epiphany-extensions
Section: gnome
Priority: optional
-Maintainer: Jordi Mallach <jordi at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs (>= 0.4.17), debhelper (>= 4.1.87), libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.0), libgnomeui-dev, libxml2-dev (>= 2.6.0), epiphany-browser-dev (>= 1.9.7), libxul-dev, libosp-dev (>= 1.5.1.0-4), gnome-pkg-tools, libxml-parser-perl, libdbus-glib-1-dev ( >= 0.60), libpcre3-dev, python (>= 2.3), gnome-doc-utils (>= 0.3.2), scrollkeeper, python-support (>= 0.4)
+Maintainer: Josselin Mouette <joss at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Build-Depends: cdbs (>= 0.4.17), debhelper (>= 5), libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.10.0), libxml2-dev (>= 2.6.0), librsvg2-common (>= 2.16.0-2), epiphany-browser-dev (>= 2.18.0), libxul-dev, gnome-pkg-tools (>= 0.10), libxml-parser-perl, libdbus-glib-1-dev ( >= 0.60), libpcre3-dev, python (>= 2.3), python-support (>= 0.4), gnome-doc-utils (>= 0.3.2), scrollkeeper, intltool (>= 0.35.0), libosp-dev, gconf2
Standards-Version: 3.7.2
Package: epiphany-extensions
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, epiphany-browser (>= 2.14.0), sgml-data, w3c-dtd-xhtml, python-gtk2, python-gnome2
+Depends: ${misc:Depends}, ${shlibs:Depends}, epiphany-browser (>= ${gnome:Version}), epiphany-browser (<< ${gnome:NextVersion}), sgml-data, w3c-dtd-xhtml, ${python:Depends}, python-gtk2, python-gnome2, python-elementtree
Suggests: epiphany-extension-gwget
Description: Extensions for Epiphany web browser
Adds extra features to GNOME's Epiphany web browser, including action,
Modified: packages/unstable/epiphany-extensions/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/control.in?rev=10348&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/control.in (original)
+++ packages/unstable/epiphany-extensions/debian/control.in Wed Apr 25 04:22:15 2007
@@ -1,14 +1,14 @@
Source: epiphany-extensions
Section: gnome
Priority: optional
-Maintainer: Jordi Mallach <jordi at debian.org>
+Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.17), debhelper (>= 4.1.87), libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.0), libgnomeui-dev, libxml2-dev (>= 2.6.0), epiphany-browser-dev (>= 1.9.7), libxul-dev, libosp-dev (>= 1.5.1.0-4), gnome-pkg-tools, libxml-parser-perl, libdbus-glib-1-dev ( >= 0.60), libpcre3-dev, python (>= 2.3), gnome-doc-utils (>= 0.3.2), scrollkeeper, python-support (>= 0.4)
+Build-Depends: cdbs (>= 0.4.17), debhelper (>= 5), libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.10.0), libxml2-dev (>= 2.6.0), librsvg2-common (>= 2.16.0-2), epiphany-browser-dev (>= 2.18.0), libxul-dev, gnome-pkg-tools (>= 0.10), libxml-parser-perl, libdbus-glib-1-dev ( >= 0.60), libpcre3-dev, python (>= 2.3), python-support (>= 0.4), gnome-doc-utils (>= 0.3.2), scrollkeeper, intltool (>= 0.35.0), libosp-dev, gconf2
Standards-Version: 3.7.2
Package: epiphany-extensions
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, epiphany-browser (>= 2.14.0), sgml-data, w3c-dtd-xhtml, python-gtk2, python-gnome2
+Depends: ${misc:Depends}, ${shlibs:Depends}, epiphany-browser (>= ${gnome:Version}), epiphany-browser (<< ${gnome:NextVersion}), sgml-data, w3c-dtd-xhtml, ${python:Depends}, python-gtk2, python-gnome2, python-elementtree
Suggests: epiphany-extension-gwget
Description: Extensions for Epiphany web browser
Adds extra features to GNOME's Epiphany web browser, including action,
Added: packages/unstable/epiphany-extensions/debian/patches/01_download_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/patches/01_download_dir.patch?rev=10348&op=file
==============================================================================
--- packages/unstable/epiphany-extensions/debian/patches/01_download_dir.patch (added)
+++ packages/unstable/epiphany-extensions/debian/patches/01_download_dir.patch Wed Apr 25 04:22:15 2007
@@ -1,0 +1,41 @@
+--- include/ephy-prefs.h~ 2006-03-12 15:04:11.000000000 +0100
++++ include/ephy-prefs.h 2007-01-20 22:18:50.000000000 +0100
+@@ -39,7 +39,6 @@
+ #define CONF_NETWORK_MANAGED "/apps/epiphany/general/managed_network"
+
+ /* Directories */
+-#define CONF_STATE_SAVE_DIR "/apps/epiphany/directories/save"
+ #define CONF_STATE_SAVE_IMAGE_DIR "/apps/epiphany/directories/saveimage"
+ #define CONF_STATE_OPEN_DIR "/apps/epiphany/directories/open"
+ #define CONF_STATE_DOWNLOAD_DIR "/apps/epiphany/directories/downloads_folder"
+--- extensions/sidebar/ephy-sidebar-embed.c~ 2006-01-19 16:40:26.000000000 +0100
++++ extensions/sidebar/ephy-sidebar-embed.c 2007-01-20 22:19:32.000000000 +0100
+@@ -372,7 +372,7 @@
+ /* shift+click saves the link target */
+ else if (is_link && is_left_click && with_shift)
+ {
+- save_property_url (embed, event, "link", CONF_STATE_SAVE_DIR);
++ save_property_url (embed, event, "link", CONF_STATE_DOWNLOAD_DIR);
+ }
+ /* Left+click on a _content target opens in current tab */
+ else if (is_left_click && is_link &&
+--- extensions/sidebar/sidebar-commands.c~ 2006-01-19 16:40:26.000000000 +0100
++++ extensions/sidebar/sidebar-commands.c 2007-01-20 22:20:05.000000000 +0100
+@@ -59,7 +59,7 @@
+ ephy_embed_persist_set_flags
+ (persist, EPHY_EMBED_PERSIST_MAINDOC | EPHY_EMBED_PERSIST_ASK_DESTINATION);
+ ephy_embed_persist_set_persist_key
+- (persist, CONF_STATE_SAVE_DIR);
++ (persist, CONF_STATE_DOWNLOAD_DIR);
+
+ ephy_embed_persist_save (persist);
+
+@@ -100,7 +100,7 @@
+ ephy_embed_persist_set_flags
+ (persist, ask_dest ? EPHY_EMBED_PERSIST_ASK_DESTINATION : 0);
+ ephy_embed_persist_set_persist_key
+- (persist, CONF_STATE_SAVE_DIR);
++ (persist, CONF_STATE_DOWNLOAD_DIR);
+ ephy_embed_persist_set_source (persist, location);
+
+ ephy_embed_persist_save (persist);
Modified: packages/unstable/epiphany-extensions/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/rules?rev=10348&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/rules (original)
+++ packages/unstable/epiphany-extensions/debian/rules Wed Apr 25 04:22:15 2007
@@ -3,14 +3,15 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-static --with-extensions=all,adblock,greasemonkey,rss --with-mozilla=xulrunner --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-static --with-extensions=all,greasemonkey,rss,epilicious --with-mozilla=xulrunner --disable-scrollkeeper
binary-post-install/epiphany-extensions::
- rm -rf debian/epiphany-extensions/var
- dh_pysupport -V`pyversions -dv` /usr/lib/epiphany/2.14/extensions
+ dh_pysupport -V`pyversions -dv` /usr/lib/epiphany/$(DEB_GNOME_VERSION)/extensions
clean::
rm -f po/.intltool-merge-cache
More information about the pkg-gnome-commits
mailing list