r1848 - in /experimental/evolution/debian: changelog control copyright csv2vcard.1 evolution-addressbook-export.1 evolution-common.install evolution-plugins-experimental.install evolution-plugins.install evolution.install evolution.manpages rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Mar 20 01:05:43 UTC 2011
Author: joss
Date: Sun Mar 20 01:05:36 2011
New Revision: 1848
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1848
Log:
* New upstream pre-release.
* Add myself to uploaders
* Update paths for the new version.
* Update build-dependencies and dependencies.
* Update plugin lists.
* Disable inline images support until gtkimageview is ported.
* Pass Debian revision.
* Update copyright information.
* Drop obsolete csv2vcard and evolution-addressbook-export manual
pages.
* Disable contacts-map plugin because of libchamplain.
* Move desktop files to evolution.
+ Add corresponding Replaces.
Removed:
experimental/evolution/debian/csv2vcard.1
experimental/evolution/debian/evolution-addressbook-export.1
Modified:
experimental/evolution/debian/changelog
experimental/evolution/debian/control
experimental/evolution/debian/copyright
experimental/evolution/debian/evolution-common.install
experimental/evolution/debian/evolution-plugins-experimental.install
experimental/evolution/debian/evolution-plugins.install
experimental/evolution/debian/evolution.install
experimental/evolution/debian/evolution.manpages
experimental/evolution/debian/rules
Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Sun Mar 20 01:05:36 2011
@@ -1,3 +1,21 @@
+evolution (2.91.91-1) UNRELEASED; urgency=low
+
+ * New upstream pre-release.
+ * Add myself to uploaders
+ * Update paths for the new version.
+ * Update build-dependencies and dependencies.
+ * Update plugin lists.
+ * Disable inline images support until gtkimageview is ported.
+ * Pass Debian revision.
+ * Update copyright information.
+ * Drop obsolete csv2vcard and evolution-addressbook-export manual
+ pages.
+ * Disable contacts-map plugin because of libchamplain.
+ * Move desktop files to evolution.
+ + Add corresponding Replaces.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 19 Mar 2011 17:23:43 +0100
+
evolution (2.32.2-1) unstable; urgency=low
* New upstream release.
Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Sun Mar 20 01:05:36 2011
@@ -8,7 +8,8 @@
Heikki Henriksen <heikkih at gmail.com>,
Oystein Gisnas <oystein at gisnas.net>,
Pedro Fragoso <emberez at gmail.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/
@@ -18,74 +19,64 @@
cdbs (>= 0.4.52),
dpkg-dev (>= 1.14.16),
hardening-includes,
- scrollkeeper,
- flex,
- bison,
- intltool (>= 0.35.0),
- libtool,
+ libglib2.0-dev (>= 2.28),
+ libgtk-3-dev (>= 3.0),
+ libebook1.2-dev (>= 2.91.91),
+ libecal1.2-dev (>= 2.91.91),
+ libedataserver1.2-dev (>= 2.91.91),
+ libedataserverui-3.0-dev (>= 2.91.91),
+ libegroupwise1.2-dev (>= 2.91.91),
+ libebackend1.2-dev (>= 2.91.91),
+ libcamel1.2-dev (>= 2.91.91),
+ evolution-data-server-dev (>= 2.91.91),
+ evolution-data-server-dev (<< 3.1),
+ libgtkhtml-4.0-dev (>= 3.91.3),
+ libgtkhtml-editor-4.0-dev,
+ libgnome-desktop-3-dev (>= 2.91.3),
+ gnome-icon-theme (>= 2.30.2.1),
+ libgconf2-dev,
+ libsoup-gnome2.4-dev (>= 2.4.0),
+ libxml2-dev (>= 2.7.3),
+ shared-mime-info (>= 0.22),
+ libnotify-dev (>= 0.7),
+ libunique-3.0-dev (>= 2.90.4),
+ libgweather-3-dev (>= 2.90.0),
+ libcanberra-gtk3-dev (>= 0.25),
+ network-manager-dev (>= 0.7) [linux-any],
+ intltool (>= 0.40.0),
+ libtool (>= 2.2),
pkg-config (>= 0.16.0),
- gnome-icon-theme (>= 2.19.92),
- gnome-doc-utils (>= 0.3.2),
- gtk-doc-tools (>= 0.6),
+ gnome-doc-utils,
+ gtk-doc-tools (>= 1.9),
+ libcairo2-dev (>= 1.10),
libatk1.0-dev,
+ x11proto-core-dev,
libldap2-dev,
- libgtkhtml3.14-dev (>= 3.32.2),
- libgtkhtml-editor-3.14-dev (>= 3.32.2),
libkrb5-dev,
+ libnspr4-dev,
libnss3-dev,
psmisc,
- libglib2.0-dev (>= 2.25.12),
- evolution-data-server-dev (>= 2.32.2),
- evolution-data-server-dev (<< 2.33),
- libgtk2.0-dev (>= 2.20.0),
- libxml2-dev,
- libgconf2-dev,
- libcamel1.2-dev (>= 2.32.2),
- libedataserver1.2-dev (>= 2.32.2),
- libegroupwise1.2-dev (>= 2.32.2),
- libedataserverui1.2-dev (>= 2.32.2),
- libebackend1.2-dev (>= 2.32.2),
- libgdata-dev,
- libecal1.2-dev (>= 2.32.2),
- libebook1.2-dev (>= 2.32.2),
- libgnome2-dev,
- libdbus-glib-1-dev,
- libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libnotify-dev (>= 0.3.0),
- libsoup2.4-dev,
- libdbus-1-dev,
+ libytnef0-dev,
+ libgdata-dev (>= 0.7.0),
+ libical-dev,
+ libsm-dev,
+ libice-dev,
libgstreamer0.10-dev,
- libytnef0-dev,
- automake,
- libtool,
- libical-dev,
- libicu-dev,
- libgweather-dev (>= 2.25.3),
po-debconf,
- libgnome-desktop-dev (>= 2.26.0),
- sharutils,
- libunique-dev (>= 1.1.2),
- libcanberra-dev,
- libcanberra-gtk-dev,
- libgtkimageview-dev (>= 1.6),
- gnome-pkg-tools,
- libclutter-gtk-0.10-dev (>= 0.10),
- libchamplain-0.4-dev,
- libchamplain-gtk-0.4-dev,
- libgeoclue-dev
+ gnome-pkg-tools
Package: evolution
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
- evolution-data-server (>= 2.32.2),
- evolution-data-server (<< 2.33),
+ evolution-data-server (>= 2.91.91),
+ evolution-data-server (<< 3.1),
gnome-icon-theme (>= 2.30.2.1),
- dbus
+ dbus,
+ psmisc
Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
-Recommends: gnome-desktop-data,
- evolution-plugins,
+Recommends: evolution-plugins,
evolution-webcal,
yelp,
bogofilter | spamassassin
@@ -97,6 +88,7 @@
evolution-plugins-experimental
Provides: mail-reader,
imap-client
+Replaces: evolution-common (<< 2.91)
Description: groupware suite with mail client and organizer
Evolution is a groupware suite which integrates mail, calendar,
address book, to-do list and memo tools.
@@ -114,25 +106,19 @@
The following plugins belonging to the "base" set are included.
- calendar-file
- calendar-http
- - calendar-weather
- itip-formatter
- - plugin-manager
- default-source
- addressbook-file
- - startup-wizard
- - print-message
- mark-all-read
- groupwise-features
- - groupwise-account-setup
- - hula-account-setup
- - mail-account-disable
- publish-calendar
- caldav
- imap-features
- google-account-setup
+ - webdav-account-setup
+ - calendar-weather
- sa-junk-plugin
- bogo-junk-plugin
- - mono
Package: libevolution
Architecture: any
@@ -162,15 +148,14 @@
# evolution-plugin
libxml2-dev,
libcamel1.2-dev,
- libunique-dev,
- libgtkhtml3.14-dev,
- libgtkhtml-editor-3.14-dev,
- libgnomecanvas2-dev,
+ libunique-3.0-dev,
+ libgtkhtml-4.0-dev,
+ libgtkhtml-editor-4.0-dev,
# evolution-shell
+ libgtk-3-dev,
libgconf2-dev,
- libgnome-desktop-dev,
- libgtk2.0-dev,
- libedataserverui1.2-dev
+ libgnome-desktop3-dev,
+ libedataserverui-3.0-dev
Description: development library files for Evolution
Evolution is a groupware suite which integrates mail, calendar,
address book, to-do list and memo tools.
@@ -194,9 +179,8 @@
Package: evolution-plugins
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: evolution-plugins-experimental (<< 2.29.2-1)
-Replaces: evolution-plugins-experimental (<< 2.29.1-1)
+ ${misc:Depends},
+ evolution (= ${binary:Version})
Recommends: notification-daemon
Description: standard plugins for Evolution
Evolution is a groupware suite which integrates mail, calendar,
@@ -208,30 +192,26 @@
.
The following standard plugins are included.
- bbdb
- - subject-thread
- save-calendar
- - select-one-source
- - copy-tool
- mail-to-task
- - mark-calendar-offline
- - audio-inline
- mailing-list-actions
- - default-mailer
- - import-ics-attachments
- prefer-plain
- mail-notification
- attachment-reminder
+ - backup-restore
+ - email-custom-header
- face
- - backup-restore
- templates
- vcard-inline
+ - dbx-import
+ - audio-inline
- image-inline
Package: evolution-plugins-experimental
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- evolution (= ${binary:Version}),
+ evolution (= ${binary:Version})
Description: experimental plugins for Evolution
Evolution is a groupware suite which integrates mail, calendar,
address book, to-do list and memo tools.
@@ -242,11 +222,6 @@
Evolution. Use with care.
.
The following plugins are included.
- - folder-unsubscribe
- - mail-to-meeting
- - save-attachments
- external-editor
- - ipod-sync
- tnef-attachments
- - email-custom-headers
- - evolution-webdav
+ - contacts-map
Modified: experimental/evolution/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/copyright?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/copyright (original)
+++ experimental/evolution/debian/copyright Sun Mar 20 01:05:36 2011
@@ -6,8 +6,6 @@
It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/evolution/>.
== Authors:
-
-The full list is in the /usr/share/doc/evolution/AUTHORS file.
=== Addressbook
Arturo Esponosa <arturo at nuclecu.unam.mx> (Original Gnomecard author)
@@ -50,9 +48,6 @@
=== Notes
Anders Carlsson <andersca at gnu.org>
-
-=== Pilot
- JP Rosevear <jpr at ximian.com>
=== Shell
Miguel de Icaza <miguel at ximian.com>
@@ -94,6 +89,35 @@
Chris Toshok <toshok at ximian.com>
+== Copyright
+
+ Copyright © Regents of the University of California
+ Copyright © 1998-2005 The OpenLDAP Foundation
+ Copyright © 1997-2000 Free Software Foundation
+ Copyright © 2001-2004 Sun Microsystems, Inc.
+ Copyright © 2001 David Smith
+ Copyright © 2005 Mikhail Zabaluev
+ Copyright © 2006 Chris Halls
+ Copyright © 2008 Joergen Scheibengruber
+ Copyright © 2009-2010 Intel Corporation
+ Copyright © 1995-2001 Seth Nickell
+ Copyright © 1995-2001 Peter Mattis
+ Copyright © 1995-2001 Spencer Kimball
+ Copyright © 1995-2001 Josh MacDonald
+ Copyright © 1998-2000 Red Hat, Inc.
+ Copyright © 1999-2010 Novell, Inc.
+ Copyright © 2001 George Lebl
+ Copyright © 2001 Joe Shaw
+ Copyright © 2004 Meilof Veeningen
+ Copyright © 2008 Diego Escalante Urrelo
+ Copyright © 2008 Matthias Braun
+ Copyright © 2009 Cedric Bosdonnat
+ Copyright © 2009 Matthew Barnes
+ Copyright © 2010 Fridrich Strba
+ Copyright © Randall Hand
+ Copyright © 1994-2000 Netscape Communications Corporation.
+
+
== Licensing information
=== Program license
@@ -113,40 +137,18 @@
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'.
+On Debian systems, the complete text of the GNU Lesser General Public
+License (version 3) can be found in "/usr/share/common-licenses/LGPL-3".
=== 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'.
+There are a few exceptions to this licensing, that have an impact on overall
+licensing. At the present, the code seems GPLv2+ clean.
==== OpenLDAP license
-* modules/addressbook/openldap-extract.h
-
-----
+* addressbook/gui/component/openldap-extract.h
+
The OpenLDAP Public License
Version 2.8, 17 August 2003
@@ -194,17 +196,120 @@
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
+
+==== GPLv2+
+
+* widgets/misc/e-spinner.c
+* plugins/calendar-http/calendar-http.c
+* plugins/calendar-weather/calendar-weather.c
+
+ 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 program. If not, see <http://www.gnu.org/licenses/>
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+==== LGPLv2
+
+* plugins/webdav-account-setup/webdav-contacts-source.c
+
+ This package 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; version 2 of the
+ License.
+
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License can be found in "/usr/share/common-licenses/LGPL-2".
+
+==== LGPLv2+
+
+* e-util/gconf-bridge.[ch]
+* widgets/misc/e-icon-entry.[ch]
+* widgets/misc/e-hsv-utils.[ch]
+* widgets/text/e-text.[ch]
+* widgets/table/e-cell-tree.[ch]
+* widgets/misc/e-dateedit.[ch]
+
+ This package 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) 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License can be found in "/usr/share/common-licenses/LGPL-2".
+
+==== GPLv2
+
+The following file is licensed under the GPL v2 only but it is not
+compiled into the binary, therefore does not affect its licensing as a
+whole.
+
+* addressbook/gui/widgets/test-reflow.c
+
+ 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 program. If not, see <http://www.gnu.org/licenses/>
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+==== MPLv1.1 / GPLv2+ / LGPLv2.1+
+
+These files are distributed under a triple license. In this package we
+distribute them under the LGPL.
* 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:
+ This package 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.1 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
Modified: experimental/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-common.install?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-common.install (original)
+++ experimental/evolution/debian/evolution-common.install Sun Mar 20 01:05:36 2011
@@ -1,4 +1,3 @@
-debian/tmp/usr/share/applications
debian/tmp/usr/share/mime-info
debian/tmp/usr/share/evolution
debian/tmp/usr/share/icons/hicolor
Modified: experimental/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins-experimental.install?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins-experimental.install (original)
+++ experimental/evolution/debian/evolution-plugins-experimental.install Sun Mar 20 01:05:36 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/evolution/*/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,profiler,contacts-map,dbx-import}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/*/plugins/*-{external-editor,tnef-attachments,contacts-map}.{so,eplug,xml}
Modified: experimental/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins.install?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins.install (original)
+++ experimental/evolution/debian/evolution-plugins.install Sun Mar 20 01:05:36 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/evolution/*/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}
+debian/tmp/usr/lib/evolution/*/plugins/*-{bbdb,save-calendar,mail-to-task,mailing-list-actions,prefer-plain,mail-notification,attachment-reminder,backup-restore,email-custom-header,face,templates,vcard-inline,dbx-import,audio-inline,image-inline,pst-import}.{so,eplug,xml}
Modified: experimental/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution.install?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/evolution.install (original)
+++ experimental/evolution/debian/evolution.install Sun Mar 20 01:05:36 2011
@@ -1,5 +1,6 @@
debian/tmp/etc/gconf
debian/tmp/etc/xdg
debian/tmp/usr/bin
-debian/tmp/usr/lib/evolution/*/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/tmp/usr/lib/evolution/*/plugins/*-{calendar-file,calendar-http,itip-formatter,default-source,addressbook-file,mark-all-read,groupwise-features,publish-calendar,caldav,imap-features,google,webdav,calendar-weather,sa-junk-plugin,bogo-junk-plugin}.{so,eplug,xml}
+debian/tmp/usr/share/applications
debian/evolution.xpm usr/share/pixmaps/
Modified: experimental/evolution/debian/evolution.manpages
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution.manpages?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/evolution.manpages (original)
+++ experimental/evolution/debian/evolution.manpages Sun Mar 20 01:05:36 2011
@@ -1,3 +1,1 @@
debian/evolution.1
-debian/evolution-addressbook-export.1
-debian/csv2vcard.1
Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1848&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Sun Mar 20 01:05:36 2011
@@ -8,14 +8,11 @@
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/hardening-includes/hardening.make
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
-
-
-ELIBDIR := usr/lib/evolution/2.32
+ELIBDIR := usr/lib/evolution/3.0
DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
-DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/modules
-DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})'
+DEB_DH_MAKESHLIBS_ARGS_libevolution += -V --noscripts -X $(ELIBDIR)/modules
+DEB_DH_MAKESHLIBS_ARGS_evolution += -V
DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
@@ -25,6 +22,8 @@
export CFLAGS LDFLAGS
+DEB_REVISION := $(shell echo $(DEB_VERSION) | awk -F- '{ print $NF }')
+
DEB_CONFIGURE_EXTRA_FLAGS += \
--with-openldap \
--enable-nls \
@@ -33,7 +32,9 @@
--libexecdir=/usr/lib \
--enable-plugins=experimental \
--disable-pst-import \
- --enable-gtk3=no
+ --disable-contacts-map \
+ --disable-image-inline \
+ --with-sub-version=-$(DEB_REVISION)
ifneq ($(DEB_HOST_ARCH_OS), linux)
DEB_CONFIGURE_EXTRA_FLAGS+=--disable-nm
More information about the pkg-evolution-commits
mailing list