From 827203c8736e41255622fbd4c842143429119ac9 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 20 Mar 2011 01:05:36 +0000 Subject: [PATCH] * 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. git-svn-id: file:///svn/pkg-evolution/experimental/evolution@1848 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 18 ++ debian/control | 145 ++++++-------- debian/copyright | 179 ++++++++++++++---- debian/csv2vcard.1 | 19 -- debian/evolution-addressbook-export.1 | 50 ----- debian/evolution-common.install | 1 - debian/evolution-plugins-experimental.install | 2 +- debian/evolution-plugins.install | 2 +- debian/evolution.install | 3 +- debian/evolution.manpages | 2 - debian/rules | 15 +- 11 files changed, 232 insertions(+), 204 deletions(-) delete mode 100644 debian/csv2vcard.1 delete mode 100644 debian/evolution-addressbook-export.1 diff --git a/debian/changelog b/debian/changelog index 67fae62c16..9ddbd9468a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sat, 19 Mar 2011 17:23:43 +0100 + evolution (2.32.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 58e6df6814..fa0bfb13f1 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ Uploaders: Jordi Mallach , Heikki Henriksen , Oystein Gisnas , Pedro Fragoso , - Yves-Alexis Perez + Yves-Alexis Perez , + Josselin Mouette Standards-Version: 3.9.1 Dm-Upload-Allowed: yes Homepage: http://www.gnome.org/projects/evolution/ @@ -18,74 +19,64 @@ Build-Depends: debhelper (>= 7.2.3~), 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, - libgstreamer0.10-dev, libytnef0-dev, - automake, - libtool, + libgdata-dev (>= 0.7.0), libical-dev, - libicu-dev, - libgweather-dev (>= 2.25.3), + libsm-dev, + libice-dev, + libgstreamer0.10-dev, 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 @@ Suggests: bug-buddy, 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 @@ Description: groupware suite with mail client and organizer 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 @@ Depends: evolution (= ${binary:Version}), # 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 @@ Description: debugging symbols for Evolution 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 @@ Description: standard plugins for Evolution . 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 - - face - backup-restore + - email-custom-header + - face - 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 @@ Description: experimental plugins for Evolution 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 diff --git a/debian/copyright b/debian/copyright index 2f8a76a10f..aa94fcca01 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,8 +7,6 @@ It was downloaded from . == Authors: -The full list is in the /usr/share/doc/evolution/AUTHORS file. - === Addressbook Arturo Esponosa (Original Gnomecard author) Nat Friedman @@ -51,9 +49,6 @@ The full list is in the /usr/share/doc/evolution/AUTHORS file. === Notes Anders Carlsson -=== Pilot - JP Rosevear - === Shell Miguel de Icaza Jason Leach @@ -94,6 +89,35 @@ The full list is in the /usr/share/doc/evolution/AUTHORS file. Chris Toshok +== 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 @@ Evolution is licensed under the LGPLv2 or LGPLv3 license using following text: You should have received a copy of the GNU Lesser General Public License along with the program; if not, see -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 @@ On Debian systems, the complete text of the GNU General Public License 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 + +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 . + +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 . + +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 + +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'. + 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. -// vim: filetype=asciidoc: + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in "/usr/share/common-licenses/LGPL-2.1". diff --git a/debian/csv2vcard.1 b/debian/csv2vcard.1 deleted file mode 100644 index 95ba04f916..0000000000 --- a/debian/csv2vcard.1 +++ /dev/null @@ -1,19 +0,0 @@ -.TH CSV2VCARD 1 2006\-05\-13 "GNOME" "GNOME" -.SH NAME -csv2vcard \- Convert a CSV-formatted list of contacts to vCards -.SH SYNOPSIS -.B csv2vcard -.I INFILE OUTFILE -.SH DESCRIPTION -Takes the CSV-formatted list of contacts from Outlook and attempts to -convert it into a list of vCards suitable for import into Evolution. -.SH "SEE ALSO" -.BR evolution (1) -.SH AUTHOR -Michael MacDonald -.PP -This manual page was originally written by Oystein Gisnas for the -Debian system. -.\" Copyright 2006 Øystein Gisnås -.\" You may copy this manual page under the terms of the version 2 of -.\" the GNU General Public License. diff --git a/debian/evolution-addressbook-export.1 b/debian/evolution-addressbook-export.1 deleted file mode 100644 index c88c42e096..0000000000 --- a/debian/evolution-addressbook-export.1 +++ /dev/null @@ -1,50 +0,0 @@ -.TH EVOLUTION-ADDRESSBOOK-EXPORT 1 2006\-05\-13 "GNOME" "GNOME" -.SH NAME -evolution-addressbook-export \- export addressbook content from Evoluion -.SH SYNOPSIS -.B evolution-addressbook-export -.RI [ OPTIONS ] " " [ ADDRESSBOOK ] -.SH DESCRIPTION -Export the entire contents of the Evolution address book with ID -.I ADDRESSBOOK -, or the default address book if none is given. Available address book -IDs can be listed with the \-l option. Supported export formats are -vCard and CSV. -.SH OPTIONS -.TP -.BR \-? ", " \-\-help -Show a help message listing all the options and their meanings. -.TP -.B \-\-usage -Show a brief help message listing the names of the options only. -.TP -.BI \-\-output= OUTPUTFILE -.RI "Use " OUTPUTFILE "as output file for exported data. Defaults to standard out." -.TP -.BR \-l ", " \-\-list\-addressbook\-folders -Export a comma-separated list of address book IDs, names and number of -entries instead of address book contents. -.TP -.BI \-\-format= FORMAT -.RI "Specify the output format. " FORMAT " must be either `vcard' or `csv'." -The default format is vCard. -.TP -.BR \-a ", " \-\-async -.RI "Export in asynchronous mode. " OUTPUTFILE " must be set and will be the prefix for the output files." -.TP -.BI \-\-size= NUMBER -.RI "Export " NUMBER " entries to each output file. The default is 100." -This option is only valid in asynchronous mode. -.PP -In addition, the usual Bonobo activation and GNOME command line options apply. -See the output of \-\-help for details. -.SH "SEE ALSO" -.BR evolution (1) -.SH AUTHOR -Gilbert Fang -.PP -This manual page was originally written by Oystein Gisnas for the -Debian system. -.\" Copyright 2006 Øystein Gisnås -.\" You may copy this manual page under the terms of the version 2 of -.\" the GNU General Public License. diff --git a/debian/evolution-common.install b/debian/evolution-common.install index 27018242d0..a53b6e0f82 100644 --- a/debian/evolution-common.install +++ b/debian/evolution-common.install @@ -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 diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index cf20c78dc1..17559d5161 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -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} diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index af40028de1..0d08e47304 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -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} diff --git a/debian/evolution.install b/debian/evolution.install index 48abc18200..7e9dac3872 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -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/ diff --git a/debian/evolution.manpages b/debian/evolution.manpages index 62c579c79e..5f0b182486 100644 --- a/debian/evolution.manpages +++ b/debian/evolution.manpages @@ -1,3 +1 @@ debian/evolution.1 -debian/evolution-addressbook-export.1 -debian/csv2vcard.1 diff --git a/debian/rules b/debian/rules index 8531ec3ee2..dbade9c6ae 100755 --- a/debian/rules +++ b/debian/rules @@ -8,14 +8,11 @@ include /usr/share/cdbs/1/rules/utils.mk 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 @@ LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed $(HARDENING_LDFLAGS) 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 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --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