r1841 - in /experimental/evolution-data-server/debian: ./ lintian/ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Mar 17 01:25:58 UTC 2011


Author: joss
Date: Thu Mar 17 01:25:57 2011
New Revision: 1841

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1841
Log:
* New upstream pre-release.
* Update build-dependencies and development dependencies.
* Rename packages that need to.
* source.lintian-overrides: say goodbye to the bundled libdb.
* Add introspection packages for libedataserver and libecal.
* Drop dh-autoreconf, it doesn’t cope well with intltool.
* Update list of copyright holders.
* Remove licenses for code that isn’t here anymore.

Added:
    experimental/evolution-data-server/debian/gir1.2-ecalendar-1.2.install
    experimental/evolution-data-server/debian/gir1.2-edataserver-1.2.install
    experimental/evolution-data-server/debian/libcamel-1.2-23.install
      - copied, changed from r1840, experimental/evolution-data-server/debian/libcamel1.2-19.install
    experimental/evolution-data-server/debian/libcamel1.2-23.shlibs
      - copied, changed from r1840, experimental/evolution-data-server/debian/libcamel1.2-19.shlibs
    experimental/evolution-data-server/debian/libebackend-1.2-1.install
      - copied, changed from r1840, experimental/evolution-data-server/debian/libebackend1.2-0.install
    experimental/evolution-data-server/debian/libedata-book-1.2-9.install
      - copied, changed from r1840, experimental/evolution-data-server/debian/libedata-book1.2-8.install
    experimental/evolution-data-server/debian/libedata-cal-1.2-11.install
      - copied, changed from r1840, experimental/evolution-data-server/debian/libedata-cal1.2-10.install
    experimental/evolution-data-server/debian/libedataserverui-3.0-0.install
      - copied, changed from r1840, experimental/evolution-data-server/debian/libedataserverui1.2-11.install
    experimental/evolution-data-server/debian/libedataserverui-3.0-dev.install
      - copied, changed from r1840, experimental/evolution-data-server/debian/libedataserverui1.2-dev.install
    experimental/evolution-data-server/debian/patches/01_hurd_path-max.patch
Removed:
    experimental/evolution-data-server/debian/libcamel1.2-19.install
    experimental/evolution-data-server/debian/libcamel1.2-19.shlibs
    experimental/evolution-data-server/debian/libebackend1.2-0.install
    experimental/evolution-data-server/debian/libedata-book1.2-8.install
    experimental/evolution-data-server/debian/libedata-cal1.2-10.install
    experimental/evolution-data-server/debian/libedataserverui1.2-11.install
    experimental/evolution-data-server/debian/libedataserverui1.2-dev.install
    experimental/evolution-data-server/debian/lintian/libcamel1.2-19
    experimental/evolution-data-server/debian/lintian/libebackend1.2-0
    experimental/evolution-data-server/debian/lintian/libedata-book1.2-8
    experimental/evolution-data-server/debian/lintian/libedata-cal1.2-10
    experimental/evolution-data-server/debian/lintian/libedataserverui1.2-11
    experimental/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
    experimental/evolution-data-server/debian/source.lintian-overrides
Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/control
    experimental/evolution-data-server/debian/copyright
    experimental/evolution-data-server/debian/evolution-data-server-common.install
    experimental/evolution-data-server/debian/evolution-data-server.install
    experimental/evolution-data-server/debian/libcamel1.2-dev.install
    experimental/evolution-data-server/debian/libebackend1.2-dev.install
    experimental/evolution-data-server/debian/libebook1.2-dev.install
    experimental/evolution-data-server/debian/libecal1.2-dev.install
    experimental/evolution-data-server/debian/libedata-book1.2-dev.install
    experimental/evolution-data-server/debian/libedata-cal1.2-dev.install
    experimental/evolution-data-server/debian/libedataserver1.2-dev.install
    experimental/evolution-data-server/debian/libegroupwise1.2-dev.install
    experimental/evolution-data-server/debian/patches/series
    experimental/evolution-data-server/debian/rules

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Thu Mar 17 01:25:57 2011
@@ -1,3 +1,16 @@
+evolution-data-server (2.91.91-1) UNRELEASED; urgency=low
+
+  * New upstream pre-release.
+  * Update build-dependencies and development dependencies.
+  * Rename packages that need to.
+  * source.lintian-overrides: say goodbye to the bundled libdb.
+  * Add introspection packages for libedataserver and libecal.
+  * Drop dh-autoreconf, it doesn’t cope well with intltool.
+  * Update list of copyright holders.
+  * Remove licenses for code that isn’t here anymore.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 16 Mar 2011 22:18:36 +0100
+
 evolution-data-server (2.32.2-2) unstable; urgency=low
 
   * debian/control:

