r1609 - in /unstable/evolution/debian: ./ lintian/
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Mon May 17 11:28:14 UTC 2010
Author: corsac
Date: Mon May 17 11:28:14 2010
New Revision: 1609
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1609
Log:
merge experimental into unstable branch
Added:
unstable/evolution/debian/NEWS
- copied unchanged from r1605, experimental/evolution/debian/NEWS
Removed:
unstable/evolution/debian/NEWS.Debian
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/control
unstable/evolution/debian/copyright
unstable/evolution/debian/docs
unstable/evolution/debian/evolution-common.install
unstable/evolution/debian/evolution-mail.desktop
unstable/evolution/debian/evolution-plugins-experimental.install
unstable/evolution/debian/evolution-plugins.install
unstable/evolution/debian/evolution.install
unstable/evolution/debian/evolution.links
unstable/evolution/debian/lintian/evolution-common
unstable/evolution/debian/rules
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Mon May 17 11:28:14 2010
@@ -1,3 +1,182 @@
+evolution (2.30.1.2-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix nm disabled in linux builds. closes: #579592
+ * debian/control:
+ - drop recommends on gnome-pilot-conduits since we don't build anymore
+ with pilot support. closes: #580293
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 05 May 2010 08:00:26 +0200
+
+evolution (2.30.1.2-1) experimental; urgency=low
+
+ * New upstream bugfix release.
+ * debian/patches:
+ - 03_fix-face-plugin-linking dropped, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 28 Apr 2010 21:36:23 +0200
+
+evolution (2.30.1.1-1) experimental; urgency=low
+
+ * New upstream bugfix release.
+ * debian/patches:
+ - 03_fix-face-plugin-linking, fix ftbfs with face plugin.
+ * debian/control:
+ - bump (build-)deps to gtkhtml/eds 2.30.1.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 26 Apr 2010 21:12:22 +0200
+
+evolution (2.30.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/watch updated to track stable releases.
+ * debian/control:
+ - bump eds and gtkhtml build-deps to 2.30.
+ * debian/evolution-mail.desktop: update components version to 2.30.
+ * debian/lintian/evolution-common:
+ - add an override for evolution-settings command not being in the package.
+ * debian/lintian:
+ - evolution-plugins dropped, useless now.
+ - evolution-plugins-experimental dropped as well.
+ * debian/evolution-plugins-experimental.install,
+ debian/evolution-plugins.install: don't install lintian overrides.
+
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 24 Apr 2010 13:40:06 +0200
+
+evolution (2.29.92.1-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/copyright updated.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 21 Mar 2010 19:36:21 +0100
+
+evolution (2.29.92-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/control:
+ - bump build-deps on eds and gtkhtml.
+ * debian/rules:
+ - remove deprecated --enable-nntp arg to configure.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 08 Mar 2010 23:16:12 +0100
+
+evolution (2.29.91-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/control:
+ - bump build-deps on eds and gtkhtml.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 23 Feb 2010 21:38:32 +0100
+
+evolution (2.29.90-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/control:
+ - bump build-deps on eds et gtkhtml.
+ - add build-dep on libunique-dev.
+ - bump standards version to 3.8.4.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 08 Feb 2010 22:36:39 +0100
+
+evolution (2.29.6-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/control:
+ - bump eds and gtkhtml versions to 2.29.6.
+ * debian/rules:
+ - disable nm on non Linux builds, fix FTBFS on kFreeBSD. closes: #566928
+ * debian/patches
+ - 02_fix-gtkdoc dropped.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 26 Jan 2010 20:06:10 +0100
+
+evolution (2.29.5-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/control:
+ - drop build-dep on libgnomeprint.
+ - bump eds and gtkhtml versions to 2.29.5.
+ - bump GTK+ build-dep to 2.18.
+ - drop build-dep on hal.
+ - drop build-dep on gnome-pilot.
+ * debian/patches:
+ - drop 02_fix-ftbfs-pilot_charset.
+ - 02_fix-gtkdoc added, fix FTBFS with gtk-doc 1.13.
+ * drop gnome-pilot support. *
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 16 Jan 2010 10:38:59 +0100
+
+evolution (2.29.3.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - add libgtkhtml3.14-dev to evolution-dev dependencies.
+ - bump glib build-dep to 2.22.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 15 Dec 2009 21:43:56 +0100
+
+evolution (2.29.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - update build deps for gtkhtml 3.29.3 and eds 2.29.3.
+ - drop libglade build-dep.
+ * debian/rules:
+ - don't build contact-map plugin for now.
+ * debian/patches:
+ - 02_fix-ftbfs-pilot_charset added, fix FTBFS because of unknown component
+ in structure by reverting the culprit commit (GNOME #603452).
+ * debian/*.install:
+ - don't install non existent .glade files.
+ * debian/libevolution.install: install killev in the package.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 03 Dec 2009 21:20:29 +0100
+
+evolution (2.29.2-1) experimental; urgency=low
+
+ [2.29.1]
+ * New upstream development release.
+ * debian/watch updated to track development releases.
+ * debian/control:
+ - add a new libevolution package to separate the libs from the main
+ package.
+ - update build deps:
+ + drop bonobo, gnomeui, and libexchange-storage ;
+ + add libunique-dev, libcanberra-dev, libcanberra-gtk-dev ;
+ + update gtkhtml and eds to 2.29.1.
+ * debian/{lib,}evolution.install: ship libs in the libevolution package.
+ * debian/rules:
+ - update ELIBDIR to 2.30.
+ - don't build exchange plugin now inexistant.
+ - drop unknown configure options:
+ + --without-openssl-includes, --without-openssl-libs, --disable-openssl
+ + --enable-cairo-calendar,
+ + --without-krb4,
+ + --enable-ipv6,
+ - don't build pstimport plugin since we don't have libpst in Debian.
+ * debian/lintian: update paths to 2.29.
+ * debian/*.install:
+ - update paths to 2.30 ;
+ - move vcard, custom-headers, webdav and templates plugin from
+ experimental to base package.
+ * debian/evolution-dev.install:
+ - drop bonobo interface folder.
+
+ [2.29.2]
+ * New upstream development release.
+ * debian/control:
+ - update build-deps for 2.29.2.
+ - add build-deps on libgtkimageview-dev.
+ * debian/evolution-plugins.install:
+ - add inline image viewer plugin.
+ * debian/links:
+ - drop manpage symlink.
+ - add evolution-addressbook-clean and evolution-backup synlinks to
+ /usr/bin.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 16 Nov 2009 21:54:13 +0100
+
evolution (2.28.3-1) unstable; urgency=low
* New upstream bugfix release.
Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Mon May 17 11:28:14 2010
@@ -28,36 +28,28 @@
gtk-doc-tools (>= 0.6),
libatk1.0-dev,
libldap2-dev,
- libgtkhtml3.14-dev (>= 3.28.3),
- libgtkhtml-editor-dev (>= 3.28.3),
- libgnome-pilot2-dev (>= 2.0.15),
+ libgtkhtml3.14-dev (>= 3.30.1),
+ libgtkhtml-editor-dev (>= 3.30.1),
libkrb5-dev,
libnss3-dev,
psmisc,
- libglib2.0-dev (>= 2.15.3),
- liborbit2-dev (>= 1:2.9.8),
- libbonobo2-dev (>= 2.20.3),
- evolution-data-server-dev (>= 2.28.3),
- evolution-data-server-dev (<< 2.29.0),
- libgtk2.0-dev (>= 2.12.0),
- libbonoboui2-dev (>= 2.4.2),
- libgnomevfs2-dev (>= 2.4),
- libgnomeui-dev,
- libglade2-dev,
+ libglib2.0-dev (>= 2.22.0),
+ evolution-data-server-dev (>= 2.30.1),
+ evolution-data-server-dev (<< 2.31),
+ libgtk2.0-dev (>= 2.18.0),
libgnomecanvas2-dev,
libxml2-dev,
libgconf2-dev,
- libcamel1.2-dev (>= 2.28.3),
- libhal-dev (>= 0.5.4) [!hurd-i386],
- libedataserver1.2-dev (>= 2.28.3),
- libegroupwise1.2-dev (>= 2.28.3),
- libedataserverui1.2-dev (>= 2.28.3),
- libebackend1.2-dev (>= 2.28.3),
- libgdata1.2-dev (>= 2.28.3),
- libgdata-google1.2-dev (>= 2.28.3),
+ libcamel1.2-dev (>= 2.30.1),
+ libedataserver1.2-dev (>= 2.30.1),
+ libegroupwise1.2-dev (>= 2.30.1),
+ libedataserverui1.2-dev (>= 2.30.1),
+ libebackend1.2-dev (>= 2.30.1),
+ libgdata1.2-dev (>= 2.30.1),
+ libgdata-google1.2-dev (>= 2.30.1),
libgnome2-dev,
- libecal1.2-dev (>= 2.28.3),
- libebook1.2-dev (>= 2.28.3),
+ libecal1.2-dev (>= 2.30.1),
+ libebook1.2-dev (>= 2.30.1),
libdbus-glib-1-dev,
libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libnotify-dev (>= 0.3.0),
@@ -66,7 +58,6 @@
libexchange-storage1.2-dev (>= 2.28.3),
libgstreamer0.10-dev,
libytnef0-dev,
- pilot-link,
automake,
libtool,
libical-dev,
@@ -75,19 +66,20 @@
po-debconf,
libgnome-desktop-dev (>= 2.26.0),
sharutils
+ libgtkimageview-dev,
+ libunique-dev
Package: evolution
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
- evolution-data-server (>= 2.28.3),
- evolution-data-server (<< 2.29.0),
- gnome-icon-theme (>= 2.19.91),
+ evolution-data-server (>= 2.30.1),
+ evolution-data-server (<< 2.31),
+ gnome-icon-theme (>= 2.19.92),
dbus
Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
-Recommends: gnome-pilot-conduits (>= 2.0.9),
- gnome-desktop-data,
+Recommends: gnome-desktop-data,
evolution-plugins,
evolution-webcal,
yelp,
@@ -138,6 +130,14 @@
- exchange-operations
- mono
+Package: libevolution
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Replaces: evolution (<< 2.29.1-1)
+Description: evolution libraries
+ This package contains libraries used by evolution and the Anjal mail client.
+
Package: evolution-common
Architecture: all
Depends: ${misc:Depends}
@@ -171,9 +171,10 @@
libglade2-dev,
# other (to check against 2.28)
libebook1.2-dev,
+ libgtkhtml3.14-dev,
libgnome2-dev,
- libgnomeui-dev,
- libbonoboui2-dev (>= 2.20.3)
+ libcamel1.2-dev,
+ libxml2-dev
Description: development library files for Evolution
Evolution is a groupware suite which integrates mail, calendar,
address book, to-do list and memo tools.
@@ -198,6 +199,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: evolution-plugins-experimental (<< 2.29.2-1)
+Replaces: evolution-plugins-experimental (<< 2.29.1-1)
Recommends: notification-daemon
Description: standard plugins for Evolution
Evolution is a groupware suite which integrates mail, calendar,
@@ -224,6 +227,7 @@
- attachment-reminder
- face
- backup-restore
+ - image-inline
Package: evolution-plugins-experimental
Architecture: any
Modified: unstable/evolution/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/copyright?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/copyright (original)
+++ unstable/evolution/debian/copyright Mon May 17 11:28:14 2010
@@ -1,117 +1,210 @@
+= Copyright and licensing information
+
This package was debianized by Takuo KITAME <takuo at northeye.org> on
Tue, 13 Feb 2001 21:33:43 +0900.
It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/evolution/>.
- Copyright 2003 Ximian, Inc. (www.ximian.com)
-
- Authors:
-
-Addressbook
- Arturo Esponosa <arturo at nuclecu.unam.mx> (Original Gnomecard author)
- Nat Friedman <nat at ximian.com>
- Chris Lahey <clahey at ximian.com>
- Chris Toshok <toshok at ximian.com>
- Jon Trowbridge <trow at ximian.com>
-
-Artwork
- Tuomas Kuosmanen <tigert at ximian.com>
- Jakub Steiner <jimmac at ximian.com>
-
-Calendar
- Seth Alves <seth at ximian.com>
- Eric Busboom <eric at softwarestudio.org> (libical author)
- Arturo Esponosa <arturo at nuclecu.unam.mx> (Gnomecal contributor)
- Damon Chaplin <damon at ximian.com>
- Federico Mena-Quintero <federico at ximian.com>
- Rodrigo Moya <rodrigo at ximian.com>
- Jesse Pavel <jesse at ximian.com>
- JP Rosevear <jpr at ximian.com>
- Russell Steinthal <rms39 at columbia.edu> (Gnomecal maintainer)
-
-Documentation
- Kevin Breit <mrproper at ximian.com>
- Aaron Weber <aaron at ximian.com>
-
-Mailer
- Radek Doulik <rodo at ximian.com>
- Larry Ewing <lewing at ximian.com>
- Bertrand Guiheneuf <bertrand at ximian.com>
- Jason Leach <jleach at ximian.com>
- Matt Loper <matt at ximian.com>
- Ettore Perazzoli <ettore at ximian.com>
- Jeffrey Stedfast <fejj at ximian.com>
- Jon Trowbridge <trow at ximian.com>
- Peter Williams <peterw at ximian.com>
- Dan Winship <danw at ximian.com>
- Michael Zucchi <notzed at ximian.com>
-
-Notes
- Anders Carlsson <andersca at gnu.org>
-
-Pilot
- JP Rosevear <jpr at ximian.com>
-
-Shell
- Miguel de Icaza <miguel at ximian.com>
- Jason Leach <jleach at ximian.com>
- Ettore Perazzoli <ettore at ximian.com>
-
-Translations
- Akira TAGOH <tagoh at gnome.gr.jp>
- Andraz Tori <andraz.tori1 at guest.arnes.si>
- Andreas Hyden <a.hyden at cyberpoint.se>
- Arjan Scherpenisse <acscherp at wins.uva.nl>
- Clara Tattoni <clara.tattoni at libero.it>
- Fatih Demir <kabalak at gmx.net>
- Gediminas Paulauskas <menesis at delfi.lt>
- GNOME PL Team <translators at gnome.pl>
- Gustavo Maciel Dias Vieira <gdvieira at zaz.com.br>
- Héctor GarcÃa Alvarez <hector at scouts-es.org>
- Jesús Bravo Ãlvarez <jba at pobox.com>
- Keld Simonsen <keld at dkuug.dk>
- Kjartan Maraas <kmaraas at gnome.org>
- Matthias Warkus <mawa at iname.com>
- Spiros Papadimitriou <spapadim+ at cs.cmu.edu>
- Sung-Hyun Nam <namsh at kldp.org>
- Szabolcs BAN <shooby at gnome.hu>
- Tiago Antão <tiagoantao at bigfoot.com>
- Duarte Loreto <happyguy_pt at hotmail.com>
- Valek Filippov <frob at df.ru>
- Vincent Renardias <vincent at redhat.com>
- Yuri Syrota <rasta at renome.rovno.ua>
-
-UI
- Anna Dirks <anna at ximian.com>
-
-Widgets
- Damon Chaplin <damon at ximian.com>
- Miguel de Icaza <miguel at ximian.com>
- Chris Lahey <clahey at ximian.com>
- Federico Mena-Quintero <federico at ximian.com>
- Chris Toshok <toshok at ximian.com>
-
- (The full list is in the /usr/share/doc/evolution/AUTHORS file.)
-
- The documentation material is placed under the GNU Free Documentation License
- and hence can not be included in Debian.
-
-Program License:
-
- This package 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 package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
+== Authors:
+
+The full list is in the /usr/share/doc/evolution/AUTHORS file.
+
+=== Addressbook
+ Arturo Esponosa <arturo at nuclecu.unam.mx> (Original Gnomecard author)
+ Nat Friedman <nat at ximian.com>
+ Chris Lahey <clahey at ximian.com>
+ Chris Toshok <toshok at ximian.com>
+ Jon Trowbridge <trow at ximian.com>
+
+=== Artwork
+ Tuomas Kuosmanen <tigert at ximian.com>
+ Jakub Steiner <jimmac at ximian.com>
+
+=== Calendar
+ Seth Alves <seth at ximian.com>
+ Eric Busboom <eric at softwarestudio.org> (libical author)
+ Arturo Esponosa <arturo at nuclecu.unam.mx> (Gnomecal contributor)
+ Damon Chaplin <damon at ximian.com>
+ Federico Mena-Quintero <federico at ximian.com>
+ Rodrigo Moya <rodrigo at ximian.com>
+ Jesse Pavel <jesse at ximian.com>
+ JP Rosevear <jpr at ximian.com>
+ Russell Steinthal <rms39 at columbia.edu> (Gnomecal maintainer)
+
+=== Documentation
+ Kevin Breit <mrproper at ximian.com>
+ Aaron Weber <aaron at ximian.com>
+
+=== Mailer
+ Radek Doulik <rodo at ximian.com>
+ Larry Ewing <lewing at ximian.com>
+ Bertrand Guiheneuf <bertrand at ximian.com>
+ Jason Leach <jleach at ximian.com>
+ Matt Loper <matt at ximian.com>
+ Ettore Perazzoli <ettore at ximian.com>
+ Jeffrey Stedfast <fejj at ximian.com>
+ Jon Trowbridge <trow at ximian.com>
+ Peter Williams <peterw at ximian.com>
+ Dan Winship <danw at ximian.com>
+ Michael Zucchi <notzed at ximian.com>
+
+=== Notes
+ Anders Carlsson <andersca at gnu.org>
+
+=== Pilot
+ JP Rosevear <jpr at ximian.com>
+
+=== Shell
+ Miguel de Icaza <miguel at ximian.com>
+ Jason Leach <jleach at ximian.com>
+ Ettore Perazzoli <ettore at ximian.com>
+
+=== Translations
+ Akira TAGOH <tagoh at gnome.gr.jp>
+ Andraz Tori <andraz.tori1 at guest.arnes.si>
+ Andreas Hyden <a.hyden at cyberpoint.se>
+ Arjan Scherpenisse <acscherp at wins.uva.nl>
+ Clara Tattoni <clara.tattoni at libero.it>
+ Fatih Demir <kabalak at gmx.net>
+ Gediminas Paulauskas <menesis at delfi.lt>
+ GNOME PL Team <translators at gnome.pl>
+ Gustavo Maciel Dias Vieira <gdvieira at zaz.com.br>
+ Héctor GarcÃa Alvarez <hector at scouts-es.org>
+ Jesús Bravo Ãlvarez <jba at pobox.com>
+ Keld Simonsen <keld at dkuug.dk>
+ Kjartan Maraas <kmaraas at gnome.org>
+ Matthias Warkus <mawa at iname.com>
+ Spiros Papadimitriou <spapadim+ at cs.cmu.edu>
+ Sung-Hyun Nam <namsh at kldp.org>
+ Szabolcs BAN <shooby at gnome.hu>
+ Tiago Antão <tiagoantao at bigfoot.com>
+ Duarte Loreto <happyguy_pt at hotmail.com>
+ Valek Filippov <frob at df.ru>
+ Vincent Renardias <vincent at redhat.com>
+ Yuri Syrota <rasta at renome.rovno.ua>
+
+=== UI
+ Anna Dirks <anna at ximian.com>
+
+=== Widgets
+ Damon Chaplin <damon at ximian.com>
+ Miguel de Icaza <miguel at ximian.com>
+ Chris Lahey <clahey at ximian.com>
+ Federico Mena-Quintero <federico at ximian.com>
+ Chris Toshok <toshok at ximian.com>
+
+
+== Licensing information
+
+=== Program license
+
+Evolution is licensed under the LGPLv2 or LGPLv3 license using following text:
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) version 3.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the program; if not, see <http://www.gnu.org/licenses/>
+
+On Debian systems, the complete text of the GNU Less General Public License
+(version 2) can be found in `/usr/share/common-licenses/LGPL-2'.
+
+=== Exceptions
+
+==== GPLv2
+
+* addressbook/gui/widgets/e-addressbook-selector.{h,c}
+* calendar/gui/e-calendar-selector.c
+* calendar/gui/e-memo-list-selector.c
+* calendar/gui/e-task-list-selector.c
+* calendar/gui/e-task-list-selector.h
+* calendar/gui/e-calendar-selector.h
+* calendar/gui/e-memo-list-selector.h
+
+On Debian systems, the complete text of the GNU General Public License
+(version 2) can be found in `/usr/share/common-licenses/GPL-2'.
+
+==== GPLv2+
+
+* e-util/e-non-intrusive-error-dialog.{h,c}
+* plugins/calendar-weather/calendar-weather.c
+* plugins/calendar-http/calendar-http.c
+* widgets/misc/e-spinner.{h,c}
+
+
+On Debian systems, the complete text of the GNU General Public License
+(version 2 or later) can be found in `/usr/share/common-licenses/GPL'.
+
+==== OpenLDAP license
+
+* modules/addressbook/openldap-extract.h
+
+----
+ The OpenLDAP Public License
+ Version 2.8, 17 August 2003
+
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions in source form must retain copyright statements
+ and notices,
+
+ 2. Redistributions in binary form must reproduce applicable copyright
+ statements and notices, this list of conditions, and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution, and
+
+ 3. Redistributions must contain a verbatim copy of this document.
+
+ The OpenLDAP Foundation may revise this license from time to time.
+ Each revision is distinguished by a version number. You may use
+ this Software under terms of this license revision or under the
+ terms of any subsequent revision of the license.
+
+ THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+ CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+ OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+ The names of the authors and copyright holders must not be used in
+ advertising or otherwise to promote the sale, use or other dealing
+ in this Software without specific, written prior permission. Title
+ to copyright in this Software shall at all times remain with copyright
+ holders.
+
+ OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+ Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
+ California, USA. All Rights Reserved. Permission to copy and
+ distribute verbatim copies of this document is granted.
+----
+
+==== MPL 1.1 / GPL2 / LGPL-2.1
+
+* smime/lib/e-asn1-object.c
+* smime/lib/e-cert.c
+* smime/lib/e-pkcs12.c
+* smime/lib/e-cert-db.c
+
+On Debian systems, the complete text of the GNU General Public License (version
+2.1) can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+
+// vim: filetype=asciidoc:
Modified: unstable/evolution/debian/docs
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/docs?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/docs (original)
+++ unstable/evolution/debian/docs Mon May 17 11:28:14 2010
@@ -3,4 +3,3 @@
AUTHORS
HACKING
MAINTAINERS
-debian/NEWS.Debian
Modified: unstable/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-common.install?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-common.install (original)
+++ unstable/evolution/debian/evolution-common.install Mon May 17 11:28:14 2010
@@ -1,7 +1,6 @@
debian/tmp/usr/share/applications
debian/tmp/usr/share/mime-info
debian/tmp/usr/share/evolution
-debian/tmp/usr/share/gnome-pilot
debian/tmp/usr/share/icons/hicolor
debian/tmp/usr/share/locale
debian/tmp/usr/share/gnome
Modified: unstable/evolution/debian/evolution-mail.desktop
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-mail.desktop?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-mail.desktop (original)
+++ unstable/evolution/debian/evolution-mail.desktop Mon May 17 11:28:14 2010
@@ -43,5 +43,5 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Evolution
X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.28.x
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.27;evolution-alarm-notify;
+X-GNOME-Bugzilla-Version=2.30.x
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.30;evolution-alarm-notify;
Modified: unstable/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-plugins-experimental.install?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins-experimental.install (original)
+++ unstable/evolution/debian/evolution-plugins-experimental.install Mon May 17 11:28:14 2010
@@ -1,3 +1,1 @@
-debian/tmp/usr/lib/evolution/2.28/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,email-custom-header,evolution-webdav,templates,vcard-inline}*.{so,eplug,xml}
-debian/tmp/usr/lib/evolution/2.28/plugins/templates.glade
-debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/
+debian/tmp/usr/lib/evolution/2.30/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,profiler}*.{so,eplug,xml}
Modified: unstable/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-plugins.install?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins.install (original)
+++ unstable/evolution/debian/evolution-plugins.install Mon May 17 11:28:14 2010
@@ -1,2 +1,1 @@
-debian/tmp/usr/lib/evolution/2.28/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade}
-debian/lintian/evolution-plugins usr/share/lintian/overrides/
+debian/tmp/usr/lib/evolution/2.30/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,email-custom-header,templates,vcard-inline,image-inline}*.{so,eplug,xml}
Modified: unstable/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.install?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.install (original)
+++ unstable/evolution/debian/evolution.install Mon May 17 11:28:14 2010
@@ -9,7 +9,6 @@
debian/tmp/usr/lib/evolution/2.28/evolution-alarm-notify
debian/tmp/usr/lib/evolution/2.28/evolution-backup
debian/tmp/usr/bin
-debian/tmp/usr/lib/bonobo
-debian/tmp/usr/lib/evolution/2.28/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
+debian/tmp/usr/lib/evolution/2.30/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,webdav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,folder-permissions,folder-subscription}*.{so,eplug,xml}
debian/evolution-mail.desktop usr/share/applications/
debian/evolution.xpm usr/share/pixmaps/
Modified: unstable/evolution/debian/evolution.links
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.links?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.links (original)
+++ unstable/evolution/debian/evolution.links Mon May 17 11:28:14 2010
@@ -1,3 +1,4 @@
-/usr/lib/evolution/2.28/csv2vcard /usr/bin/csv2vcard
-/usr/lib/evolution/2.28/evolution-addressbook-export /usr/bin/evolution-addressbook-export
-/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.28.1.gz
+/usr/lib/evolution/2.30/csv2vcard /usr/bin/csv2vcard
+/usr/lib/evolution/2.30/evolution-addressbook-export /usr/bin/evolution-addressbook-export
+/usr/lib/evolution/2.30/evolution-addressbook-clean /usr/bin/evolution-addressbook-clean
+/usr/lib/evolution/2.30/evolution-backup /usr/bin/evolution-backup
Modified: unstable/evolution/debian/lintian/evolution-common
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/lintian/evolution-common?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/lintian/evolution-common (original)
+++ unstable/evolution/debian/lintian/evolution-common Mon May 17 11:28:14 2010
@@ -1,1 +1,2 @@
evolution-common: desktop-command-not-in-package /usr/share/applications/evolution.desktop evolution
+evolution-common: desktop-command-not-in-package /usr/share/applications/evolution-settings.desktop evolution-settings
Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=1609&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Mon May 17 11:28:14 2010
@@ -22,9 +22,7 @@
DEB_CONFIGURE_EXTRA_FLAGS += \
--with-openldap \
--enable-nls \
- --without-openssl-includes \
- --without-openssl-libs \
- --enable-pilot-conduits \
+ --disable-pilot-conduits \
--enable-cairo-calendar \
--enable-exchange=yes \
--without-krb4 \
@@ -32,12 +30,15 @@
--enable-ipv6 \
--disable-openssl \
--sysconfdir=/etc \
- --enable-nntp \
--libexecdir=/usr/lib \
- --enable-plugins=experimental
+ --enable-plugins=experimental \
+ --disable-pst-import \
+ --disable-contacts-map
-ifneq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-nm
+ifneq ($(DEB_HOST_ARCH_OS), linux)
+ DEB_CONFIGURE_EXTRA_FLAGS+=--disable-nm
+else
+ DEB_CONFIGURE_EXTRA_FLAGS+=--enable-nm
endif
clean::
More information about the pkg-evolution-commits
mailing list