* New upstream release.

- Drop 08_to_translate_list_update.patch
  - Drop 20_minicard-email-colon.patch, applied upstream

git-svn-id: file:///svn/pkg-evolution/experimental/evolution@832 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Øystein Gisnås
2007-06-02 21:52:54 +00:00
16 changed files with 225 additions and 170 deletions

29
debian/changelog vendored
View File

@ -1,5 +1,27 @@
evolution (2.10.1-1) UNRELEASED; urgency=low
evolution (2.11.2-1) UNRELEASED; urgency=low
* New upstream release.
- Drop 08_to_translate_list_update.patch
- Drop 20_minicard-email-colon.patch, applied upstream
-- Oystein Gisnas <oystein@gisnas.net> Sat, 02 Jun 2007 23:15:25 +0200
evolution (2.10.2-1) unstable; urgency=low
* New upstream release. (closes: #423060)
* 15_contact-list-editor-expand.patch: Fix contact list dialog resize
bug (bugzilla #424055)
* 20_minicard-email-colon.patch: Fix for missing row columns in
contacts minicard view (bugzilla #404239)
* 25_mute-debug-messages.patch: Mute console noise from plugins
* 30_mute-alarm-notify.patch: Mute noisy debug output from evolution-
alarm-notify
-- Oystein Gisnas <oystein@gisnas.net> Mon, 28 May 2007 23:33:35 +0200
evolution (2.10.1-1) unstable; urgency=low
[ Oystein Gisnas ]
* New upstream release
- Add gnome-doc-utils (>= 0.3.2) build-dep
- Change libgtkhtml3.8* dependencies to libgtkhtml3.14*
@ -16,7 +38,10 @@ evolution (2.10.1-1) UNRELEASED; urgency=low
* Create symlink for manpage evolution-2.10
* Add lintian overrides
-- Oystein Gisnas <oystein@gisnas.net> Sun, 15 Apr 2007 13:40:27 +0200
[ Loic Minier ]
* Upload to unstable.
-- Loic Minier <lool@dooz.org> Tue, 24 Apr 2007 16:36:09 +0200
evolution (2.8.3-1) experimental; urgency=low

99
debian/control vendored
View File

@ -2,17 +2,85 @@ Source: evolution
Section: gnome
Priority: optional
Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers@lists.alioth.debian.org>
Uploaders: Jordi Mallach <jordi@debian.org>, Margarita Manterola <debian@marga.com.ar>, Loic Minier <lool@dooz.org>, Heikki Henriksen <heikkih@gmail.com>, Oystein Gisnas <oystein@gisnas.net>
Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.37), dpkg-dev (>= 1.3.19), scrollkeeper, flex, bison, intltool (>= 0.35.0), libtool, pkg-config, gnome-icon-theme (>= 1.2.0), gnome-doc-utils (>= 0.3.2), libatk1.0-dev, libldap2-dev, libgtkhtml3.14-dev (>= 3.14.0), libgnome-pilot2-dev, libkrb5-dev, libnss3-dev, psmisc, libglib2.0-dev, liborbit2-dev (>= 1:2.9.8), libbonobo2-dev, evolution-data-server-dev, libgtk2.0-dev (>= 2.10.0), libbonoboui2-dev (>= 2.4.2), libgnomevfs2-dev (>= 2.4), libgnomeui-dev, libglade2-dev, libgnomecanvas2-dev, libxml2-dev, libgconf2-dev, libgnomeprint2.2-dev (>= 2.7.0), libgnomeprintui2.2-dev (>= 2.2.1), libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libcamel1.2-dev (>= 1.8.0), libedataserver1.2-dev (>= 1.9.4), libegroupwise1.2-dev (>= 1.9.4), libedataserverui1.2-dev (>= 1.9.4), libgnome2-dev, libecal1.2-dev (>= 1.9.4), libebook1.2-dev (>= 1.9.4), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev, libsoup2.2-dev (>= 2.2.2), libdbus-1-dev, libexchange-storage1.2-dev (>= 1.9.4), gtkhtml3.14
Uploaders: Jordi Mallach <jordi@debian.org>,
Margarita Manterola <debian@marga.com.ar>,
Loic Minier <lool@dooz.org>,
Heikki Henriksen <heikkih@gmail.com>,
Oystein Gisnas <oystein@gisnas.net>
Build-Depends: debhelper (>= 5.0.0),
cdbs (>= 0.4.37),
dpkg-dev (>= 1.3.19),
scrollkeeper,
flex,
bison,
intltool (>= 0.35.0),
libtool,
pkg-config,
gnome-icon-theme (>= 1.2.0),
gnome-doc-utils (>= 0.3.2),
libatk1.0-dev,
libldap2-dev,
libgtkhtml3.14-dev (>= 3.14.0),
libgnome-pilot2-dev,
libkrb5-dev,
libnss3-dev,
psmisc,
libglib2.0-dev,
liborbit2-dev (>= 1:2.9.8),
libbonobo2-dev,
evolution-data-server-dev,
libgtk2.0-dev (>= 2.10.0),
libbonoboui2-dev (>= 2.4.2),
libgnomevfs2-dev (>= 2.4),
libgnomeui-dev,
libglade2-dev,
libgnomecanvas2-dev,
libxml2-dev,
libgconf2-dev,
libgnomeprint2.2-dev (>= 2.7.0),
libgnomeprintui2.2-dev (>= 2.2.1),
libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libcamel1.2-dev (>= 1.8.0),
libedataserver1.2-dev (>= 1.9.4),
libegroupwise1.2-dev (>= 1.9.4),
libedataserverui1.2-dev (>= 1.9.4),
libgnome2-dev,
libecal1.2-dev (>= 1.9.4),
libebook1.2-dev (>= 1.9.4),
libdbus-glib-1-dev,
libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libnotify-dev,
libsoup2.2-dev (>= 2.2.2),
libdbus-1-dev,
libexchange-storage1.2-dev (>= 1.9.4),
gtkhtml3.14
Standards-Version: 3.7.2
Package: evolution
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, evolution-common (= ${source:Version}), evolution-data-server (>= 1.9.4), gtkhtml3.14 (>= 3.14.0), gnome-icon-theme (>= 1.2.0), dbus
Recommends: gnome-pilot-conduits (>= 2.0.9), gnome-desktop-data, evolution-plugins, yelp, spamassassin | bogofilter
Suggests: bug-buddy, gnupg, gnome-spell (>= 1.0.4), network-manager, evolution-exchange, evolution-dbg, evolution-plugins-experimental
Provides: mail-reader, imap-client
Replaces: evolution-plugins (<= 2.6.1-2), evolution-common (<< 2.6.2-3)
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
evolution-data-server (>= 1.9.4),
gtkhtml3.14 (>= 3.14.0),
gnome-icon-theme (>= 1.2.0),
dbus
Recommends: gnome-pilot-conduits (>= 2.0.9),
gnome-desktop-data,
evolution-plugins,
yelp,
spamassassin | bogofilter
Suggests: bug-buddy,
gnupg,
gnome-spell (>= 1.0.4),
network-manager,
evolution-exchange,
evolution-dbg,
evolution-plugins-experimental
Provides: mail-reader,
imap-client
Replaces: evolution-plugins (<= 2.6.1-2),
evolution-common (<< 2.6.2-3)
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.
@ -63,7 +131,12 @@ Description: architecture independent files for Evolution
Package: evolution-dev
Section: devel
Architecture: any
Depends: ${misc:Depends}, evolution (= ${binary:Version}), libgnome2-dev, libgnomeui-dev, libbonoboui2-dev (>= 2.4.2), libcamel1.2-dev (>= 1.8.0)
Depends: evolution (= ${binary:Version}),
${misc:Depends},
libgnome2-dev,
libgnomeui-dev,
libbonoboui2-dev (>= 2.4.2),
libcamel1.2-dev (>= 1.8.0)
Description: development library files for Evolution
Evolution is a groupware suite which integrates mail, calendar,
address book, to-do list and memo tools.
@ -74,7 +147,8 @@ Description: development library files for Evolution
Package: evolution-dbg
Priority: extra
Architecture: any
Depends: evolution (= ${binary:Version})
Depends: evolution (= ${binary:Version}),
${misc:Depends}
Description: debugging symbols for Evolution
Evolution is a groupware suite which integrates mail, calendar,
address book, to-do list and memo tools.
@ -84,7 +158,8 @@ Description: debugging symbols for Evolution
Package: evolution-plugins
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: notification-daemon
Description: standard plugins for Evolution
Evolution is a groupware suite which integrates mail, calendar,
@ -110,7 +185,9 @@ Description: standard plugins for Evolution
Package: evolution-plugins-experimental
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, evolution (= ${binary:Version})
Depends: ${shlibs:Depends},
${misc:Depends},
evolution (= ${binary:Version}),
Replaces: evolution-plugins (<< 2.6.2-1)
Description: experimental plugins for Evolution
Evolution is a groupware suite which integrates mail, calendar,

View File

@ -43,5 +43,5 @@ StartupNotify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Evolution
X-GNOME-Bugzilla-Component=Miscellaneous
X-GNOME-Bugzilla-Version=2.10.x
X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.10;evolution-alarm-notify;
X-GNOME-Bugzilla-Version=2.12.x
X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.12;evolution-alarm-notify;

View File

@ -1 +1 @@
debian/tmp/usr/lib/evolution/2.10/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync}*.{so,eplug,xml,glade}
debian/tmp/usr/lib/evolution/2.12/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync}*.{so,eplug,xml,glade}

