r1804 - in /unstable/evolution-data-server/debian: ./ lintian/ patches/

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Sun Feb 6 14:46:33 UTC 2011


Author: corsac
Date: Sun Feb  6 14:46:31 2011
New Revision: 1804

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1804
Log:
merge experimental changes into unstable

Added:
    unstable/evolution-data-server/debian/libcamel1.2-19.install
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libcamel1.2-19.install
    unstable/evolution-data-server/debian/libcamel1.2-19.shlibs
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libcamel1.2-19.shlibs
    unstable/evolution-data-server/debian/libebook1.2-10.install
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libebook1.2-10.install
    unstable/evolution-data-server/debian/libecal1.2-8.install
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libecal1.2-8.install
    unstable/evolution-data-server/debian/libedata-book1.2-8.install
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libedata-book1.2-8.install
    unstable/evolution-data-server/debian/libedata-cal1.2-10.install
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libedata-cal1.2-10.install
    unstable/evolution-data-server/debian/libedataserver1.2-14.install
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libedataserver1.2-14.install
    unstable/evolution-data-server/debian/libedataserverui1.2-11.install
      - copied unchanged from r1803, experimental/evolution-data-server/debian/libedataserverui1.2-11.install
    unstable/evolution-data-server/debian/lintian/libcamel1.2-19
      - copied unchanged from r1803, experimental/evolution-data-server/debian/lintian/libcamel1.2-19
    unstable/evolution-data-server/debian/lintian/libebook1.2-10
      - copied unchanged from r1803, experimental/evolution-data-server/debian/lintian/libebook1.2-10
    unstable/evolution-data-server/debian/lintian/libecal1.2-8
      - copied unchanged from r1803, experimental/evolution-data-server/debian/lintian/libecal1.2-8
    unstable/evolution-data-server/debian/lintian/libedata-book1.2-8
      - copied unchanged from r1803, experimental/evolution-data-server/debian/lintian/libedata-book1.2-8
    unstable/evolution-data-server/debian/lintian/libedata-cal1.2-10
      - copied unchanged from r1803, experimental/evolution-data-server/debian/lintian/libedata-cal1.2-10
    unstable/evolution-data-server/debian/lintian/libedataserver1.2-14
      - copied unchanged from r1803, experimental/evolution-data-server/debian/lintian/libedataserver1.2-14
    unstable/evolution-data-server/debian/lintian/libedataserverui1.2-11
      - copied unchanged from r1803, experimental/evolution-data-server/debian/lintian/libedataserverui1.2-11
