r1505 - in /experimental/anjal/debian: changelog patches/FTBFS-anjal.patch rules

[yanli-guest at users.alioth.debian.org]

Author: yanli-guest
Date: Fri Jan 29 09:40:33 2010
New Revision: 1505

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1505
Log:
Update to 0.3.1

Added:
    experimental/anjal/debian/patches/FTBFS-anjal.patch
Modified:
    experimental/anjal/debian/changelog
    experimental/anjal/debian/rules

Modified: experimental/anjal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/changelog?rev=1505&op=diff
==============================================================================
--- experimental/anjal/debian/changelog (original)
+++ experimental/anjal/debian/changelog Fri Jan 29 09:40:33 2010
@@ -1,6 +1,6 @@
-anjal (0.3+git20100120.f3a6e83-1) experimental; urgency=low
+anjal (0.3.1-1) experimental; urgency=low
 
-  * New release from upstream for Evolution 2.29
+  * New release from upstream, now builds with Evolution 2.29
   * debian/patches: following patches dropped, already in upstream:
     - upstream-004_Save-password-enabled-by-default.patch
     - upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch
@@ -10,7 +10,7 @@
     - upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch
     - upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch
 
- -- Yan Li <yanli at infradead.org>  Thu, 21 Jan 2010 17:19:54 +0800
+ -- Yan Li <yanli at infradead.org>  Thu, 28 Jan 2010 13:34:35 +0800
 
 anjal (0.1-1) experimental; urgency=low
 

Added: experimental/anjal/debian/patches/FTBFS-anjal.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/FTBFS-anjal.patch?rev=1505&op=file
==============================================================================
--- experimental/anjal/debian/patches/FTBFS-anjal.patch (added)
+++ experimental/anjal/debian/patches/FTBFS-anjal.patch Fri Jan 29 09:40:33 2010
@@ -1,0 +1,47 @@
+commit 99eb10dabb9530bd1e5f05528f3dd5fe7f310827
+Author: Srinivasa Ragavan <sragavan at gnome.org>
+Date:   Wed Jan 27 10:20:29 2010 +0530
+
+    Clean ups
+
+diff --git a/Makefile.am b/Makefile.am
+index f32672d..2fad24b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -39,7 +39,9 @@ EXTRA_DIST = anjal.desktop.in \
+ 	     anjal-settings.desktop.in \
+ 	     intltool-extract.in \
+ 	     intltool-merge.in \
+-	     intltool-update.in
++	     intltool-update.in \
++	     COPYING.LGPL2 \
++	     COPYING.LGPL3
+ 
+ #
+ #
+diff --git a/src/module/anjal-shell-backend.c b/src/module/anjal-shell-backend.c
+index 112bb5d..25a33a9 100644
+--- a/src/module/anjal-shell-backend.c
++++ b/src/module/anjal-shell-backend.c
+@@ -35,7 +35,7 @@
+ #include "shell/e-shell-window.h"
+ #include "composer/e-msg-composer.h"
+ 
+-/*#include "e-mail-shell-settings.h"*/
++#include "e-mail-shell-settings.h"
+ #include "anjal-shell-sidebar.h"
+ #include "anjal-shell-view.h"
+ 
+diff --git a/src/module/anjal-shell-content.c b/src/module/anjal-shell-content.c
+index bd183d6..fd960bc 100644
+--- a/src/module/anjal-shell-content.c
++++ b/src/module/anjal-shell-content.c
+@@ -30,8 +30,6 @@
+ #include <misc/e-hinted-entry.h>
+ #include <misc/e-paned.h>
+ 
+-#include <mail/e-mail-reader.h>
+-#include <mail/e-mail-search-bar.h>
+ #include <mail/em-search-context.h>
+ #include <mail/em-utils.h>
+ #include <mail/mail-config.h>

Modified: experimental/anjal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/rules?rev=1505&op=diff
==============================================================================
--- experimental/anjal/debian/rules (original)
+++ experimental/anjal/debian/rules Fri Jan 29 09:40:33 2010
@@ -21,26 +21,5 @@
 ELIBDIR := usr/lib/evolution/2.30/anjal
 DEB_DH_MAKESHLIBS_ARGS_anjal += --noscripts -X $(ELIBDIR)
 
-post-patches::
-	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))
+	wget -c -O anjal_$(UPSTREAM_VERSION).orig.tar.gz http://ftp.gnome.org/pub/GNOME/sources/anjal/0.3/anjal-$(UPSTREAM_VERSION).tar.gz