r26333 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in copyright
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Mon Jan 17 00:08:44 UTC 2011
Author: pochu
Date: Mon Jan 17 00:08:34 2011
New Revision: 26333
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26333
Log:
* debian/control.in:
- Drop no longer needed build dependencies.
- Fix the -dev package dependencies.
- Make the -dbg package recommend the new webkit -dbg package
instead of the old one.
- Bump the gobject-introspection build dependencies.
* debian/copyright:
- Stop mentioning flashblock.tar, we no longer ship it.
Modified:
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/control.in
desktop/experimental/epiphany-browser/debian/copyright
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=26333&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Mon Jan 17 00:08:34 2011
@@ -19,6 +19,16 @@
* debian/branding.conf.in: Set VendorSub to sid/experimental
* debian/watch: Bump version to 4
* Bump debhelper compatibility to 8
+
+ [ Emilio Pozuelo Monfort ]
+ * debian/control.in:
+ - Drop no longer needed build dependencies.
+ - Fix the -dev package dependencies.
+ - Make the -dbg package recommend the new webkit -dbg package
+ instead of the old one.
+ - Bump the gobject-introspection build dependencies.
+ * debian/copyright:
+ - Stop mentioning flashblock.tar, we no longer ship it.
-- Laurent Bigonville <bigon at debian.org> Sun, 16 Jan 2011 16:57:01 +0100
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=26333&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Mon Jan 17 00:08:34 2011
@@ -10,29 +10,21 @@
Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Laurent Bigonville <bigon at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 8),
cdbs,
+ gnome-pkg-tools (>= 0.10),
pkg-config,
libglib2.0-dev (>= 2.25.13),
libgtk3.0-dev (>= 2.99.1),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
- libglade2-dev (>= 2.3.1),
- libgnome2-dev (>= 2.14.0),
- libgnomeui-dev (>= 2.16.0-2),
- libgconf2-dev,
libgnome-keyring-dev (>= 2.26.0),
- libgnome-desktop-dev (>= 2.9.91),
libstartup-notification0-dev (>= 0.5),
- libcanberra-gtk-dev (>= 0.3),
- libnotify-dev (>= 0.4),
libdbus-glib-1-dev (>= 0.60),
libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
- scrollkeeper,
- gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
libwebkitgtk-3.0-dev (>= 1.3.9),
- gobject-introspection (>= 0.6.7),
- libgirepository1.0-dev (>= 0.6.7),
+ gobject-introspection (>= 0.9.12-4~),
+ libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-freedesktop,
@@ -43,15 +35,11 @@
intltool (>= 0.40.0),
x11proto-core-dev,
network-manager-dev [linux-any],
- libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
- lsb-release,
- sharutils,
- zip,
ca-certificates,
gsettings-desktop-schemas-dev (>= 0.0.1)
-Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
+Build-Depends-Indep: libglib2.0-doc, libgtk3.0-doc
Standards-Version: 3.9.1
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
@@ -115,8 +103,8 @@
Depends: epiphany-browser (>= ${binary:Version}),
epiphany-browser-data (= ${source:Version}),
${misc:Depends},
- libgtk2.0-dev (>= 2.16.0),
- libwebkit-dev
+ libgtk3.0-dev (>= 2.99.1),
+ libwebkitgtk-3.0-dev
Conflicts: epiphany-webkit-dev
Replaces: epiphany-webkit-dev
Description: Development files for the GNOME web browser
@@ -131,7 +119,7 @@
Section: debug
Priority: extra
Depends: epiphany-browser (= ${binary:Version}), ${misc:Depends}
-Recommends: libwebkit-1.0-2-dbg
+Recommends: libwebkitgtk-3.0-0-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-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=26333&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Mon Jan 17 00:08:34 2011
@@ -5,29 +5,21 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8),
cdbs,
+ gnome-pkg-tools (>= 0.10),
pkg-config,
libglib2.0-dev (>= 2.25.13),
libgtk3.0-dev (>= 2.99.1),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
- libglade2-dev (>= 2.3.1),
- libgnome2-dev (>= 2.14.0),
- libgnomeui-dev (>= 2.16.0-2),
- libgconf2-dev,
libgnome-keyring-dev (>= 2.26.0),
- libgnome-desktop-dev (>= 2.9.91),
libstartup-notification0-dev (>= 0.5),
- libcanberra-gtk-dev (>= 0.3),
- libnotify-dev (>= 0.4),
libdbus-glib-1-dev (>= 0.60),
libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
- scrollkeeper,
- gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
libwebkitgtk-3.0-dev (>= 1.3.9),
- gobject-introspection (>= 0.6.7),
- libgirepository1.0-dev (>= 0.6.7),
+ gobject-introspection (>= 0.9.12-4~),
+ libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-freedesktop,
@@ -38,15 +30,11 @@
intltool (>= 0.40.0),
x11proto-core-dev,
network-manager-dev [linux-any],
- libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
- lsb-release,
- sharutils,
- zip,
ca-certificates,
gsettings-desktop-schemas-dev (>= 0.0.1)
-Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
+Build-Depends-Indep: libglib2.0-doc, libgtk3.0-doc
Standards-Version: 3.9.1
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
@@ -110,8 +98,8 @@
Depends: epiphany-browser (>= ${binary:Version}),
epiphany-browser-data (= ${source:Version}),
${misc:Depends},
- libgtk2.0-dev (>= 2.16.0),
- libwebkit-dev
+ libgtk3.0-dev (>= 2.99.1),
+ libwebkitgtk-3.0-dev
Conflicts: epiphany-webkit-dev
Replaces: epiphany-webkit-dev
Description: Development files for the GNOME web browser
@@ -126,7 +114,7 @@
Section: debug
Priority: extra
Depends: epiphany-browser (= ${binary:Version}), ${misc:Depends}
-Recommends: libwebkit-1.0-2-dbg
+Recommends: libwebkitgtk-3.0-0-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-browser/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/copyright?rev=26333&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/copyright [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/copyright [utf-8] Mon Jan 17 00:08:34 2011
@@ -98,52 +98,6 @@
--------------------------------------------------------------------------
-'flashblock.tar' was checked out on Friday April 4th at 18:36 UTC with the
-following command: 'cvs -d :pserver:guest at mozdev.org:/cvs co flashblock/source'
-(having previous logged in with the password 'guest'. The following license
-statement was taken from <http://flashblock.mozdev.org/licences.html>:
-
- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this collection are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is the "Flashblock" extension for Mozilla and Firefox.
-
- The Initial Developer of the Original Code is
- Ted Mielczarek <luser_mozdev at perilith.com>.
-
- Portions created by the Initial Developer are Copyright (C) 2004
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Ted Drake
- Przemyslaw Bialik
- Lorenzo Colitti
- Philip Chee <philip.chee at gmail.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK *****
-
The Debian packaging is (C) 2003-2007, the Debian GNOME team
<pkg-gnome-maintainers at lists.alioth.debian.org> and
is licensed under the GPL, see above.
More information about the pkg-gnome-commits
mailing list