← Back to branch summary

~ubuntu-branches/ubuntu/karmic/evolution-data-server/karmic

« back to all changes in this revision

Viewing changes to libdb/rpc_server/cxx/db_server_cxxproc.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-06-07 06:15:30 UTC
  • mfrom: (1.1.67 upstream) (1.2.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090607061530-cb17kuzqikd115dt
Tags: 2.26.2-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/patches/90_upstream_change_fix_calendar_crasher.patch:
    upstream change to fix a calendar crasher leading to evolution hanging
  - debian/control:
    + Bump Build-Dependency on libgtk2.0-dev to (>= 2.14.0)
    + Add new Build-Dependency on libgweather-dev (>= 2.25.4) and
      libical-dev (>= 0.43)
    + Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  - debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    install html documentation
  - debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    use the upstream versioning, not a Debian-specific one
* Dropped changes:
  - debian/patches/11_it_translation.patch: the Debian patch has been
    fixed up to apply to the current upstream version, so apply it even
    though we don't need it

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdb/rpc_server/cxx/db_server_cxxproc.cpp
9
9
 
10
10
#ifdef HAVE_RPC
11
11
#ifndef lint
12
 
static const char revid[] = "$Id: db_server_cxxproc.cpp 2904 2003-11-20 22:14:35Z toshok $";
 
12
static const char revid[] = "$Id$";
13
13
#endif /* not lint */
14
14
 
15
15
#ifndef NO_SYSTEM_INCLUDES