Modified: experimental/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/control?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/control (original)
+++ experimental/evolution-data-server/debian/control Thu Mar 17 01:25:57 2011
@@ -19,7 +19,6 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.37),
-               dh-autoreconf,
                hardening-includes,
                dpkg-dev (>= 1.14.16),
                pkg-config (>= 0.16),
@@ -30,21 +29,25 @@
                libdb-dev,
                libkrb5-dev,
                libldap2-dev,
-               libglib2.0-dev (>= 2.25.12),
+               libglib2.0-dev (>= 2.28),
                libxml2-dev,
                libgconf2-dev,
                libnss3-dev,
-               libgtk2.0-dev (>= 2.20.0),
+               libgtk-3-dev (>= 3.0),
                libgnome2-dev,
                libsoup2.4-dev,
                libgnome-keyring-dev (>= 2.20.1),
                gtk-doc-tools,
                libsqlite3-dev (>= 3.6),
                chrpath,
-               libgweather-dev (>= 2.25.4),
+               libgweather-3-dev (>= 2.90.0),
                libical-dev,
                libicu-dev,
-               libgdata-dev (>= 0.6.3),
+               libgdata-dev (>= 0.7.0),
+               libgirepository1.0-dev (>= 0.9.12),
+               gobject-introspection (>= 0.9.12-4~),
+               gir1.2-glib-2.0,
+               gir1.2-freedesktop,
                gperf,
                gnome-pkg-tools
 
@@ -75,8 +78,7 @@
 Section: devel
 Architecture: any
 Depends: ${misc:Depends},
-         libgnome2-dev,
-         libdbus-glib-1-dev,
+         libglib2.0-dev (>= 2.28),
          libnss3-dev,
          libnspr4-dev 
 Description: Development files for evolution-data-server (metapackage)
@@ -109,16 +111,30 @@
          ${shlibs:Depends},
          ${misc:Depends},
          libxml2-dev,
-         libglib2.0-dev (>= 2.16.1),
+         libglib2.0-dev,
          libgconf2-dev,
          libsoup2.4-dev
 Description: Utility library for evolution data servers (development files)
  The data server, called "Evolution Data Server" is responsible for managing
  calendar and addressbook information.
  .
- This package contains header files and static library for libedataserver1.2-13.
-
-Package: libcamel1.2-19
+ This package contains header files and static library for libedataserver.
+
+Package: gir1.2-edataserver-1.2
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GObject introspection for the EDataServer library
+ The data server, called "Evolution Data Server" is responsible for managing
+ calendar and addressbook information.
+ .
+ This package contains introspection data for the libedataserver 
+ library. It can be used by packages using the GIRepository format to 
+ generate dynamic bindings.
+
+Package: libcamel-1.2-23
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -135,7 +151,7 @@
 Package: libcamel1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libcamel1.2-19 (= ${binary:Version}),
+Depends: libcamel-1.2-23 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libglib2.0-dev,
@@ -144,7 +160,7 @@
          libnss3-dev,
          libnspr4-dev
 Description: Development files for libcamel
- This package contains header files and static library for libcamel1.2-11
+ This package contains header files and static library for libcamel.
  .
  Camel is a generic messaging library. It supports the standard
  messaging system for receiving and sending messages. It is the
