--- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/dirs +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/dirs @@ -0,0 +1 @@ +usr/bin --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/rules +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/rules @@ -0,0 +1,44 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/buildvars.mk +include /usr/share/cdbs/1/rules/debhelper.mk +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 + +DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //') +UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') +GIT_URL := git://git.gnome.org/anjal + +CFLAGS += -fPIC + +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 + + +GIT_GET_SOURCE = \ + TARBALL_FILE_NAME=$(DEB_SOURCE)_$(UPSTREAM_VERSION).orig.tar.gz; \ + tmpdir=`mktemp -d -t`; \ + cd $$tmpdir; \ + echo "cloning upstream repository ..."; \ + git clone $(GIT_URL); \ + cd `ls | head -n 1`; \ + if echo $(1) | grep -q "git"; \ + then \ + git_tag=`echo $(UPSTREAM_VERSION) | sed -e "s/.*git[[:digit:]]*\.\(.*\)/\1/g"`; \ + else \ + git_tag=$(UPSTREAM_VERSION); \ + fi; \ + git archive --format=tar --prefix=$(DEB_SOURCE)_$(UPSTREAM_VERSION)/ $$git_tag | gzip >"$(CURDIR)/$$TARBALL_FILE_NAME"; \ + cd $(CURDIR); \ + echo "got upstream release: $$TARBALL_FILE_NAME"; + +get-orig-source:: + $(call GIT_GET_SOURCE, $(UPSTREAM_VERSION)) --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/compat +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/compat @@ -0,0 +1 @@ +7 --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/docs +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/changelog +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/changelog @@ -0,0 +1,83 @@ +anjal (0.3.1+really0.0.1+git20090909.d0a14f2b-0ubuntu2) maverick; urgency=low + + * No-change upload to build against current evolution library ABI. + + -- Martin Pitt Wed, 04 Aug 2010 17:38:26 +0200 + +anjal (0.3.1+really0.0.1+git20090909.d0a14f2b-0ubuntu1) lucid; urgency=low + + * Revert anjal to 0.0.1+git20090909.d0a14f2b to get it to build in lucid + (LP: #518788) + + -- Krzysztof Klimonda Wed, 07 Apr 2010 01:35:13 +0200 + +anjal (0.0.1+git20090909.d0a14f2b-0ubuntu3) lucid; urgency=low + + * Lessen overly stricy e-d-s, evo-dev, and evo-plugins Build-Dependencies + to fix FTBFS on Lucid. Now (<< 2.29.0) + + -- Andrew Starr-Bochicchio Sat, 09 Jan 2010 13:22:44 -0500 + +anjal (0.0.1+git20090909.d0a14f2b-0ubuntu2) karmic; urgency=low + + * Bump build-dep to e-d-s <= 2.28.0-0ubuntu1, evolution-dev to <= 2.28.0-0ubuntu4 + and evolution-plugins to <= 2.28.0-0ubuntu4. (LP: #1247013) + + -- Zhengpeng Hou Sun, 11 Oct 2009 05:41:40 +0000 + +anjal (0.0.1+git20090909.d0a14f2b-0ubuntu1) karmic; urgency=low + + * Non-maintainer upload + * New upstream release + * New patch: anjal_mailto_handler.patch (closes: #418997) + * Register schemas file for mailto handler + * Drop 20_FTBFS_mail_component.patch: no longer needed + * Drop 30_FTBFS_mail-folder-view.c.patch: no longer needed + * Drop clutter-1.0-dependency.patch: upstreamed + * No longer needs patched Evolution and EDS + + -- Yan Li Tue, 15 Sep 2009 15:30:48 +0800 + +anjal (0.0.1+git20090817.5ac8bfeb-0ubuntu0moblin1) jaunty; urgency=low + + * New upstream release + * Drop 0001-Fix-a-memory-leak.patch: upstreamed + * Drop 0002-BUGFIX-Moblin-Bugzilla-4712-Passwords-can-t-be-s.patch: + upstreamed + * Drop 0003-Update-French-translation.patch: upstreamed + * Drop 0004-Remove-dead-files-from-POTFILES.in.patch: upstreamed + * Drop 0005-Spanish-translation.patch: upstreamed + * Drop clutter-1.0-dependency.patch: upstreamed + * Rebase anjal.desktop-name-email.patch + + -- Ying-Chun Liu (PaulLiu) Fri, 21 Aug 2009 03:40:50 +0800 + +anjal (0.0.1-0moblin2) jaunty; urgency=low + + * debian/control: add missing dependencies + + -- Michael Terry Wed, 19 Aug 2009 14:49:54 -0400 + +anjal (0.0.1-0moblin1) jaunty; urgency=low + + * New upstream release + + -- Michael Terry Tue, 18 Aug 2009 15:47:08 -0400 + +anjal (0.0~20090701-0ubuntu0moblin3) jaunty; urgency=low + + * debian/control: build against eds-dbus + + -- Michael Terry Tue, 18 Aug 2009 15:18:54 -0400 + +anjal (0.0~20090701-0ubuntu0moblin2) jaunty; urgency=low + + * Use debhelper instead of cdbs for autoreconf and quilt patch. + + -- Ying-Chun Liu (PaulLiu) Sat, 11 Jul 2009 00:14:48 +0800 + +anjal (0.0~20090701-0ubuntu0moblin1) jaunty; urgency=low + + * Initial release + + -- Ying-Chun Liu (PaulLiu) Fri, 10 Jul 2009 00:29:38 +0800 --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/copyright +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/copyright @@ -0,0 +1,47 @@ +This package was debianized by Ying-Chun Liu (PaulLiu) on +Fri, 10 Jul 2009 00:29:38 +0800. + +It was downloaded from http://live.gnome.org/Anjal + +Upstream Authors: + + Srinivasa Ragavan + Johnny Jacob + +Copyright: + + Copyright (C) 1999-2009 Novell, Inc. (www.novell.com) + +License: + + 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. + +The Debian packaging is: + + Copyright (C) 2009 Ying-Chun Liu (PaulLiu) + +and is licensed under the GPL version 2, +see `/usr/share/common-licenses/GPL-2'. + +./po/Makefile.in.in: + Makefile for program source directory in GNU NLS utilities package. + Copyright (C) 1995, 1996, 1997 by Ulrich Drepper + Copyright (C) 2004-2008 Rodney Dawes + + This file may be copied and used freely without restrictions. It may + be used in projects which are not available under a GNU Public License, + but which still want to provide support for the GNU gettext functionality. + + - Modified by Owen Taylor to use GETTEXT_PACKAGE + instead of PACKAGE and to look for po2tbl in ./ not in intl/ + + - Modified by jacob berkman to install + Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + + - Modified by Rodney Dawes for use with intltool + + We have the following line for use by intltoolize: + INTLTOOL_MAKEFILE --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/anjal.install +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/anjal.install @@ -0,0 +1,5 @@ +usr/bin/anjal +usr/share/locale +usr/share/applications/anjal.desktop +usr/share/anjal +usr/share/gconf/schemas/anjal.schemas --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/anjal.ld.so.conf +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/anjal.ld.so.conf @@ -0,0 +1 @@ +/usr/lib/evolution/2.28/components --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/control +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/control @@ -0,0 +1,46 @@ +Source: anjal +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ying-Chun Liu (PaulLiu) +Uploaders: Yan Li +Homepage: http://live.gnome.org/Anjal +Build-Depends: debhelper (>= 7), + cdbs (>= 0.4.52), + dpkg-dev (>= 1.14.16), + intltool (>= 0.35.0), + po-debconf, + evolution-data-server-dev (>= 2.27.5), + evolution-data-server-dev (<< 2.29.0), + evolution-dev (>= 2.27.5), + evolution-dev (<< 2.29.0), + evolution-plugins (>= 2.27.5), + evolution-plugins (<< 2.29.0), + libwebkit-dev, + libunique-dev, + libedataserverui1.2-dev, + libebook1.2-dev, + libgtkhtml3.14-dev, + libgtkhtml-editor-dev, + libtool, + autoconf +Standards-Version: 3.8.3 + +Package: anjal +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: light-weight mail client based on Evolution + Anjal is an email client. It is the Evolution front-end for netbooks + and other small form factor devices. + +Package: anjal-dbg +Section: debug +Priority: extra +Architecture: any +Depends: anjal (= ${binary:Version}), ${misc:Depends} +Description: debugging symbols for Anjal + Anjal is an email client. It is the Evolution front-end for netbooks + and other small form factor devices. + . + This package contains unstripped binaries of Anjal for use in + debugging. --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/patches/anjal-version-fix.patch +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/patches/anjal-version-fix.patch @@ -0,0 +1,20 @@ +Index: anjal-0.0.1/configure.ac +=================================================================== +--- anjal-0.0.1.orig/configure.ac 2009-08-19 14:54:55.000000000 -0400 ++++ anjal-0.0.1/configure.ac 2009-08-19 15:05:35.000000000 -0400 +@@ -24,6 +24,7 @@ + AC_SUBST(imagesdir) + + evolutioncomponentdir=`pkg-config --variable=componentdir evolution-shell` ++evolutioncomponentdir="/usr/lib/evolution/2.28/components" + AC_SUBST(evolutioncomponentdir) + + +@@ -44,6 +45,7 @@ + + PKG_CHECK_MODULES(ANJAL, [gtk+-2.0 >= 2.8 libglade-2.0 >= 2.6.0 glib-2.0 gconf-2.0 libedataserver-1.2 libedataserverui-1.2 libebook-1.2 camel-1.2 evolution-plugin libxml-2.0 sqlite3 libgtkhtml-3.14 gtkhtml-editor]) + EVO_VERSION="`$PKG_CONFIG --variable=execversion evolution-shell`" ++EVO_VERSION="2.28" + + if test "x$EVO_VERSION" = "x2.26"; then + AC_DEFINE_UNQUOTED(EVOLUTION_2_26, "$EVO_VERSION", [Evolution version]) --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/patches/anjal.desktop-name-email.patch +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/patches/anjal.desktop-name-email.patch @@ -0,0 +1,11 @@ +Index: anjal-0.0.1+git20090817.5ac8bfeb/anjal.desktop +=================================================================== +--- anjal-0.0.1+git20090817.5ac8bfeb.orig/anjal.desktop 2009-08-21 03:35:13.000000000 +0800 ++++ anjal-0.0.1+git20090817.5ac8bfeb/anjal.desktop 2009-08-21 22:12:37.129867320 +0800 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=Anjal ++Name=Email + GenericName=Email + Comment=Send and receive + Exec=anjal --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch @@ -0,0 +1,131 @@ +From 5887001ba32ebfd7eda4e75e1ca78a45ce532be6 Mon Sep 17 00:00:00 2001 +Message-Id: <5887001ba32ebfd7eda4e75e1ca78a45ce532be6.1252655484.git.yanli@infradead.org> +From: Yan Li +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 +--- + 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 + --- anjal-0.3.1+really0.0.1+git20090909.d0a14f2b.orig/debian/patches/anjal_mailto_handler.patch +++ anjal-0.3.1+really0.0.1+git20090909.d0a14f2b/debian/patches/anjal_mailto_handler.patch @@ -0,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 @@ + + + ++ ++ /schemas/desktop/gnome/url-handlers/mailto/command ++ /desktop/gnome/url-handlers/mailto/command ++ gnome ++ string ++ anjal %s ++ ++ The handler for "mailto" URLs ++ The command used to handle "mailto" URLs, if enabled. ++ ++ ++ ++ /schemas/desktop/gnome/url-handlers/mailto/enabled ++ /desktop/gnome/url-handlers/mailto/enabled ++ gnome ++ bool ++ true ++ ++ Whether the specified command should handle "mailto" URLs ++ True if the command specified in the "command" key should handle "mailto" URLs. ++ ++ ++ ++ /schemas/desktop/gnome/url-handlers/mailto/needs_terminal ++ /desktop/gnome/url-handlers/mailto/needs_terminal ++ gnome ++ bool ++ false ++ ++ Run the command in a terminal ++ True if the command used to handle this type of URL should be run in a terminal. ++ ++ + + +