r1846 - in /experimental/gtkhtml4.0/debian: ./ lintian/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Mar 19 17:44:13 UTC 2011
Author: joss
Date: Sat Mar 19 17:44:12 2011
New Revision: 1846
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1846
Log:
* Add myself to uploaders.
* New upstream pre-release.
* Change source package name and all binary package names.
* Ship glade catalog.
* Massive update in dependencies and build-dependencies.
* Put all translations and data in a single libgtkhtml-4.0-common
package.
* Add missing dependency on gnome-icon-theme.
* Make copyright up-to-date.
* Drop chrpath usage.
Added:
experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.install
- copied, changed from r1845, experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.install
experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.shlibs
- copied, changed from r1845, experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.shlibs
experimental/gtkhtml4.0/debian/libgtkhtml-4.0-common.install
- copied, changed from r1845, experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-common.install
experimental/gtkhtml4.0/debian/libgtkhtml-4.0-dev.install
- copied, changed from r1845, experimental/gtkhtml4.0/debian/libgtkhtml3.14-dev.install
experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-0.install
- copied unchanged from r1845, experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-0.install
experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-0.shlibs
- copied, changed from r1845, experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-0.shlibs
experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-dev.install
- copied, changed from r1845, experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-dev.install
Removed:
experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-0.install
experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-0.shlibs
experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-common.install
experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-dev.install
experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.install
experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.shlibs
experimental/gtkhtml4.0/debian/libgtkhtml3.14-dev.install
experimental/gtkhtml4.0/debian/lintian/
Modified:
experimental/gtkhtml4.0/debian/changelog
experimental/gtkhtml4.0/debian/control
experimental/gtkhtml4.0/debian/copyright
experimental/gtkhtml4.0/debian/rules
Modified: experimental/gtkhtml4.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/changelog?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/changelog (original)
+++ experimental/gtkhtml4.0/debian/changelog Sat Mar 19 17:44:12 2011
@@ -1,10 +1,23 @@
-gtkhtml3.14 (3.32.2-2) UNRELEASED; urgency=low
-
+gtkhtml4.0 (3.91.91-1) UNRELEASED; urgency=low
+
+ [ Yves-Alexis Perez ]
* debian/watch:
- use .tar.bz2 since we use 3.0 source format.
* debian/uupdate dropped, useless now.
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 13 Feb 2011 10:46:50 +0100
+ [ Josselin Mouette ]
+ * Add myself to uploaders.
+ * New upstream pre-release.
+ * Change source package name and all binary package names.
+ * Ship glade catalog.
+ * Massive update in dependencies and build-dependencies.
+ * Put all translations and data in a single libgtkhtml-4.0-common
+ package.
+ * Add missing dependency on gnome-icon-theme.
+ * Make copyright up-to-date.
+ * Drop chrpath usage.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 19 Mar 2011 18:29:40 +0100
gtkhtml3.14 (3.32.2-1) unstable; urgency=low
Modified: experimental/gtkhtml4.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/control?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/control (original)
+++ experimental/gtkhtml4.0/debian/control Sat Mar 19 17:44:12 2011
@@ -1,4 +1,4 @@
-Source: gtkhtml3.14
+Source: gtkhtml4.0
Section: gnome
Priority: optional
Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers at lists.alioth.debian.org>
@@ -6,100 +6,101 @@
Heikki Henriksen <heikkih at gmail.com>,
Oystein Gisnas <oystein at gisnas.net>,
Pedro Fragoso <ember at ubuntu.com>,
- Yves-Alexis Perez <corsac at debian.org>
+ Yves-Alexis Perez <corsac at debian.org>,
+ Josselin Mouette <joss at debian.org>
Standards-Version: 3.9.1
Dm-Upload-Allowed: yes
Homepage: http://www.gnome.org/projects/evolution/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/gtkhtml3.14
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.14
+Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/experimental/gtkhtml4.0
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0
Build-Depends: debhelper (>= 7.2.3~),
cdbs (>= 0.4.37),
dpkg-dev (>= 1.14.16),
hardening-includes,
pkg-config,
libtool,
+ libgtk-3-dev (>= 3.0),
+ libenchant-dev (>= 1.1.7),
+ libgconf2-dev,
+ gnome-icon-theme (>= 2.22.0),
+ libcairo2-dev (>= 1.10.0),
intltool (>= 0.36.3),
- libgail-dev (>= 1.1.0),
- libgnomeui-dev (>= 2.0.0),
- libpango1.0-dev (>= 1.5),
+ libgail-3-dev (>= 3.0),
+ iso-codes (>= 0.49),
+ libgladeui-1-dev,
liborbit2-dev,
- libsoup2.4-dev,
- libgtk2.0-dev (>= 2.20.0),
- gnome-icon-theme (>= 1.2.0),
- gnome-pkg-tools,
- chrpath,
- libenchant-dev,
- libgconf2-dev,
- iso-codes
+ libsoup2.4-dev (>= 2.26),
+ x11proto-core-dev,
+ gnome-pkg-tools
-Package: libgtkhtml3.14-19
+Package: libgtkhtml-4.0-0
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
-Suggests: libgtkhtml3.14-dbg
-Replaces: gtkhtml3.14 (<< 3.16.0)
-Conflicts: gtkhtml3.14 (<< 3.16.0)
+ libgtkhtml-4.0-common (= ${source:Version})
Description: HTML rendering/editing library - runtime files
GtkHTML is a lightweight HTML rendering/printing/editing engine.
.
This package contains the library and the translations.
-Package: libgtkhtml3.14-dev
+Package: libgtkhtml-4.0-dev
Architecture: any
Section: libdevel
-Depends: libgtkhtml3.14-19 (= ${binary:Version}),
+Depends: libgtkhtml-4.0-0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
- libgnomeui-dev,
- libgtk2.0-dev (>= 2.10.0),
+ libgtk-3-dev,
libenchant-dev,
- iso-codes
+ libgconf2-dev,
+ iso-codes,
+ libcairo2-dev
Description: HTML rendering/editing library - development files
GtkHTML is a lightweight HTML rendering/printing/editing engine.
.
This package contains the headers and files used for development.
-Package: libgtkhtml3.14-dbg
+Package: libgtkhtml-4.0-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgtkhtml3.14-19 (= ${binary:Version}),
+Depends: libgtkhtml-4.0-0 (= ${binary:Version}),
+ libgtkhtml-editor-4.0-0 (= ${binary:Version}),
${misc:Depends}
Description: HTML rendering/editing library - debug files
GtkHTML is a lightweight HTML rendering/printing/editing engine.
.
This package contains the unstripped libraries used for debugging purposes.
-Package: libgtkhtml-editor-3.14-0
+Package: libgtkhtml-editor-4.0-0
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
- libgtkhtml-editor-3.14-common (= ${source:Version})
-Breaks: libgtkhtml3.14 (<< 3.26)
+ libgtkhtml-4.0-common (= ${source:Version}),
+ libgtkhtml-4.0-0 (= ${binary:Version})
Description: HTML rendering/editing library - editor widget
GtkHTML is a lightweight HTML rendering/printing/editing engine.
.
This package contains the editor widget.
-Package: libgtkhtml-editor-3.14-common
+Package: libgtkhtml-4.0-common
Section: libs
Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
-Conflicts: gtkhtml3.14, libgtkhtml-editor-common
-Replaces: gtkhtml3.14, libgtkhtml-editor-common
-Description: HTML rendering/editing library - editor widget data
+ gnome-icon-theme (>= 2.22.0)
+Description: HTML rendering/editing library - common data
GtkHTML is a lightweight HTML rendering/printing/editing engine.
.
- This package contains the editor widget data.
+ This package contains the translations and the editor widget data.
-Package: libgtkhtml-editor-3.14-dev
+Package: libgtkhtml-editor-4.0-dev
Architecture: any
Section: libdevel
Priority: extra
-Depends: libgtkhtml-editor-3.14-0 (= ${binary:Version}),
+Depends: libgtkhtml-editor-4.0-0 (= ${binary:Version}),
+ libgtkhtml-4.0-dev (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: HTML rendering/editing library - editor widget development files
Modified: experimental/gtkhtml4.0/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/copyright?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/copyright (original)
+++ experimental/gtkhtml4.0/debian/copyright Sat Mar 19 17:44:12 2011
@@ -7,13 +7,10 @@
Source:
It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/
-Copyright:
-1998-2010 (C) Various copyright beholders (see below)
-
-Upstream Authors and Copyright Holders:
- Torben Weis <weis at stud.uni-frankfurt.de>
+Upstream Authors:
+ Torben Weis <weis at stud.uni-frankfurt.de>
Josip A. Gracin <grac at fly.cc.fer.hr>
- Martin Jones <mjones at kde.org>
+ Martin Jones <mjones at kde.org>
Anders Carlsson <andersca at gnu.org>
Ettore Perazzoli <ettore at ximian.com>
Jonas Borgström <jonas_b at bitsmart.com>
@@ -27,13 +24,18 @@
Martijn van Beers <martijn at earthling.net>
James Henstridge <james at daa.com.au>
Ariel Rios <ariel at galway.com.mx>
- Novell, Inc
- World Wide Web Consortium
- Free Software Foundation, Inc.
- Red Hat, Inc.
-The complete list of upstream authors can be found in the file
-/usr/share/doc/gtkhtml3.14/AUTHORS.
+Copyright:
+ Copyright © 1999-2001 Helix Code, Inc.
+ Copyright © 2001 Ariel Rios
+ Copyright © 2000-2003 Ximian, Inc.
+ Copyright © 1997 Martin Jones
+ Copyright © 1997 Torben Weis
+ Copyright © 1998 World Wide Web Consortium
+ Copyright © 1999 Anders Carlsson
+ Copyright © 1999 Red Hat Software
+ Copyright © 2000 Jonas Borgström
+ Copyright © 2005-2008 Novell, Inc.
License:
The library (gtkhtml/) is released under the LGPL:
@@ -55,7 +57,7 @@
The full license-text can be found in /usr/share/common-licenses/LGPL.
--
-The accessibility (a11y) is released under the LGPL:
+The accessibility module (a11y/) is released under the LGPL:
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -71,14 +73,15 @@
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
+
+The full license-text can be found in /usr/share/common-licenses/LGPL.
--
-The component (components/) is released under the GPL:
+The editor component (components/editor/) is released under the LGPL:
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of version 2 of the GNU Lesser General
+ Public License as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -89,5 +92,4 @@
with this program; if not, write to the Free Software Foundation, Inc., 51
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-The full license-text can be found in /usr/share/common-licenses/GPL.
-
+The full license-text can be found in /usr/share/common-licenses/LGPL-2.
Copied: experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.install (from r1845, experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.install?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.install (original)
+++ experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.install Sat Mar 19 17:44:12 2011
@@ -1,3 +1,1 @@
-debian/tmp/usr/lib/libgtkhtml-3.14*.so.*
-debian/tmp/usr/share/locale
-debian/lintian/libgtkhtml3.14-19 usr/share/lintian/overrides/
+debian/tmp/usr/lib/libgtkhtml-4*.so.*
Copied: experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.shlibs (from r1845, experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.shlibs)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.shlibs?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/libgtkhtml3.14-19.shlibs (original)
+++ experimental/gtkhtml4.0/debian/libgtkhtml-4.0-0.shlibs Sat Mar 19 17:44:12 2011
@@ -1,1 +1,1 @@
-libgtkhtml-3.14 19 libgtkhtml3.14-19 (>= 3.32.0), libgtkhtml3.14-19 (<< 3.33)
+libgtkhtml-4.0 0 libgtkhtml-4.0-0 (>= 3.91.91), libgtkhtml-4.0-0 (<< 4.1)
Copied: experimental/gtkhtml4.0/debian/libgtkhtml-4.0-common.install (from r1845, experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-common.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/libgtkhtml-4.0-common.install?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-common.install (original)
+++ experimental/gtkhtml4.0/debian/libgtkhtml-4.0-common.install Sat Mar 19 17:44:12 2011
@@ -1,1 +1,2 @@
+debian/tmp/usr/share/locale
debian/tmp/usr/share/gtkhtml-*
Copied: experimental/gtkhtml4.0/debian/libgtkhtml-4.0-dev.install (from r1845, experimental/gtkhtml4.0/debian/libgtkhtml3.14-dev.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/libgtkhtml-4.0-dev.install?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/libgtkhtml3.14-dev.install (original)
+++ experimental/gtkhtml4.0/debian/libgtkhtml-4.0-dev.install Sat Mar 19 17:44:12 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libgtkhtml-3.14/gtkhtml
-debian/tmp/usr/lib/libgtkhtml-3.14*.a
-debian/tmp/usr/lib/libgtkhtml-3.14*.so
-debian/tmp/usr/lib/pkgconfig/libgtkhtml-3.14.pc
+debian/tmp/usr/include/libgtkhtml-4*/gtkhtml
+debian/tmp/usr/lib/libgtkhtml-4*.a
+debian/tmp/usr/lib/libgtkhtml-4*.so
+debian/tmp/usr/lib/pkgconfig/libgtkhtml-4*.pc
Copied: experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-0.shlibs (from r1845, experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-0.shlibs)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-0.shlibs?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-0.shlibs (original)
+++ experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-0.shlibs Sat Mar 19 17:44:12 2011
@@ -1,1 +1,1 @@
-libgtkhtml-editor-3.14 0 libgtkhtml-editor-3.14-0 (>= 3.32.0), libgtkhtml-editor-3.14-0 (<< 3.33)
+libgtkhtml-editor-4.0 0 libgtkhtml-editor-4.0-0 (>= 3.91.91), libgtkhtml-editor-4.0-0 (<< 4.1)
Copied: experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-dev.install (from r1845, experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-dev.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-dev.install?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/libgtkhtml-editor-3.14-dev.install (original)
+++ experimental/gtkhtml4.0/debian/libgtkhtml-editor-4.0-dev.install Sat Mar 19 17:44:12 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libgtkhtml-3.14/editor
+debian/tmp/usr/include/libgtkhtml-*/editor
debian/tmp/usr/lib/libgtkhtml-editor*.a
debian/tmp/usr/lib/libgtkhtml-editor*.so
-debian/tmp/usr/lib/pkgconfig/gtkhtml-editor-3.14.pc
+debian/tmp/usr/lib/pkgconfig/gtkhtml-editor-*.pc
Modified: experimental/gtkhtml4.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0/debian/rules?rev=1846&op=diff
==============================================================================
--- experimental/gtkhtml4.0/debian/rules (original)
+++ experimental/gtkhtml4.0/debian/rules Sat Mar 19 17:44:12 2011
@@ -8,12 +8,6 @@
GNOME_MODULE := gtkhtml
-CURRENT := $(shell sed -n 's/^GTKHTML_CURRENT=//p' configure.ac)
-AGE := $(shell sed -n 's/^GTKHTML_AGE=//p' configure.ac)
-REVISION := $(shell sed -n 's/^GTKHTML_REVISION=//p' configure.ac)
-SOVERSION := $(shell expr $(CURRENT) - $(AGE))
-API_VER := 3.14
-
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
@@ -21,18 +15,7 @@
export CFLAGS LDFLAGS
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --enable-gtk3=no
-DEB_SHLIBDEPS_INCLUDE_gtkhtml$(API_VER) += $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib
-DEB_DH_MAKESHLIBS_ARGS_gtkhtml$(API_VER) += --noscripts
-DEB_SHLIBDEPS_INCLUDE_libgtkhtml$(API_VER)-dev += $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib
-DEB_DH_MAKESHLIBS_ARGS_libgtkhtml$(API_VER)-$(SOVERSION) += -V 'libgtkhtml$(API_VER)-$(SOVERSION) (>= $(DEB_UPSTREAM_VERSION))'
-
-binary-post-install/libgtkhtml$(API_VER)-$(SOVERSION)::
- chrpath -d -k \
- $(CURDIR)/debian/libgtkhtml$(API_VER)-$(SOVERSION)/usr/lib/libgtkhtml-$(API_VER).so.$(SOVERSION).$(AGE).$(REVISION)
-
-binary-post-install/libgtkhtml-editor-$(API_VER)-0::
- chrpath -d -k $(CURDIR)/debian/libgtkhtml-editor-$(API_VER)-0/usr/lib/libgtkhtml-editor-$(API_VER).so.0.0.0
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
common-binary-post-install-indep::
dh_bugfiles -A
More information about the pkg-evolution-commits
mailing list