@@ -174,32 +190,31 @@
          libcamel1.2-dev,
          libglib2.0-dev
 Description: Client library for evolution address books (development files)
- This package contains header files and static library for libebook1.2-10.
+ This package contains header files and static library for libebook.
  .
  libebook is a client library for evolution addressbooks.
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
- .
-
-Package: libedataserverui1.2-11
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         evolution-data-server-common (>= 2.27.0)
+
+Package: libedataserverui-3.0-0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         evolution-data-server-common (>= 2.91)
 Description: GUI utility library for evolution data servers
  The data server, called "Evolution Data Server" is responsible for managing
  calendar and addressbook information.
  .
  This package is a GUI utility library for evolution-data-server.
 
-Package: libedataserverui1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libedataserverui1.2-11 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-         libgtk2.0-dev,
+Package: libedataserverui-3.0-dev
+Section: libdevel
+Architecture: any
+Depends: libedataserverui-3.0-0 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+         libgtk-3-dev,
          libedataserver1.2-dev,
          libebook1.2-dev
 Description: GUI utility library for evolution data servers (development files)
@@ -207,9 +222,9 @@
  calendar and addressbook information.
  .
  This package contains header files and static library for
- libedataserverui1.2-11.
-
-Package: libedata-book1.2-8
+ libedataserverui.
+
+Package: libedata-book-1.2-9
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -223,17 +238,17 @@
 Package: libedata-book1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedata-book1.2-8 (= ${binary:Version}),
+Depends: libedata-book-1.2-9 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libedataserver1.2-dev,
          libebook1.2-dev,
-         libdbus-glib-1-dev
+         libglib2.0-dev
 Description: Backend library for evolution address books (development files)
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
  .
- This package contains header files and static library for libedata-book1.2-8
+ This package contains header files and static library for libedata-book.
 
 Package: libecal1.2-8
 Section: libs
@@ -254,14 +269,28 @@
          ${shlibs:Depends},
          libical-dev (>= 0.43),
          libedataserver1.2-dev,
-         libdbus-glib-1-dev
+         libglib2.0-dev
 Description: Client library for evolution calendars (development files)
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
  .
- This package contains header files and static library for libecal1.2-8.
-
-Package: libedata-cal1.2-10
+ This package contains header files and static library for libecal.
+
+Package: gir1.2-ecalendar-1.2
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GObject introspection for the ECalendar library
+ Evolution is the integrated mail, calendar, task and address book
+ distributed suite from Novell, Inc.
+ .
+ This package contains introspection data for the libecal library. It 
+ can be used by packages using the GIRepository format to generate 
+ dynamic bindings.
+
+Package: libedata-cal-1.2-11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -275,18 +304,18 @@
 Package: libedata-cal1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedata-cal1.2-10 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-         libdbus-glib-1-dev,
+Depends: libedata-cal-1.2-11 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
          libical-dev (>= 0.43),
          libedataserver1.2-dev,
-         libecal1.2-dev
+         libecal1.2-dev (= ${binary:Version}),
+         libglib2.0-dev
 Description: Backend library for evolution calendars (development files)
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
  .
- This package contains header files and static library for libedata-cal1.2-10.
+ This package contains header files and static library for libedata-cal.
 
 Package: libegroupwise1.2-13
 Section: libs
@@ -308,7 +337,7 @@
          ${shlibs:Depends},
          libsoup2.4-dev
 Description: Development files for libegroupwise
- This package contains header files and static library for libegroupwise1.2-13.
+ This package contains header files and static library for libegroupwise.
  .
  libegroupwise is client library for accessing groupwise POA through SOAP
  interface of Evolution.
@@ -316,7 +345,7 @@
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
 
-Package: libebackend1.2-0
+Package: libebackend-1.2-1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -331,12 +360,11 @@
 Package: libebackend1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libebackend1.2-0 (= ${binary:Version}),
+Depends: libebackend-1.2-1 (= ${binary:Version}),
          ${misc:Depends},
          libglib2.0-dev
 Description: Utility library for evolution data servers (development files)