View File

@ -1,2 +1,2 @@
debian/tmp/usr/lib/evolution/2.10/plugins/*{bbdb,subject-thread,save-calendar,select-one-source,copy-tool,mail-to-task,mark-calendar-offline,mailing-list-actions,new-mail-notify,default-mailer,mail-attachments-import-ics,prefer-plain}*.{so,eplug,xml,glade}
debian/tmp/usr/lib/evolution/2.12/plugins/*{bbdb,subject-thread,save-calendar,select-one-source,copy-tool,mail-to-task,mark-calendar-offline,mailing-list-actions,new-mail-notify,default-mailer,mail-attachments-import-ics,prefer-plain}*.{so,eplug,xml,glade}
debian/lintian/evolution-plugins usr/share/lintian/overrides/

View File

@ -1,15 +1,15 @@
debian/tmp/etc/gconf
debian/tmp/usr/lib/evolution/2.10/*.so.*
debian/tmp/usr/lib/evolution/2.10/components/*.so
debian/tmp/usr/lib/evolution/2.10/conduits/*.so
debian/tmp/usr/lib/evolution/2.10/csv2vcard
debian/tmp/usr/lib/evolution/2.10/killev
debian/tmp/usr/lib/evolution/2.10/evolution-addressbook-export
debian/tmp/usr/lib/evolution/2.10/evolution-alarm-notify
debian/tmp/usr/lib/evolution/2.10/backup
debian/tmp/usr/lib/evolution/2.12/*.so.*
debian/tmp/usr/lib/evolution/2.12/components/*.so
debian/tmp/usr/lib/evolution/2.12/conduits/*.so
debian/tmp/usr/lib/evolution/2.12/csv2vcard
debian/tmp/usr/lib/evolution/2.12/killev
debian/tmp/usr/lib/evolution/2.12/evolution-addressbook-export
debian/tmp/usr/lib/evolution/2.12/evolution-alarm-notify
debian/tmp/usr/lib/evolution/2.12/backup
debian/tmp/usr/bin
debian/tmp/usr/lib/bonobo
debian/tmp/usr/lib/evolution/2.10/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,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
debian/tmp/usr/lib/evolution/2.12/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,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
debian/evolution-mail.desktop usr/share/applications/
debian/evolution.xpm usr/share/pixmaps/
debian/lintian/evolution usr/share/lintian/overrides/

View File

@ -1,4 +1,4 @@
/usr/bin/evolution-2.10 /usr/bin/evolution
/usr/lib/evolution/2.10/csv2vcard /usr/bin/csv2vcard
/usr/lib/evolution/2.10/evolution-addressbook-export /usr/bin/evolution-addressbook-export
/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.10.1.gz
/usr/bin/evolution-2.12 /usr/bin/evolution
/usr/lib/evolution/2.12/csv2vcard /usr/bin/csv2vcard
/usr/lib/evolution/2.12/evolution-addressbook-export /usr/bin/evolution-addressbook-export
/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.12.1.gz

View File

View File

@ -1,4 +1,4 @@
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libeaddress_conduit.so /usr/lib/evolution/2.10:/usr/lib/
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libecalendar_conduit.so /usr/lib/evolution/2.10:/usr/lib/
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libememo_conduit.so /usr/lib/evolution/2.10:/usr/lib/
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libetodo_conduit.so /usr/lib/evolution/2.10:/usr/lib/
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libeaddress_conduit.so /usr/lib/evolution/2.12:/usr/lib/
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libecalendar_conduit.so /usr/lib/evolution/2.12:/usr/lib/
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libememo_conduit.so /usr/lib/evolution/2.12:/usr/lib/
evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libetodo_conduit.so /usr/lib/evolution/2.12:/usr/lib/

View File

@ -1 +1 @@
evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.10:/usr/lib/evolution/2.10/components
evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/components

View File

@ -1,133 +0,0 @@
diff -Nur evolution-2.9.3/po/POTFILES.in evolution-2.9.3.new/po/POTFILES.in
--- evolution-2.9.3/po/POTFILES.in 2006-12-08 14:47:58.000000000 +0100
+++ evolution-2.9.3.new/po/POTFILES.in 2006-12-08 14:48:41.000000000 +0100
@@ -61,8 +61,6 @@
addressbook/gui/widgets/eab-popup-control.c
addressbook/gui/widgets/eab-vcard-control.c
addressbook/gui/widgets/gal-view-factory-minicard.c
-addressbook/gui/widgets/gal-view-factory-treeview.c
-addressbook/gui/widgets/test-reflow.c
addressbook/importers/evolution-csv-importer.c
addressbook/importers/evolution-ldif-importer.c
addressbook/importers/evolution-vcard-importer.c
@@ -71,11 +69,9 @@
addressbook/printing/e-contact-print.glade
addressbook/printing/test-contact-print-style-editor.c
addressbook/printing/test-print.c
-addressbook/tools/evolution-addressbook-abuse.c
addressbook/tools/evolution-addressbook-export-list-cards.c
addressbook/tools/evolution-addressbook-export-list-folders.c
addressbook/tools/evolution-addressbook-export.c
-addressbook/tools/evolution-addressbook-import.c
calendar/calendar.error.xml
calendar/common/authentication.c
calendar/conduits/calendar/calendar-conduit.c
@@ -103,7 +99,6 @@
calendar/gui/dialogs/cal-prefs-dialog.c
calendar/gui/dialogs/cal-prefs-dialog.glade
calendar/gui/dialogs/calendar-setup.c
-calendar/gui/dialogs/calendar-setup.glade
calendar/gui/dialogs/cancel-comp.c
calendar/gui/dialogs/changed-comp.c
calendar/gui/dialogs/comp-editor-page.c
@@ -116,13 +111,10 @@
calendar/gui/dialogs/event-editor.c
calendar/gui/dialogs/event-page.c
calendar/gui/dialogs/event-page.glade
-calendar/gui/dialogs/meeting-page.etspec
calendar/gui/dialogs/meeting-page.glade
calendar/gui/dialogs/memo-editor.c
calendar/gui/dialogs/memo-page.c
calendar/gui/dialogs/memo-page.glade
-calendar/gui/dialogs/new-calendar.glade
-calendar/gui/dialogs/new-task-list.glade
calendar/gui/dialogs/recur-comp.c
calendar/gui/dialogs/recurrence-page.c
calendar/gui/dialogs/recurrence-page.glade
@@ -136,7 +128,6 @@
calendar/gui/dialogs/task-editor.c
calendar/gui/dialogs/task-page.c
calendar/gui/dialogs/task-page.glade
-calendar/gui/dialogs/url-editor-dialog.glade
calendar/gui/e-alarm-list.c
calendar/gui/e-cal-component-memo-preview.c
calendar/gui/e-cal-component-preview.c
@@ -163,7 +154,6 @@
calendar/gui/e-memo-table.c
calendar/gui/e-memo-table.etspec
calendar/gui/e-memos.c
-calendar/gui/e-pub-utils.c
calendar/gui/e-tasks.c
calendar/gui/e-timezone-entry.c
calendar/gui/e-week-view-main-item.c
@@ -182,9 +172,6 @@
calendar/gui/weekday-picker.c
calendar/importers/icalendar-importer.c
calendar/zones.h
-composer/e-msg-composer-attachment-bar.c
-composer/e-msg-composer-attachment.c
-composer/e-msg-composer-attachment.glade
composer/e-msg-composer-hdrs.c
composer/e-msg-composer-select-file.c
composer/e-msg-composer.c
@@ -192,8 +179,6 @@
composer/mail-composer.error.xml
data/evolution.desktop.in.in
data/evolution.keys.in.in
-designs/OOA/ooa.glade
-designs/read_receipts/read.glade
e-util/e-categories-config.c
e-util/e-dialog-utils.c
e-util/e-error.c
@@ -243,9 +228,7 @@
mail/evolution-mail.schemas.in.in
mail/importers/elm-importer.c
mail/importers/evolution-mbox-importer.c
-mail/importers/evolution-outlook-importer.c
mail/importers/mail-importer.c
-mail/importers/netscape-importer.c
mail/importers/pine-importer.c
mail/mail-autofilter.c
mail/mail-component.c
@@ -266,7 +249,6 @@
mail/message-list.etspec
mail/message-tag-editor.c
mail/message-tag-followup.c
-mail/message-tags.glade
mail/searchtypes.xml
plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
plugins/audio-inline/org-gnome-audio-inline.eplug.xml
@@ -346,17 +328,14 @@
plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml
plugins/ipod-sync/ical-format.c
plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
-plugins/ipod-sync/sync.c
plugins/itip-formatter/itip-formatter.c
plugins/itip-formatter/itip-view.c
plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
plugins/itip-formatter/org-gnome-itip-formatter.error.xml
plugins/mail-account-disable/mail-account-disable.c
-plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
plugins/mail-remote/client.c
plugins/mail-remote/e-corba-utils.c
plugins/mail-remote/evolution-mail-store.c
-plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml
plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml
plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
plugins/mail-to-task/org-gnome-mail-to-task.xml
@@ -425,7 +404,6 @@
smime/lib/e-cert-db.c
smime/lib/e-cert.c
smime/lib/e-pkcs12.c
-tools/evolution-launch-composer.c
tools/killev.c
ui/evolution-addressbook.xml
ui/evolution-calendar.xml
@@ -513,6 +491,6 @@
widgets/table/e-tree-scrolled.c
widgets/table/e-tree-selection-model.c
widgets/table/e-tree.c
-widgets/text/e-entry-test.c
widgets/text/e-entry.c
widgets/text/e-text.c
+debian/evolution-mail.desktop.in

View File

@ -0,0 +1,12 @@
diff -urN addressbook/gui/contact-list-editor.orig/contact-list-editor.glade addressbook/gui/contact-list-editor/contact-list-editor.glade
--- addressbook/gui/contact-list-editor.orig/contact-list-editor.glade 2007-04-09 15:07:42.000000000 +0200
+++ addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-04-21 05:43:19.679247908 +0200
@@ -258,7 +258,7 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>

View File

@ -0,0 +1,49 @@
--- plugins/caldav/caldav-source.c.orig 2007-04-23 20:23:17.931600926 +0200
+++ plugins/caldav/caldav-source.c 2007-04-23 20:23:27.760215176 +0200
@@ -38,6 +38,8 @@
#include <string.h>
+#define d(x)
+
/*****************************************************************************/
/* prototypes */
int e_plugin_lib_enable (EPluginLib *ep,
@@ -84,7 +86,7 @@
{
if (enable) {
- g_print ("CalDAV Eplugin starting up ...\n");
+ d (g_print ("CalDAV Eplugin starting up ...\n"));
ensure_caldav_source_group ();
}
--- plugins/default-mailer/default-mailer.c.orig 2007-04-23 20:24:27.627956676 +0200
+++ plugins/default-mailer/default-mailer.c 2007-04-23 20:25:36.000229676 +0200
@@ -33,6 +33,8 @@
#define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command"
#define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s"
+#define d(x)
+
void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target);
static gboolean
@@ -46,7 +48,7 @@
if (mailto_command == NULL)
return FALSE;
- g_debug ("mailto URL command: %s", mailto_command);
+ d (g_debug ("mailto URL command: %s", mailto_command));
/* tokenize the mailto command */
if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL))
@@ -56,7 +58,7 @@
/* check the basename of the first token */
basename = g_path_get_basename (argv[0]);
- g_debug ("mailto URL program: %s", basename);
+ d (g_debug ("mailto URL program: %s", basename));
is_default = g_str_has_prefix (basename, "evolution");
g_free (basename);

View File

@ -0,0 +1,24 @@
diff -Nur evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-notify.c
--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-04-09 15:10:29.000000000 +0200
+++ evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-notify.c 2007-05-10 19:35:05.000000000 +0200
@@ -49,7 +49,7 @@
EMsgPort *alarm_reply_port;
static GIOChannel *alarm_reply_channel;
-#define d(x) x
+#define d(x)
static void alarm_notify_class_init (AlarmNotifyClass *klass);
diff -Nur evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-queue.c
--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-09 15:10:29.000000000 +0200
+++ evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-queue.c 2007-05-10 19:35:10.000000000 +0200
@@ -83,7 +83,7 @@
-#define d(x) x
+#define d(x)
/* The dialog with alarm nofications */
static AlarmNotificationsDialog *alarm_notifications_dialog = NULL;

5
debian/rules vendored
View File

@ -6,15 +6,16 @@ include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.10
DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.12
DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts
DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts
DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts
ELIBDIR := usr/lib/evolution/2.10
ELIBDIR := usr/lib/evolution/2.12
CFLAGS += -fPIC