--- evolution-data-server-1.0.2.orig/debian/patches/00_fix_libical_const.diff +++ evolution-data-server-1.0.2/debian/patches/00_fix_libical_const.diff @@ -0,0 +1,22 @@ +--- evolution-data-server-0.0.90.orig/calendar/libical/src/libical/icaltime.c 2004-01-09 15:55:41.000000000 +0100 ++++ evolution-data-server/calendar/libical/src/libical/icaltime.c 2004-03-29 14:34:55.553360132 +0200 +@@ -354,7 +354,7 @@ void unset_tz(char *tzstr) + * If the input timezone is null, no conversion is done; that is, the + * time is simply returned as time_t in its native timezone. + */ +-time_t icaltime_as_timet_with_zone(const struct icaltimetype tt, ++time_t icaltime_as_timet_with_zone(struct icaltimetype tt, + const icaltimezone *zone) + { + icaltimezone *utc_zone; +--- evolution-data-server-0.0.90.orig/calendar/libical/src/libical/icaltime.h 2003-10-21 20:28:27.000000000 +0200 ++++ evolution-data-server/calendar/libical/src/libical/icaltime.h 2004-03-29 14:32:02.201881738 +0200 +@@ -177,7 +177,7 @@ struct icaltimetype icaltime_from_week_n + time_t icaltime_as_timet(const struct icaltimetype); + + /** Return the time as seconds past the UNIX epoch, using timezones. */ +-time_t icaltime_as_timet_with_zone(const struct icaltimetype tt, ++time_t icaltime_as_timet_with_zone(struct icaltimetype tt, + const icaltimezone *zone); + + /** Return a string represention of the time, in RFC2445 format. The --- evolution-data-server-1.0.2.orig/debian/patches/01_amd64_build.patch +++ evolution-data-server-1.0.2/debian/patches/01_amd64_build.patch @@ -0,0 +1,35 @@ +diff -Nur evolution-data-server-1.0.2.orig/libdb/dbinc/mutex.h evolution-data-server-1.0.2/libdb/dbinc/mutex.h +--- evolution-data-server-1.0.2.orig/libdb/dbinc/mutex.h 2004-10-11 21:04:12.000000000 +0200 ++++ evolution-data-server-1.0.2/libdb/dbinc/mutex.h 2004-10-12 22:56:02.000000000 +0200 +@@ -729,31 +729,6 @@ + #endif + + /********************************************************************* +- * amd64/gcc assembly. +- *********************************************************************/ +-#ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY +-typedef unsigned char tsl_t; +- +-#ifdef LOAD_ACTUAL_MUTEX_CODE +-/* +- * For gcc/amd64, 0 is clear, 1 is set. +- */ +-#define MUTEX_SET(tsl) ({ \ +- register tsl_t *__l = (tsl); \ +- int __r; \ +- asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\ +- : "=&a" (__r), "=m" (*__l) \ +- : "1" (*__l) \ +- ); \ +- __r & 1; \ +-}) +- +-#define MUTEX_UNSET(tsl) (*(tsl) = 0) +-#define MUTEX_INIT(tsl) MUTEX_UNSET(tsl) +-#endif +-#endif +- +-/********************************************************************* + * x86_64/gcc assembly. + *********************************************************************/ + #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY --- evolution-data-server-1.0.2.orig/debian/changelog +++ evolution-data-server-1.0.2/debian/changelog @@ -0,0 +1,175 @@ +evolution-data-server (1.0.2-0ubuntu2) warty; urgency=low + + * debian/patches/01_amd64_build.patch: + - fix the build on amd64. + + -- Sebastien Bacher Tue, 12 Oct 2004 22:56:36 +0200 + +evolution-data-server (1.0.2-0ubuntu1) warty; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 12 Oct 2004 13:36:41 +0200 + +evolution-data-server (1.0.1-0ubuntu2) warty; urgency=low + + * Runned libdb/dist/s_config, should fix the problem on amd64. + + -- Sebastien Bacher Fri, 1 Oct 2004 13:22:54 +0200 + +evolution-data-server (1.0.1-0ubuntu1) warty; urgency=low + + * New upstream release. + * debian/control: + - Recommends evolution, not evolution1.5. + + -- Sebastien Bacher Wed, 29 Sep 2004 12:41:56 +0200 + +evolution-data-server (1.0.0-0ubuntu2) warty; urgency=low + + * Update libdb/dist/aclocal/mutex.ac to understand that amd64 has + fast mutex support + + -- Tollef Fog Heen Wed, 22 Sep 2004 11:17:23 +0200 + +evolution-data-server (1.0.0-0ubuntu1) warty; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 14 Sep 2004 16:03:41 +0200 + +evolution-data-server (0.0.99-1ubuntu1) warty; urgency=low + + * Warty upload. + + -- Sebastien Bacher Fri, 3 Sep 2004 11:13:06 +0200 + +evolution-data-server (0.0.99-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 31 Aug 2004 13:55:25 +0900 + +evolution-data-server (0.0.98-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 16 Aug 2004 12:42:30 +0900 + +evolution-data-server (0.0.97-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 5 Aug 2004 18:58:54 +0900 + +evolution-data-server (0.0.96-1) experimental; urgency=low + + * New upstream release + * remove useless files in doc (closes: #257405) + + -- Takuo KITAME Tue, 20 Jul 2004 16:18:03 +0900 + +evolution-data-server (0.0.95-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 8 Jul 2004 18:41:50 +0900 + +evolution-data-server (0.0.94.1-2) experimental; urgency=low + + * --with-uniquename=eds (closes: #255727) + + -- Takuo KITAME Wed, 30 Jun 2004 00:15:58 +0900 + +evolution-data-server (0.0.94.1-1) experimental; urgency=low + + * New upstream release + * use cdbs instead of cdb + + -- Takuo KITAME Mon, 28 Jun 2004 10:59:44 +0900 + +evolution-data-server (0.0.94-1) experimental; urgency=low + + * New upstream release + * Conflicts: evolution1.5 (<< 1.5.9) + + -- Takuo KITAME Mon, 7 Jun 2004 11:50:34 +0900 + +evolution-data-server (0.0.93-2) experimental; urgency=low + + * Conflict with evolution1.5 (<< 1.5.8) + + -- Takuo KITAME Wed, 26 May 2004 15:36:23 +0900 + +evolution-data-server (0.0.93-1) experimental; urgency=low + + * New upstream release + * build against libgnutls10 + + -- Takuo KITAME Mon, 24 May 2004 19:47:53 +0900 + +evolution-data-server (0.0.92-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 20 Apr 2004 17:02:50 +0900 + +evolution-data-server (0.0.91-2) experimental; urgency=low + + * Applied patch to fix build problem on ppc (closes: #242044) + * Build-Depends on gtk-doc-tools (closes: #241227) + + -- Takuo KITAME Mon, 12 Apr 2004 09:57:50 +0900 + +evolution-data-server (0.0.91-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 7 Apr 2004 12:35:34 +0900 + +evolution-data-server (0.0.90-1) experimental; urgency=low + + * New upstream release + * NOTE: + libsoup2.2-3 and libgtkhtml3.1-6 package had been uploaded already. + But it marked as NEW package and waiting for ACCEPTED. + So please wait for installing into archive by ftp-maintainer. + + -- Takuo KITAME Tue, 9 Mar 2004 12:59:34 +0900 + +evolution-data-server (0.0.7-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 19 Feb 2004 14:47:19 +0900 + +evolution-data-server (0.0.6-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 3 Feb 2004 14:23:19 +0900 + +evolution-data-server (0.0.5-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 20 Jan 2004 16:43:50 +0900 + +evolution-data-server (0.0.4-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 9 Jan 2004 14:16:21 +0900 + +evolution-data-server (0.0.3-2) experimental; urgency=low + + * fix unavailable libdb.a + + -- Takuo KITAME Thu, 18 Dec 2003 11:17:42 +0900 + +evolution-data-server (0.0.3-1) experimental; urgency=low + + * Initial Release. + + -- Takuo KITAME Mon, 15 Dec 2003 10:36:50 +0900 + --- evolution-data-server-1.0.2.orig/debian/control +++ evolution-data-server-1.0.2/debian/control @@ -0,0 +1,21 @@ +Source: evolution-data-server +Section: gnome +Priority: optional +Maintainer: Takuo KITAME +Build-Depends: flex, debhelper (>= 4.0.0), cdbs, intltool (>= 0.28-2), bison, libgnome2-dev (>= 2.6), libsoup2.2-dev (>= 2.2.1), libldap2-dev, gtk-doc-tools +Standards-Version: 3.6.1.0 + +Package: evolution-data-server +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: evolution1.5 (<< 1.5.94) +Recommends: evolution (>= 2.0.0) +Description: evolution database backend server + The data server, called "Evolution Data Server" is responsible for managing + calendar and addressbook information. + +Package: evolution-data-server-dev +Architecture: any +Depends: evolution-data-server(= ${Source-Version}), libgnome2-dev +Description: Development files for evolution-data-server + This package contains header files and static library of evolution-data-server. --- evolution-data-server-1.0.2.orig/debian/compat +++ evolution-data-server-1.0.2/debian/compat @@ -0,0 +1 @@ +4 --- evolution-data-server-1.0.2.orig/debian/rules +++ evolution-data-server-1.0.2/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +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/simple-patchsys.mk + +DEB_SHLIBDEPS_INCLUDE_evolution-data-server := debian/evolution-data-server/usr/lib + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +DEB_CONFIGURE_EXTRA_FLAGS := --sysconfdir=/etc \ + --libexecdir=\$${prefix}/lib/evolution \ + --with-openldap + +clean:: + dh_clean intltool-extract intltool-merge intltool-update \ + .po/.intltool-merge-cache --- evolution-data-server-1.0.2.orig/debian/copyright +++ evolution-data-server-1.0.2/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Takuo KITAME on +Mon, 15 Dec 2003 10:36:50 +0900. + +It was downloaded from http://ftp.gnome.org/ + +Upstream Authors: + Overall Maintainers: + JP Rosevear + Chris Toshok + + Calendar Maintainers: + Rodrigo Moya + + Addressbook Maintainers: + Hans Petter Jansson + + +Copyright: + + 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; version 2 dated June, 1991. + + 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 package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- evolution-data-server-1.0.2.orig/debian/evolution-data-server-dev.install +++ evolution-data-server-1.0.2/debian/evolution-data-server-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/*.la +debian/tmp/usr/lib/*.so +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/include --- evolution-data-server-1.0.2.orig/debian/evolution-data-server.install +++ evolution-data-server-1.0.2/debian/evolution-data-server.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/*.so.* +debian/tmp/usr/lib/evolution +debian/tmp/usr/lib/bonobo +debian/tmp/usr/share