- This package contains header files and static library for
- libebackend1.2-1.
+ This package contains header files and static library for libebackend.
  .
  libebackend is a utility library for evolution-data-server providing
  backend function to access data.

Modified: experimental/evolution-data-server/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/copyright?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/copyright (original)
+++ experimental/evolution-data-server/debian/copyright Thu Mar 17 01:25:57 2011
@@ -34,10 +34,23 @@
  Tor Lillqvist <tml at novell.com>
  Parthasarathi Susarla <sparthasarathi at novell.com>
  Jacob Berkman <jacob at ximian.com>
+ Matthew Barnes <mbarnes at redhat.com> 
+ Srinivasa Ragavan <sragavan at novell.com>
+ Ross Burton <ross at burtonini.com>
+
 
 Copyright:
- 1999-2004 Ximian, Inc.
- 1999-2005 Novell, Inc.
+ Copyright © 1998-2005  The OpenLDAP Foundation.
+ Copyright © 1999-2004  Ximian, Inc.
+ Copyright © 1993-2004  Free Software Foundation, Inc.
+ Copyright © 1999-2008  Novell, Inc.
+ Copyright © 2003       Gergõ Érdi
+ Copyright © 2006       OpenedHand Ltd
+ Copyright © 2008       Joergen Scheibengruber
+ Copyright © 2008       Matthias Braun
+ Copyright © 2009       Intel Corporation
+ Copyright © 2010       Philip Withnall
+
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
@@ -58,21 +71,6 @@
 License can be found in /usr/share/common-licenses/LGPL-2. Some of the
 files are licensed under the GNU Lesser General Public License which
 can be found in /usr/share/common-licenses/LGPL-2.1.
-
----
-
-The source files calendar/backends/contacts/e-cal-backend-contacts.{c,h}
-are copyright 2000-2003 Ximian, Inc., 2003 Gergõ Érdi
-
----
-
-The source file calendar/idl/Evolution-DataServer-Calendar.idl is
-copyright 2000 Eskil Heyn Olsen, 2000 Ximian, Inc.
-
----
-
-The source file calendar/libecal/e-cal-time-util.h is copyright 1998
-The Free Software Foundation, 2000 Ximian, Inc.
 
 ---
 
@@ -134,239 +132,3 @@
 Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
 California, USA.  All Rights Reserved.  Permission to copy and
 distribute verbatim copies of this document is granted.
