r1338 - in /experimental/anjal/debian: anjal.install changelog control patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch patches/anjal_mailto_handler.patch rules
yanli-guest at users.alioth.debian.org
yanli-guest at users.alioth.debian.org
Tue Sep 15 07:29:53 UTC 2009
Author: yanli-guest
Date: Tue Sep 15 07:29:53 2009
New Revision: 1338
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1338
Log:
* New upstream release
* New patch: anjal_mailto_handler.patch. Register schemas file for
mailto handler (closes: Launchpad #418997)
* New patch to compile with Evolution 2.28:
01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
* Don't compile with Mozilla. Webkit is the only supported rendering
engine now
Added:
experimental/anjal/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
experimental/anjal/debian/patches/anjal_mailto_handler.patch
Modified:
experimental/anjal/debian/anjal.install
experimental/anjal/debian/changelog
experimental/anjal/debian/control
experimental/anjal/debian/rules
Modified: experimental/anjal/debian/anjal.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/anjal.install?rev=1338&op=diff
==============================================================================
--- experimental/anjal/debian/anjal.install (original)
+++ experimental/anjal/debian/anjal.install Tue Sep 15 07:29:53 2009
@@ -2,3 +2,4 @@
usr/share/locale
usr/share/applications/anjal.desktop
usr/share/anjal
+usr/share/gconf/schemas/anjal.schemas
Modified: experimental/anjal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/changelog?rev=1338&op=diff
==============================================================================
--- experimental/anjal/debian/changelog (original)
+++ experimental/anjal/debian/changelog Tue Sep 15 07:29:53 2009
@@ -1,5 +1,5 @@
-anjal (0.0.1+git20090826.845f3fa-0.1) UNRELEASED; urgency=low
+anjal (0.0.1+git20090909.d0a14f2b-1) UNRELEASED; urgency=low
* Initial release (Closes: #520342)
- -- Yan Li <yanli at infradead.org> Wed, 26 Aug 2009 16:13:56 +0800
+ -- Yan Li <yanli at infradead.org> Tue, 15 Sep 2009 15:17:40 +0800
Modified: experimental/anjal/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/control?rev=1338&op=diff
==============================================================================
--- experimental/anjal/debian/control (original)
+++ experimental/anjal/debian/control Tue Sep 15 07:29:53 2009
@@ -19,7 +19,9 @@
evolution-plugins (>= 2.27.5),
evolution-plugins (<< 2.28.0),
libwebkit-dev,
- libunique-dev
+ libunique-dev,
+ libedataserverui1.2-dev,
+ libebook1.2-dev
Standards-Version: 3.8.3
Package: anjal
Added: experimental/anjal/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch?rev=1338&op=file
==============================================================================
--- experimental/anjal/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch (added)
+++ experimental/anjal/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch Tue Sep 15 07:29:53 2009
@@ -1,0 +1,131 @@
+From 5887001ba32ebfd7eda4e75e1ca78a45ce532be6 Mon Sep 17 00:00:00 2001
+Message-Id: <5887001ba32ebfd7eda4e75e1ca78a45ce532be6.1252655484.git.yanli at infradead.org>
+From: Yan Li <yanli at infradead.org>
+Date: Fri, 11 Sep 2009 15:49:29 +0800
+Subject: [PATCH] Revert "BUGFIX: GNOME Bugzilla #593197 - Fix strings in review page"
+
+This reverts commit 0243187eb509d535421fc4cd0ab6f05f44efba76, which
+needs a patched Evolution that is not in Debian yet.
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ src/mail-account-view.c | 30 +++++++++---------------------
+ src/mail-account-view.h | 5 ++---
+ 2 files changed, 11 insertions(+), 24 deletions(-)
+
+diff --git a/src/mail-account-view.c b/src/mail-account-view.c
+index 66a5c02..0681352 100644
+--- a/src/mail-account-view.c
++++ b/src/mail-account-view.c
+@@ -358,18 +358,14 @@ create_review (MailAccountView *view)
+
+ #define RECEIVE_DETAIL N_("Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them.")
+
+-#define RECEIVE_OPT_DETAIL N_("You can specify more options to configure the account.")
+-
+ #define SEND_DETAIL N_("Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure.")
+
+-#define REVIEW_DETAIL N_("Time to check things over before we try and connect to the server and fetch your mail.")
++#define REVIEW_DETAIL N_("Time to check things over before we try and connect to the server and bring down your mail.")
+ struct _page_text {
+ int id;
+ char *head;
+ char *next;
+ char *prev;
+- char *next_edit;
+- char *prev_edit;
+ char *detail;
+ char *path;
+ GtkWidget * (*create_page) (MailAccountView *view);
+@@ -382,12 +378,10 @@ struct _page_text {
+ //{ MAV_SEND_PAGE, N_("Sending mail"), N_("Next - Review account"), N_("Back - Receiving mail"), SEND_DETAIL, create_send_page, fill_send, save_send},
+ //{ MAV_REVIEW_PAGE, N_("Review account"), N_("Finish"), N_("Back - Sending"), REVIEW_DETAIL, NULL, NULL, save_account},
+
+- { MAV_IDENTITY_PAGE, N_("Identity"), N_("Next - Receiving mail"), NULL, N_("Next - Receiving mail"), NULL, IDENTITY_DETAIL, "00.identity",NULL, NULL, save_identity, validate_identity},
+- { MAV_RECV_PAGE, N_("Receiving mail"), N_("Next - Sending mail"), N_("Back - Identity"), N_("Next - Receiving options"), N_("Back - Identity"), RECEIVE_DETAIL, "10.receive", NULL, NULL, NULL, NULL },
+- { MAV_RECV_OPT_PAGE, N_("Receiving options"), NULL, NULL, N_("Next - Sending mail"), N_("Back - Receiving mail"), RECEIVE_OPT_DETAIL, "10.receive", NULL, NULL, NULL, NULL },
+-
+- { MAV_SEND_PAGE, N_("Sending mail"), N_("Next - Review account"), N_("Back - Receiving mail"), N_("Next - Review account"), N_("Back - Receiving options"), SEND_DETAIL, "30.send", NULL, NULL, NULL, NULL},
+- { MAV_REVIEW_PAGE, N_("Review account"), N_("Finish"), N_("Back - Sending"), N_("Finish"), N_("Back - Sending"), REVIEW_DETAIL, NULL, create_review, NULL, NULL},
++ { MAV_IDENTITY_PAGE, N_("Identity"), N_("Next - Receiving mail"), NULL, IDENTITY_DETAIL, "00.identity",NULL, NULL, save_identity, validate_identity},
++ { MAV_RECV_PAGE, N_("Receiving mail"), N_("Next - Sending mail"), N_("Back - Identity"), RECEIVE_DETAIL, "10.receive", NULL, NULL, NULL, NULL },
++ { MAV_SEND_PAGE, N_("Sending mail"), N_("Next - Review account"), N_("Back - Receiving mail"), SEND_DETAIL, "30.send", NULL, NULL, NULL, NULL},
++ { MAV_REVIEW_PAGE, N_("Review account"), N_("Finish"), N_("Back - Sending"), REVIEW_DETAIL, NULL, create_review, NULL, NULL},
+ };
+
+ static void
+@@ -447,9 +441,6 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
+
+ gtk_widget_hide (mav->pages[mav->current_page]->box);
+ mav->current_page++;
+- if (mav->current_page == MAV_RECV_OPT_PAGE && mav->original == NULL)
+- mav->current_page++; /* Skip recv options in new account creation. */
+-
+ gtk_widget_show (mav->pages[mav->current_page]->box);
+ if (!mav->pages[mav->current_page]->done) {
+ mav->pages[mav->current_page]->done = TRUE;
+@@ -469,9 +460,6 @@ mav_prev_pressed (GtkButton *button, MailAccountView *mav)
+
+ gtk_widget_hide (mav->pages[mav->current_page]->box);
+ mav->current_page--;
+- if (mav->current_page == MAV_RECV_OPT_PAGE && mav->original == NULL)
+- mav->current_page--; /* Skip recv options in new account creation. */
+-
+ gtk_widget_show (mav->pages[mav->current_page]->box);
+
+ }
+@@ -531,13 +519,13 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
+ (*mail_account_pages[type].fill_page) (view);
+ }
+
+- if ((view->original && mail_account_pages[type].prev_edit) || mail_account_pages[type].prev) {
++ if (mail_account_pages[type].prev) {
+ box = gtk_hbox_new(FALSE, 0);
+ if (anjal_icon_decoration) {
+ tmp = gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0);
+ }
+- tmp = gtk_label_new (_(view->original ? mail_account_pages[type].prev_edit : mail_account_pages[type].prev));
++ tmp = gtk_label_new (_(mail_account_pages[type].prev));
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
+ page->prev = gtk_button_new ();
+ gtk_container_add ((GtkContainer *)page->prev, box);
+@@ -545,9 +533,9 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
+ g_signal_connect(page->prev, "clicked", G_CALLBACK(mav_prev_pressed), view);
+ }
+
+- if ((view->original && mail_account_pages[type].next_edit) || mail_account_pages[type].next) {
++ if (mail_account_pages[type].next) {
+ box = gtk_hbox_new(FALSE, 0);
+- tmp = gtk_label_new (_(view->original ? mail_account_pages[type].next_edit : mail_account_pages[type].next));
++ tmp = gtk_label_new (_(mail_account_pages[type].next));
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
+ if (anjal_icon_decoration) {
+ tmp = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON);
+diff --git a/src/mail-account-view.h b/src/mail-account-view.h
+index a36fc53..4942641 100644
+--- a/src/mail-account-view.h
++++ b/src/mail-account-view.h
+@@ -43,7 +43,6 @@ typedef struct _MailAccountService MailAccountService;
+ typedef enum {
+ MAV_IDENTITY_PAGE=0,
+ MAV_RECV_PAGE,
+- MAV_RECV_OPT_PAGE,
+ MAV_SEND_PAGE,
+ MAV_REVIEW_PAGE,
+ MAV_LAST,
+@@ -72,9 +71,9 @@ typedef struct _MailAccountView {
+ GtkWidget *scroll;
+ GtkWidget *page_widget;
+
+- MAVPage *pages[5];
++ MAVPage *pages[4];
+ struct _EAccount *original;
+- GtkWidget *wpages[5];
++ GtkWidget *wpages[4];
+ int current_page;
+ struct _EMAccountEditor *edit;
+
+--
+1.6.3.3
+
Added: experimental/anjal/debian/patches/anjal_mailto_handler.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/anjal_mailto_handler.patch?rev=1338&op=file
==============================================================================
--- experimental/anjal/debian/patches/anjal_mailto_handler.patch (added)
+++ experimental/anjal/debian/patches/anjal_mailto_handler.patch Tue Sep 15 07:29:53 2009
@@ -1,0 +1,43 @@
+diff -Nur anjal-0.0.1+git20090817.5ac8bfeb.orig/src/anjal.schemas.in anjal-0.0.1+git20090817.5ac8bfeb/src/anjal.schemas.in
+--- anjal-0.0.1+git20090817.5ac8bfeb.orig/src/anjal.schemas.in 2009-08-21 03:35:13.000000000 +0800
++++ anjal-0.0.1+git20090817.5ac8bfeb/src/anjal.schemas.in 2009-09-08 17:20:49.000000000 +0800
+@@ -29,6 +29,39 @@
+ </locale>
+ </schema>
+
++ <schema>
++ <key>/schemas/desktop/gnome/url-handlers/mailto/command</key>
++ <applyto>/desktop/gnome/url-handlers/mailto/command</applyto>
++ <owner>gnome</owner>
++ <type>string</type>
++ <default>anjal %s</default>
++ <locale name="C">
++ <short>The handler for "mailto" URLs</short>
++ <long>The command used to handle "mailto" URLs, if enabled.</long>
++ </locale>
++ </schema>
++ <schema>
++ <key>/schemas/desktop/gnome/url-handlers/mailto/enabled</key>
++ <applyto>/desktop/gnome/url-handlers/mailto/enabled</applyto>
++ <owner>gnome</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short>Whether the specified command should handle "mailto" URLs</short>
++ <long>True if the command specified in the "command" key should handle "mailto" URLs.</long>
++ </locale>
++ </schema>
++ <schema>
++ <key>/schemas/desktop/gnome/url-handlers/mailto/needs_terminal</key>
++ <applyto>/desktop/gnome/url-handlers/mailto/needs_terminal</applyto>
++ <owner>gnome</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Run the command in a terminal</short>
++ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
++ </locale>
++ </schema>
+
+ </schemalist>
+ </gconfschemafile>
Modified: experimental/anjal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/rules?rev=1338&op=diff
==============================================================================
--- experimental/anjal/debian/rules (original)
+++ experimental/anjal/debian/rules Tue Sep 15 07:29:53 2009
@@ -13,7 +13,11 @@
CFLAGS += -fPIC
-DEB_CONFIGURE_EXTRA_FLAGS = --with-anerley=no
+DEB_CONFIGURE_EXTRA_FLAGS = --with-anerley=no --without-mozilla \
+ --prefix=/usr --sysconfdir=/etc \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --with-gconf-schema-file-dir=/usr/share/gconf/schemas/
makebuilddir/anjal::
cd $(DEB_BUILDDIR); NOCONFIGURE=1 ./autogen.sh
@@ -38,4 +42,3 @@
get-orig-source::
$(call GIT_GET_SOURCE, $(UPSTREAM_VERSION))
-
More information about the pkg-evolution-commits
mailing list