Removed:
    unstable/evolution-data-server/debian/libcamel1.2-14.install
    unstable/evolution-data-server/debian/libcamel1.2-14.shlibs
    unstable/evolution-data-server/debian/libebook1.2-9.install
    unstable/evolution-data-server/debian/libecal1.2-7.install
    unstable/evolution-data-server/debian/libedata-book1.2-2.install
    unstable/evolution-data-server/debian/libedata-cal1.2-7.install
    unstable/evolution-data-server/debian/libedataserver1.2-13.install
    unstable/evolution-data-server/debian/libedataserverui1.2-8.install
    unstable/evolution-data-server/debian/libgdata-google1.2-1.install
    unstable/evolution-data-server/debian/libgdata-google1.2-dev.install
    unstable/evolution-data-server/debian/libgdata1.2-1.install
    unstable/evolution-data-server/debian/libgdata1.2-dev.install
    unstable/evolution-data-server/debian/lintian/libcamel1.2-14
    unstable/evolution-data-server/debian/lintian/libebook1.2-9
    unstable/evolution-data-server/debian/lintian/libecal1.2-7
    unstable/evolution-data-server/debian/lintian/libedata-book1.2-2
    unstable/evolution-data-server/debian/lintian/libedata-cal1.2-7
    unstable/evolution-data-server/debian/lintian/libedataserver1.2-13
    unstable/evolution-data-server/debian/lintian/libedataserverui1.2-8
    unstable/evolution-data-server/debian/patches/01_imapx_lockup.patch
    unstable/evolution-data-server/debian/patches/102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch
    unstable/evolution-data-server/debian/patches/103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch
    unstable/evolution-data-server/debian/patches/104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch
    unstable/evolution-data-server/debian/patches/105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch
    unstable/evolution-data-server/debian/patches/106-Bug-630149-imapx_sync-never-returns-error.patch
    unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch
    unstable/evolution-data-server/debian/patches/65_evolution-color.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/control
    unstable/evolution-data-server/debian/evolution-data-server-common.install
    unstable/evolution-data-server/debian/evolution-data-server.install
    unstable/evolution-data-server/debian/libcamel1.2-dev.install
    unstable/evolution-data-server/debian/libebackend1.2-dev.install
    unstable/evolution-data-server/debian/libebook1.2-dev.install
    unstable/evolution-data-server/debian/libecal1.2-dev.install
    unstable/evolution-data-server/debian/libedata-book1.2-dev.install
    unstable/evolution-data-server/debian/libedata-cal1.2-dev.install
    unstable/evolution-data-server/debian/libedataserver1.2-dev.install
    unstable/evolution-data-server/debian/libedataserverui1.2-dev.install
    unstable/evolution-data-server/debian/libegroupwise1.2-dev.install
    unstable/evolution-data-server/debian/patches/series
    unstable/evolution-data-server/debian/rules
    unstable/evolution-data-server/debian/watch

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sun Feb  6 14:46:31 2011
@@ -1,3 +1,50 @@
+evolution-data-server (2.32.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/watch updated.
+  * debian/control:
+    - bump gweather, glib and gtk build-dep.
+    - add build dep on libgdata.
+    - drop dbus-glib build-dep.
+    - drop libgdata* packages, now external.
+    - rename libedataserver, libcamel1.2, libebook1.2, libedataserverui1.2,
+      libedata-book1.2, libecal1.2, libedata-cal1.2 packages to follow 
+      soname changes.
+    - add build-dep on hardening-includes.
+  * debian/patches:
+    - 01_imapx_lockup dropped, included upstream.
+    - 65_evolution-color dropped as well, not relevant anymore.
+    - 102-Bug-630135-No-UI-feedback-when-imapx-connection-fail, 
+        103-Bug-630150-imapx-attempts-to-connect-to-server-when-, 
+        104-Bug-630152-imapx_parser_thread-registers-wrong-opera, 
+        105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com, 
+        106-Bug-630149-imapx_sync-never-returns-error dropped as well,
+        included upstream.
+    - 25_mute-debug-messages dropped, included upstream.
+    - 45_libcamel_providers_version finally dropped, stop diverting from
+      upstream on this.
+  * debian/rules:
+    - explicitly disable gtk3 build.
+    - get flags from dpkg-buildflags.
+    - include hardening rules.
+    - add hardening, -z,defs, -O1 and --as-needed to LDFLAGS.
+    - add hardening to CFLAGS.
+  * debian/libcamel1.2-14.shlibs: 
+    - bump depends/conflicts for 2.32.
+    - bump soversion to 19.
+  * debian/libedataserver-13.install renamed to follow soname change.
+  * debian/libcamel1.2-14.install renamed to follow soname change.
+  * debian/libebook1.2-9.install renamed to follow soname change.
+  * debian/libedataserverui1.2-8.install renamed to follow soname change.
+  * debian/libedata-book1.2-2.install renamed to follow soname change.
+  * debian/libecal1.2-7.install renamed to follow soname change.
+  * debian/libedata-cal1.2-7.install renamed to follow soname change.
+  * lintian overrides updated to follow soname changes.
+  * debian/evolution-data-server.install:
+    - update install file to follow camel-provider rename patch removal.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 18 Nov 2010 18:53:42 +0100
+
 evolution-data-server (2.30.3-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Sun Feb  6 14:46:31 2011
@@ -20,6 +20,7 @@
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.37),
                dh-autoreconf,
+               hardening-includes,
                dpkg-dev (>= 1.14.16),
                pkg-config (>= 0.16),
                flex,
@@ -29,21 +30,21 @@
                libdb-dev,
                libkrb5-dev,
                libldap2-dev,
-               libglib2.0-dev (>= 2.16.1),
+               libglib2.0-dev (>= 2.25.12),
                libxml2-dev,
                libgconf2-dev,
                libnss3-dev,
-               libgtk2.0-dev (>= 2.18.0),
+               libgtk2.0-dev (>= 2.20.0),
                libgnome2-dev,
                libsoup2.4-dev,
                libgnome-keyring-dev (>= 2.20.1),
                gtk-doc-tools,
                libsqlite3-dev (>= 3.6),
                chrpath,
-               libgweather-dev (>= 2.24.5),
+               libgweather-dev (>= 2.25.4),
                libical-dev,
                libicu-dev,
-               libdbus-glib-1-dev (>= 0.6),
+               libgdata-dev (>= 0.6.3),
                gperf,
                gnome-pkg-tools
 
@@ -90,7 +91,7 @@
 Description: evolution database backend server with debugging symbols
  This package contains unstripped binaries used for debugging.
 
-Package: libedataserver1.2-13
+Package: libedataserver1.2-14
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -104,7 +105,7 @@
 Package: libedataserver1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedataserver1.2-13 (= ${binary:Version}),
+Depends: libedataserver1.2-14 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends},
          libxml2-dev,
