r1754 - in /experimental/evolution/debian: changelog control patches/

[corsac at users.alioth.debian.org]

Author: corsac
Date: Sat Oct  2 15:10:19 2010
New Revision: 1754

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1754
Log:
* debian/patches:
  - 02_let-nss-search-for-nssckbi, 03_correctly-init-nss and 
    04_login-to-nss-on-demand dropped, included upstream.

Removed:
    experimental/evolution/debian/patches/
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1754&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Sat Oct  2 15:10:19 2010
@@ -7,8 +7,11 @@
     - pick flags from dpkg-buildflags.
     - add --as-needed to LDFLAGS
     - explicitly disable GTK3 build.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Oct 2010 17:04:30 +0200
+  * debian/patches:
+    - 02_let-nss-search-for-nssckbi, 03_correctly-init-nss and 
+      04_login-to-nss-on-demand dropped, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Oct 2010 17:07:05 +0200
 
 evolution (2.30.3-2) unstable; urgency=low
 

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1754&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Sat Oct  2 15:10:19 2010
@@ -29,7 +29,7 @@
                libatk1.0-dev,
                libldap2-dev,
                libgtkhtml3.14-dev (>= 3.32.0),
-               libgtkhtml-editor3.14-dev (>= 3.32.0),
+               libgtkhtml-editor-3.14-dev (>= 3.32.0),
                libkrb5-dev,
                libnss3-dev,
                psmisc,
@@ -162,7 +162,7 @@
          libcamel1.2-dev,
          libunique-dev,
          libgtkhtml3.14-dev,
-         libgtkhtml-editor-dev,
+         libgtkhtml-editor-3.14-dev,
          libgnomecanvas2-dev,
 # evolution-shell
          libgconf2-dev,