-
----
-
-LIBICAL (files under calendar/libical/)
-Copyright:
- 1999-2000 Eric Busboom, The Software Studio (http://www.softwarestudio.org)
- 2001 Critical Path
-Authors:
- Eric Busboom
- John Gray <gray at agora-net.com>
- Andrea Campi <a.campi at inet.it>
-
- The code and datafiles in this distribution are licensed under the
- Mozilla Public License. See http://www.mozilla.org/NPL/MPL-1.0.html
- for a copy of the license. Alternately, you may use libical under the
- terms of the GNU Library General Public License. See
- http://www.fsf.org/copyleft/lesser.html for a copy of the LGPL.
-
- This dual license ensures that the library can be incorporated into
- both proprietary code and GPL'd programs, and will benefit from
- improvements made by programmers in both realms. I will only accept
- changes into my version of the library if they are similarly
- dual-licensed.
-
- Portions of this distribution are (C) Copyright 1996 Apple Computer,
- Inc., AT&T Corp., International Business Machines Corporation and
- Siemens Rolm Communications Inc. See src/libicalvcal/README.TXT for
- details.
-
- Portions of this distribution are Copyright (c) 1997 Theo de
- Raadt. See the header for src/libical/vsnprintf.c for the full
- copyright statement.
-
----
-
-The source files calendar/libical/src/libical/icalattach* are
-copyright 2000 Andrea Campi.
-The source file calendar/libical/src/libicalcap/icalcap_utils.c is
-copyright 2002 Andrea Campi
-The source file calendar/libical/src/libicalcap/Makefile.am is
-copyright 2003 Andrea Campi
-
-This program is free software; you can redistribute it and/or modify
- it under the terms of either:
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
----
-
-The source file calendar/libical/src/libicalcap/client.c.
-Copyright:
- 2002 Jonas Borgström <jonas at codefactory.se>
- 2002 Daniel Lundin   <daniel at codefactory.se>
- 2002 CodeFactory AB.  All rights reserved.
-
- * See the file LICENSE for redistribution information. 
- * If you have not received a copy of the license, please contact CodeFactory
- * by email at info at codefactory.se, or on the web at http://www.codefactory.se/
- * You may also write to: CodeFactory AB, SE-903 47, Umeå, Sweden.
-
----
-
-The source files
-calendar/libical/src/libicalvcal/vcaltmp.{c,h}
-calendar/libical/src/libicalvcal/vcc.{c,h,y}
-calendar/libical/src/libicalvcal/vobject.{c,h}
-calendar/libical/src/libicalvcal/port.h
-are copyright 1996 Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
----
-
-The files calendar/libical/src/libical/{astime.h,caldate.c} are
-copyright 1986-2000 Hiram Clawson. All rights reserved.
-
- *	Redistribution and use in source and binary forms, with or
- *	without modification, are permitted provided that the following
- *	conditions are met:
- *
- *		Redistributions of source code must retain the above
- *		copyright notice, this list of conditions and the
- *		following disclaimer.
- *
- *		Redistributions in binary form must reproduce the
- *		above copyright notice, this list of conditions and
- *		the following disclaimer in the documentation and/or
- *		other materials provided with the distribution.
- *
- *		Neither name of The Museum of Hiram nor the names of
- *		its contributors may be used to endorse or promote products
- *		derived from this software without specific prior
- *		written permission. 
- *
- *	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *	CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *	IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- *	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- *	IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- *	THE POSSIBILITY OF SUCH DAMAGE. 
-
----
-
-The file calendar/libical/src/libical/vsnprintf.c is copyright 1997
-Theo de Raadt.
-
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-Berkeley DB 4.1.25 (files under libdb/)
-
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994, 1995, 1996
- *	Keith Bostic.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.  This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to md5_init, call md5_update as
- * needed on buffers full of bytes, and then call md5_Final, which
- * will fill a supplied 16-byte array with the digest.
- */
-
-/* parts of this file are :
- * Written March 1993 by Branko Lankester
- * Modified June 1993 by Colin Plumb for altered md5.c.
- * Modified October 1995 by Erik Troan for RPM
- */

Modified: experimental/evolution-data-server/debian/evolution-data-server-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/evolution-data-server-common.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/evolution-data-server-common.install (original)
+++ experimental/evolution-data-server/debian/evolution-data-server-common.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/evolution-data-server-2.32
+debian/tmp/usr/share/evolution-data-server-*
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/pixmaps
 debian/tmp/usr/share/dbus-1

Modified: experimental/evolution-data-server/debian/evolution-data-server.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/evolution-data-server.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/evolution-data-server.install (original)
+++ experimental/evolution-data-server/debian/evolution-data-server.install Thu Mar 17 01:25:57 2011
@@ -1,5 +1,5 @@
 debian/tmp/usr/lib/evolution
-debian/tmp/usr/lib/evolution-data-server-1.2/extensions/*.so
-debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers/*.urls
-debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers/*.so
+debian/tmp/usr/lib/evolution-data-server/*-backends/*.so
+debian/tmp/usr/lib/evolution-data-server/camel-providers/*.urls
+debian/tmp/usr/lib/evolution-data-server/camel-providers/*.so
 debian/lintian/evolution-data-server usr/share/lintian/overrides/

Added: experimental/evolution-data-server/debian/gir1.2-ecalendar-1.2.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/gir1.2-ecalendar-1.2.install?rev=1841&op=file
==============================================================================
--- experimental/evolution-data-server/debian/gir1.2-ecalendar-1.2.install (added)
+++ experimental/evolution-data-server/debian/gir1.2-ecalendar-1.2.install Thu Mar 17 01:25:57 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/ECalendar-1.2.typelib

Added: experimental/evolution-data-server/debian/gir1.2-edataserver-1.2.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/gir1.2-edataserver-1.2.install?rev=1841&op=file
==============================================================================
--- experimental/evolution-data-server/debian/gir1.2-edataserver-1.2.install (added)
+++ experimental/evolution-data-server/debian/gir1.2-edataserver-1.2.install Thu Mar 17 01:25:57 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/EDataServer-1.2.typelib

Copied: experimental/evolution-data-server/debian/libcamel-1.2-23.install (from r1840, experimental/evolution-data-server/debian/libcamel1.2-19.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libcamel-1.2-23.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libcamel1.2-19.install (original)
+++ experimental/evolution-data-server/debian/libcamel-1.2-23.install Thu Mar 17 01:25:57 2011
@@ -1,2 +1,1 @@
 debian/tmp/usr/lib/libcamel-*.so.*
-debian/lintian/libcamel1.2-19 usr/share/lintian/overrides/

Copied: experimental/evolution-data-server/debian/libcamel1.2-23.shlibs (from r1840, experimental/evolution-data-server/debian/libcamel1.2-19.shlibs)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libcamel1.2-23.shlibs?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libcamel1.2-19.shlibs (original)
+++ experimental/evolution-data-server/debian/libcamel1.2-23.shlibs Thu Mar 17 01:25:57 2011
@@ -1,2 +1,2 @@
-libcamel-1.2 19 libcamel1.2-19 (>= 2.32.0), libcamel1.2-19 (<< 2.33)
-libcamel-provider-1.2 19 libcamel1.2-19 (>= 2.32.0), libcamel1.2-19 (<< 2.33)
+libcamel-1.2 23 libcamel1.2-23 (>= 2.91.90), libcamel1.2-23 (<< 3.1)
+libcamel-provider-1.2 23 libcamel1.2-23 (>= 2.91.90), libcamel1.2-23 (<< 2.91.90)

Modified: experimental/evolution-data-server/debian/libcamel1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libcamel1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libcamel1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libcamel1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/libcamel*.so
 debian/tmp/usr/lib/pkgconfig/camel*
-debian/tmp/usr/include/evolution-data-server-2.32/camel
+debian/tmp/usr/include/evolution-data-server-*/camel
 debian/tmp/usr/share/gtk-doc/html/camel

Copied: experimental/evolution-data-server/debian/libebackend-1.2-1.install (from r1840, experimental/evolution-data-server/debian/libebackend1.2-0.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libebackend-1.2-1.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libebackend1.2-0.install (original)
+++ experimental/evolution-data-server/debian/libebackend-1.2-1.install Thu Mar 17 01:25:57 2011
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/libebackend-1.2.so.*
-debian/lintian/libebackend1.2-0 usr/share/lintian/overrides/
 

Modified: experimental/evolution-data-server/debian/libebackend1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libebackend1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libebackend1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libebackend1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libebackend-1.2.pc
 debian/tmp/usr/lib/libebackend-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/libebackend
+debian/tmp/usr/include/evolution-data-server-*/libebackend
 debian/tmp/usr/share/gtk-doc/html/libebackend

Modified: experimental/evolution-data-server/debian/libebook1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libebook1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libebook1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libebook1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libebook-1.2.pc
 debian/tmp/usr/lib/libebook-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/libebook
+debian/tmp/usr/include/evolution-data-server-*/libebook
 debian/tmp/usr/share/gtk-doc/html/libebook

Modified: experimental/evolution-data-server/debian/libecal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libecal1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libecal1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libecal1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,5 @@
 debian/tmp/usr/lib/pkgconfig/libecal-1.2.pc
 debian/tmp/usr/lib/libecal-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/libecal
+debian/tmp/usr/include/evolution-data-server-*/libecal
 debian/tmp/usr/share/gtk-doc/html/libecal
+debian/tmp/usr/share/gir-1.0/ECalendar-1.2.gir

Copied: experimental/evolution-data-server/debian/libedata-book-1.2-9.install (from r1840, experimental/evolution-data-server/debian/libedata-book1.2-8.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedata-book-1.2-9.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedata-book1.2-8.install (original)
+++ experimental/evolution-data-server/debian/libedata-book-1.2-9.install Thu Mar 17 01:25:57 2011
@@ -1,2 +1,1 @@
 debian/tmp/usr/lib/libedata-book-1.2.so.*
-debian/lintian/libedata-book1.2-8 usr/share/lintian/overrides/

Modified: experimental/evolution-data-server/debian/libedata-book1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedata-book1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedata-book1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedata-book1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libedata-book-1.2.pc
 debian/tmp/usr/lib/libedata-book-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/libedata-book
+debian/tmp/usr/include/evolution-data-server-*/libedata-book
 debian/tmp/usr/share/gtk-doc/html/libedata-book

Copied: experimental/evolution-data-server/debian/libedata-cal-1.2-11.install (from r1840, experimental/evolution-data-server/debian/libedata-cal1.2-10.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedata-cal-1.2-11.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedata-cal1.2-10.install (original)
+++ experimental/evolution-data-server/debian/libedata-cal-1.2-11.install Thu Mar 17 01:25:57 2011
@@ -1,2 +1,1 @@
 debian/tmp/usr/lib/libedata-cal-1.2.so.*
-debian/lintian/libedata-cal1.2-10 usr/share/lintian/overrides/

Modified: experimental/evolution-data-server/debian/libedata-cal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedata-cal1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedata-cal1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedata-cal1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libedata-cal-1.2.pc
 debian/tmp/usr/lib/libedata-cal-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/libedata-cal
+debian/tmp/usr/include/evolution-data-server-*/libedata-cal
 debian/tmp/usr/share/gtk-doc/html/libedata-cal

Modified: experimental/evolution-data-server/debian/libedataserver1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedataserver1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedataserver1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedataserver1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,5 @@
 debian/tmp/usr/lib/pkgconfig/libedataserver-1.2.pc
 debian/tmp/usr/lib/libedataserver-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/libedataserver
+debian/tmp/usr/include/evolution-data-server-*/libedataserver
 debian/tmp/usr/share/gtk-doc/html/libedataserver
+debian/tmp/usr/share/gir-1.0/EDataServer-1.2.gir

Copied: experimental/evolution-data-server/debian/libedataserverui-3.0-0.install (from r1840, experimental/evolution-data-server/debian/libedataserverui1.2-11.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedataserverui-3.0-0.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedataserverui1.2-11.install (original)
+++ experimental/evolution-data-server/debian/libedataserverui-3.0-0.install Thu Mar 17 01:25:57 2011
@@ -1,2 +1,1 @@
-debian/tmp/usr/lib/libedataserverui-1.2.so.*
-debian/lintian/libedataserverui1.2-11 usr/share/lintian/overrides/
+debian/tmp/usr/lib/libedataserverui-3.0.so.*

Copied: experimental/evolution-data-server/debian/libedataserverui-3.0-dev.install (from r1840, experimental/evolution-data-server/debian/libedataserverui1.2-dev.install)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedataserverui-3.0-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedataserverui1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedataserverui-3.0-dev.install Thu Mar 17 01:25:57 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/pkgconfig/libedataserverui-1.2.pc
-debian/tmp/usr/lib/libedataserverui-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/libedataserverui
+debian/tmp/usr/lib/pkgconfig/libedataserverui-3.0.pc
+debian/tmp/usr/lib/libedataserverui-3.0.so
+debian/tmp/usr/include/evolution-data-server-*/libedataserverui
 debian/tmp/usr/share/gtk-doc/html/libedataserverui/

Modified: experimental/evolution-data-server/debian/libegroupwise1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libegroupwise1.2-dev.install?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libegroupwise1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libegroupwise1.2-dev.install Thu Mar 17 01:25:57 2011
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/libegroupwise-1.2.pc
 debian/tmp/usr/lib/libegroupwise-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.32/groupwise
+debian/tmp/usr/include/evolution-data-server-*/groupwise

Added: experimental/evolution-data-server/debian/patches/01_hurd_path-max.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/01_hurd_path-max.patch?rev=1841&op=file
==============================================================================
--- experimental/evolution-data-server/debian/patches/01_hurd_path-max.patch (added)
+++ experimental/evolution-data-server/debian/patches/01_hurd_path-max.patch Thu Mar 17 01:25:57 2011
@@ -1,0 +1,52 @@
+From b60d2b8f74702cfa26e24ed67dede58fb9aabddc Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Tue, 08 Mar 2011 17:45:25 +0000
+Subject: Bug 642783 - CamelLocalFolder: Let glibc's realpath() allocate for us
+
+---
+diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
+index e76a124..b872b66 100644
+--- a/camel/providers/local/camel-local-folder.c
++++ b/camel/providers/local/camel-local-folder.c
+@@ -501,7 +501,11 @@ camel_local_folder_construct (CamelLocalFolder *lf,
+ 	const gchar *root_dir_path;
+ 	gchar *tmp, *statepath;
+ #ifndef G_OS_WIN32
++#ifdef __GLIBC__
++	gchar *folder_path;
++#else
+ 	gchar folder_path[PATH_MAX];
++#endif
+ 	struct stat st;
+ #endif
+ 	gint forceindex, len;
+@@ -549,12 +553,27 @@ camel_local_folder_construct (CamelLocalFolder *lf,
+ 		camel_local_folder_set_index_body (lf, TRUE);
+ 		camel_object_state_write (CAMEL_OBJECT (lf));
+ 	}
++
++	/* XXX Canonicalizing the folder path portably is a messy affair.
++	 *     The proposed GLib function in [1] would be useful here.
++	 *
++	 *     [1] https://bugzilla.gnome.org/show_bug.cgi?id=111848
++	 */
+ #ifndef G_OS_WIN32
+ 	/* follow any symlinks to the mailbox */
+ 	if (g_lstat (lf->folder_path, &st) != -1 && S_ISLNK (st.st_mode) &&
++#ifdef __GLIBC__
++	    (folder_path = realpath (lf->folder_path, NULL)) != NULL) {
++#else
+ 	    realpath (lf->folder_path, folder_path) != NULL) {
++#endif
+ 		g_free (lf->folder_path);
+ 		lf->folder_path = g_strdup (folder_path);
++#ifdef __GLIBC__
++		/* Not a typo.  Use free() here, not g_free().
++		 * The path string was allocated by realpath(). */
++		free (folder_path);
++#endif
+ 	}
+ #endif
+ 	lf->changes = camel_folder_change_info_new ();
+--
+cgit v0.8.3.4

Modified: experimental/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/series?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/patches/series (original)
+++ experimental/evolution-data-server/debian/patches/series Thu Mar 17 01:25:57 2011
@@ -1,0 +1,1 @@
+01_hurd_path-max.patch

Modified: experimental/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/rules?rev=1841&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/rules (original)
+++ experimental/evolution-data-server/debian/rules Thu Mar 17 01:25:57 2011
@@ -5,7 +5,7 @@
 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/autoreconf.mk
+#include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk                  
 include /usr/share/hardening-includes/hardening.make
 
@@ -31,16 +31,15 @@
 	--with-krb5=/usr \
 	--with-libdb=/usr \
 	--enable-gtk-doc \
-	--enable-gnome-keyring=yes \
-	--enable-gtk3=no
+	--enable-gnome-keyring=yes
 
 DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
 
 binary-install/evolution-data-server::
 	chgrp mail $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*
 	chmod g+s $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*
-	chrpath -d -k $(CURDIR)/debian/evolution-data-server/usr/lib/evolution-data-server-1.2/*/*.so \
-	$(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel*1.2
+	chrpath -d -k $(CURDIR)/debian/evolution-data-server/usr/lib/evolution-data-server/*/*.so \
+		$(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel*1.2
 
 common-binary-post-install-indep::
 	dh_bugfiles -A




More information about the pkg-evolution-commits mailing list