@@ -117,7 +118,7 @@
  .
  This package contains header files and static library for libedataserver1.2-13.
 
-Package: libcamel1.2-14
+Package: libcamel1.2-19
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -134,7 +135,7 @@
 Package: libcamel1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libcamel1.2-14 (= ${binary:Version}),
+Depends: libcamel1.2-19 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libglib2.0-dev,
@@ -152,7 +153,7 @@
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
 
-Package: libebook1.2-9
+Package: libebook1.2-10
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -166,21 +167,21 @@
 Package: libebook1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libebook1.2-9 (= ${binary:Version}),
+Depends: libebook1.2-10 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libgnome2-dev,
          libedataserver1.2-dev,
          libdbus-glib-1-dev
 Description: Client library for evolution address books (development files)
- This package contains header files and static library for libebook1.2-9.
+ This package contains header files and static library for libebook1.2-10.
  .
  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-8
+Package: libedataserverui1.2-11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -195,7 +196,7 @@
 Package: libedataserverui1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedataserverui1.2-8 (= ${binary:Version}),
+Depends: libedataserverui1.2-11 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libgtk2.0-dev,
@@ -206,9 +207,9 @@
  calendar and addressbook information.
  .
  This package contains header files and static library for
- libedataserverui1.2-8.
-
-Package: libedata-book1.2-2
+ libedataserverui1.2-11.
+
+Package: libedata-book1.2-8
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -222,7 +223,7 @@
 Package: libedata-book1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedata-book1.2-2 (= ${binary:Version}),
+Depends: libedata-book1.2-8 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libedataserver1.2-dev,
@@ -232,9 +233,9 @@
  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-2
-
-Package: libecal1.2-7
+ This package contains header files and static library for libedata-book1.2-8
+
+Package: libecal1.2-8
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -248,7 +249,7 @@
 Package: libecal1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libecal1.2-7 (= ${binary:Version}),
+Depends: libecal1.2-8 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libical-dev (>= 0.43),
@@ -258,9 +259,9 @@
  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-7.
-
-Package: libedata-cal1.2-7
+ This package contains header files and static library for libecal1.2-8.
+
+Package: libedata-cal1.2-10
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -274,7 +275,7 @@
 Package: libedata-cal1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedata-cal1.2-7 (= ${binary:Version}),
+Depends: libedata-cal1.2-10 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libdbus-glib-1-dev,
@@ -285,7 +286,7 @@
  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-7.
+ This package contains header files and static library for libedata-cal1.2-10.
 
 Package: libegroupwise1.2-13
 Section: libs
@@ -311,63 +312,6 @@
  .
  libegroupwise is client library for accessing groupwise POA through SOAP
  interface of Evolution.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libgdata1.2-1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Client library for accessing Google POA through SOAP interface
- This package is a client library to access the Google Data APIs through a 
- SOAP interface.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libgdata1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libgdata1.2-1 (= ${binary:Version}),
-         ${misc:Depends},
-         libsoup2.4-dev
-Description: Client library for accessing Google POA (development files)
- This package contains header files and static library for
- libgdata1.2-1.
- .
- libgdata is a client library to access the Google Data APIs through a
- SOAP interface.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libgdata-google1.2-1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Client library for accessing Google POA through SOAP interface
- This package is a client library to access Google services through a SOAP
- interface.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libgdata-google1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libgdata-google1.2-1 (= ${binary:Version}),
-         ${misc:Depends},
-         libsoup2.4-dev,
-         libgdata1.2-dev
-Description: Client library for accessing Google POA (development files)
- This package contains header files and static library for
- libgdata-google1.2-1.
- .
- libgdata-google is a client library to access Google services through a SOAP
- interface.
  .
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.

Modified: unstable/evolution-data-server/debian/evolution-data-server-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/evolution-data-server-common.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/evolution-data-server-common.install (original)
+++ unstable/evolution-data-server/debian/evolution-data-server-common.install Sun Feb  6 14:46:31 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/evolution-data-server-2.30
+debian/tmp/usr/share/evolution-data-server-2.32
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/pixmaps
 debian/tmp/usr/share/dbus-1

Modified: unstable/evolution-data-server/debian/evolution-data-server.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/evolution-data-server.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/evolution-data-server.install (original)
+++ unstable/evolution-data-server/debian/evolution-data-server.install Sun Feb  6 14:46:31 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-1.2/camel-providers/*.urls
+debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers/*.so
 debian/lintian/evolution-data-server usr/share/lintian/overrides/

Modified: unstable/evolution-data-server/debian/libcamel1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libcamel1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libcamel1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libcamel1.2-dev.install Sun Feb  6 14:46:31 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.30/camel
+debian/tmp/usr/include/evolution-data-server-2.32/camel
 debian/tmp/usr/share/gtk-doc/html/camel

Modified: unstable/evolution-data-server/debian/libebackend1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libebackend1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libebackend1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libebackend1.2-dev.install Sun Feb  6 14:46:31 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.30/libebackend
+debian/tmp/usr/include/evolution-data-server-2.32/libebackend
 debian/tmp/usr/share/gtk-doc/html/libebackend

Modified: unstable/evolution-data-server/debian/libebook1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libebook1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libebook1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libebook1.2-dev.install Sun Feb  6 14:46:31 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.30/libebook
+debian/tmp/usr/include/evolution-data-server-2.32/libebook
 debian/tmp/usr/share/gtk-doc/html/libebook

Modified: unstable/evolution-data-server/debian/libecal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libecal1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libecal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libecal1.2-dev.install Sun Feb  6 14:46:31 2011
@@ -1,4 +1,4 @@
 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.30/libecal
+debian/tmp/usr/include/evolution-data-server-2.32/libecal
 debian/tmp/usr/share/gtk-doc/html/libecal

Modified: unstable/evolution-data-server/debian/libedata-book1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedata-book1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-book1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-book1.2-dev.install Sun Feb  6 14:46:31 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.30/libedata-book
+debian/tmp/usr/include/evolution-data-server-2.32/libedata-book
 debian/tmp/usr/share/gtk-doc/html/libedata-book

Modified: unstable/evolution-data-server/debian/libedata-cal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedata-cal1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-cal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-cal1.2-dev.install Sun Feb  6 14:46:31 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.30/libedata-cal
+debian/tmp/usr/include/evolution-data-server-2.32/libedata-cal
 debian/tmp/usr/share/gtk-doc/html/libedata-cal

Modified: unstable/evolution-data-server/debian/libedataserver1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedataserver1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserver1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserver1.2-dev.install Sun Feb  6 14:46:31 2011
@@ -1,4 +1,4 @@
 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.30/libedataserver
+debian/tmp/usr/include/evolution-data-server-2.32/libedataserver
 debian/tmp/usr/share/gtk-doc/html/libedataserver

Modified: unstable/evolution-data-server/debian/libedataserverui1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedataserverui1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserverui1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserverui1.2-dev.install Sun Feb  6 14:46:31 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.30/libedataserverui
+debian/tmp/usr/include/evolution-data-server-2.32/libedataserverui
 debian/tmp/usr/share/gtk-doc/html/libedataserverui/

Modified: unstable/evolution-data-server/debian/libegroupwise1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libegroupwise1.2-dev.install?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libegroupwise1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libegroupwise1.2-dev.install Sun Feb  6 14:46:31 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.30/groupwise
+debian/tmp/usr/include/evolution-data-server-2.32/groupwise

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Sun Feb  6 14:46:31 2011
@@ -1,9 +1,0 @@
-01_imapx_lockup.patch
-25_mute-debug-messages.patch
-45_libcamel_providers_version.patch
-65_evolution-color.patch
-102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch
-103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch
-104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch
-105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch
-106-Bug-630149-imapx_sync-never-returns-error.patch

Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Sun Feb  6 14:46:31 2011
@@ -7,13 +7,19 @@
 include /usr/share/cdbs/1/rules/utils.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
 
 
 DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V
 
-CFLAGS += -fPIC
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+
+export CFLAGS LDFLAGS
 
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
 	--libexecdir=\$${prefix}/lib/evolution \
@@ -25,7 +31,8 @@
 	--with-krb5=/usr \
 	--with-libdb=/usr \
 	--enable-gtk-doc \
-	--enable-gnome-keyring=yes
+	--enable-gnome-keyring=yes \
+	--enable-gtk3=no
 
 DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
 

Modified: unstable/evolution-data-server/debian/watch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/watch?rev=1804&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/watch (original)
+++ unstable/evolution-data-server/debian/watch Sun Feb  6 14:46:31 2011
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/([\d\.]+[02468])/evolution-data-server-([\d\.]+)\.tar\.gz	debian	uupdate
+http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/([\d]\.[\d]+[02468])/evolution-data-server-([\d\.]+)\.tar\.gz	debian	uupdate




More information about the pkg-evolution-commits mailing list