r782 - in /unstable/evolution-exchange/debian: changelog exchange-connector-setup-2.10 exchange-connector-setup-2.10.1 manpages patches/05_remove-rfcs.patch patches/20_camel-continue-reading-on-timeout.patch rules

oysteigi-guest at users.alioth.debian.org oysteigi-guest at users.alioth.debian.org
Tue Apr 24 22:47:43 UTC 2007


Author: oysteigi-guest
Date: Tue Apr 24 22:47:42 2007
New Revision: 782

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=782
Log:
  - Drop 20_camel-continue-reading-on-timeout.patch, applied upstream
  - Update 05_remove-rfcs.patch
  - Update directory names in debian/rules
* Closes: #326449
  (Closes: #263634, #277307, #274152)

Added:
    unstable/evolution-exchange/debian/exchange-connector-setup-2.10
      - copied, changed from r781, unstable/evolution-exchange/debian/exchange-connector-setup-2.10.1
Removed:
    unstable/evolution-exchange/debian/exchange-connector-setup-2.10.1
    unstable/evolution-exchange/debian/patches/20_camel-continue-reading-on-timeout.patch
Modified:
    unstable/evolution-exchange/debian/changelog
    unstable/evolution-exchange/debian/manpages
    unstable/evolution-exchange/debian/patches/05_remove-rfcs.patch
    unstable/evolution-exchange/debian/rules

Modified: unstable/evolution-exchange/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/changelog?rev=782&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/changelog (original)
+++ unstable/evolution-exchange/debian/changelog Tue Apr 24 22:47:42 2007
@@ -4,6 +4,9 @@
     - Set intltool build-dep to version >= 0.35.5
     - Bump evolution-dev build-dep to >= 2.10
     - Rename manpage to match version
+    - Drop 20_camel-continue-reading-on-timeout.patch, applied upstream
+    - Update 05_remove-rfcs.patch
+    - Update directory names in debian/rules
   * Update watch file to track all stable versions
 
  -- Oystein Gisnas <oystein at gisnas.net>  Tue, 24 Apr 2007 23:40:30 +0200
@@ -139,7 +142,7 @@
   * Updated to Standards-Version 3.6.2 
   * Changed build depends from evolution-data-server1.2-dev to 
     evolution-data-server-dev 
-  * Closes #326449
+  * Closes: #326449
 
  -- Lawrence Walton <lawrence at the-penguin.otak.com>  Sat,  3 Sep 2005 10:57:38 -0700
 
@@ -196,7 +199,7 @@
 ximian-connector (2.0.2-2) unstable; urgency=low
 
   * Upload to unstable.
-    (Closes #263634, #277307, #274152)
+    (Closes: #263634, #277307, #274152)
 
   * New maintainer.  Thanks other Jeff! 
 

Copied: unstable/evolution-exchange/debian/exchange-connector-setup-2.10 (from r781, unstable/evolution-exchange/debian/exchange-connector-setup-2.10.1)
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/exchange-connector-setup-2.10?rev=782&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/exchange-connector-setup-2.10.1 (original)
+++ unstable/evolution-exchange/debian/exchange-connector-setup-2.10 Tue Apr 24 22:47:42 2007
@@ -1,14 +1,14 @@
-.TH EXCHANGE-CONNECTOR-SETUP 1 "April 22, 2005"
+.TH EXCHANGE-CONNECTOR-SETUP-2.10 1 "April 22, 2005"
 
 .SH NAME
-ximian-connector-setup-2.6 \- configure evolution to access an
+exchange-connector-setup-2.10 \- configure evolution to access an
 exchange server
 
 .SH SYNOPSIS
-.B ximian-connector-setup-2.6
+.B exchange-connector-setup-2.10
 
 .SH DESCRIPTION
-\fBximian-connector-setup-2.6\fP is a program that is called
+\fBexchange-connector-setup-2.10\fP is a program that is called
 from within
 .BR evolution (1)
 to help guide users through setting up a connection to an
@@ -21,7 +21,7 @@
 .BR evolution (1)
 
 .SH AUTHORS
-ximian-connector was written by The Novell Corporation.
+evolution-exchange was written by The Novell Corporation.
 
 This manual page was written by
 Lawrence Walton <\fIlawrence at the-penguin.otak.com\fP>,

Modified: unstable/evolution-exchange/debian/manpages
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/manpages?rev=782&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/manpages (original)
+++ unstable/evolution-exchange/debian/manpages Tue Apr 24 22:47:42 2007
@@ -1,1 +1,1 @@
-debian/exchange-connector-setup-2.10.1
+debian/exchange-connector-setup-2.10

Modified: unstable/evolution-exchange/debian/patches/05_remove-rfcs.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/patches/05_remove-rfcs.patch?rev=782&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/patches/05_remove-rfcs.patch (original)
+++ unstable/evolution-exchange/debian/patches/05_remove-rfcs.patch Tue Apr 24 22:47:42 2007
@@ -1,27 +1,27 @@
-diff -Nur evolution-exchange-2.6.3.dfsg/configure evolution-exchange-2.6.3.dfsg.new/configure
---- evolution-exchange-2.6.3.dfsg/configure	2006-07-31 15:41:06.000000000 +0200
-+++ evolution-exchange-2.6.3.dfsg.new/configure	2006-10-17 21:49:22.000000000 +0200
-@@ -24651,7 +24651,7 @@
+diff -Nur evolution-exchange-2.10.1/configure evolution-exchange-2.10.1.new/configure
+--- evolution-exchange-2.10.1/configure	2007-04-09 14:03:50.000000000 +0200
++++ evolution-exchange-2.10.1.new/configure	2007-04-25 00:29:34.000000000 +0200
+@@ -27202,7 +27202,7 @@
  
  
  
--                                                                                                              ac_config_files="$ac_config_files Makefile evolution-exchange-zip camel/Makefile mail/Makefile addressbook/Makefile calendar/Makefile storage/Makefile docs/Makefile docs/ietf/Makefile docs/reference/Makefile po/Makefile.in"
-+                                                                                                              ac_config_files="$ac_config_files Makefile evolution-exchange-zip camel/Makefile mail/Makefile addressbook/Makefile calendar/Makefile storage/Makefile docs/Makefile docs/reference/Makefile po/Makefile.in"
+-ac_config_files="$ac_config_files Makefile evolution-exchange-zip camel/Makefile mail/Makefile addressbook/Makefile calendar/Makefile storage/Makefile docs/Makefile docs/ietf/Makefile docs/reference/Makefile po/Makefile.in"
++ac_config_files="$ac_config_files Makefile evolution-exchange-zip camel/Makefile mail/Makefile addressbook/Makefile calendar/Makefile storage/Makefile docs/Makefile docs/reference/Makefile po/Makefile.in"
+ 
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -25275,7 +25275,6 @@
-   "calendar/Makefile" ) CONFIG_FILES="$CONFIG_FILES calendar/Makefile" ;;
-   "storage/Makefile" ) CONFIG_FILES="$CONFIG_FILES storage/Makefile" ;;
-   "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
--  "docs/ietf/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/ietf/Makefile" ;;
-   "docs/reference/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
-   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-diff -Nur evolution-exchange-2.6.3.dfsg/configure.in evolution-exchange-2.6.3.dfsg.new/configure.in
---- evolution-exchange-2.6.3.dfsg/configure.in	2006-07-31 15:31:36.000000000 +0200
-+++ evolution-exchange-2.6.3.dfsg.new/configure.in	2006-10-17 21:49:09.000000000 +0200
-@@ -259,7 +259,6 @@
+@@ -27859,7 +27859,6 @@
+     "calendar/Makefile") CONFIG_FILES="$CONFIG_FILES calendar/Makefile" ;;
+     "storage/Makefile") CONFIG_FILES="$CONFIG_FILES storage/Makefile" ;;
+     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+-    "docs/ietf/Makefile") CONFIG_FILES="$CONFIG_FILES docs/ietf/Makefile" ;;
+     "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+diff -Nur evolution-exchange-2.10.1/configure.in evolution-exchange-2.10.1.new/configure.in
+--- evolution-exchange-2.10.1/configure.in	2007-04-09 13:22:04.000000000 +0200
++++ evolution-exchange-2.10.1.new/configure.in	2007-04-25 00:29:34.000000000 +0200
+@@ -285,7 +285,6 @@
  calendar/Makefile
  storage/Makefile
  docs/Makefile
@@ -29,9 +29,9 @@
  docs/reference/Makefile
  po/Makefile.in
  ])
-diff -Nur evolution-exchange-2.6.3.dfsg/docs/Makefile.am evolution-exchange-2.6.3.dfsg.new/docs/Makefile.am
---- evolution-exchange-2.6.3.dfsg/docs/Makefile.am	2004-10-19 17:40:28.000000000 +0200
-+++ evolution-exchange-2.6.3.dfsg.new/docs/Makefile.am	2006-10-17 21:49:04.000000000 +0200
+diff -Nur evolution-exchange-2.10.1/docs/Makefile.am evolution-exchange-2.10.1.new/docs/Makefile.am
+--- evolution-exchange-2.10.1/docs/Makefile.am	2007-04-05 11:20:44.000000000 +0200
++++ evolution-exchange-2.10.1.new/docs/Makefile.am	2007-04-25 00:29:34.000000000 +0200
 @@ -1,5 +1,4 @@
  SUBDIRS =			\
 -	ietf			\
@@ -43,16 +43,16 @@
  	sending-mail		\
  	subscriptions		\
 -	voting
-\ Pas de fin de ligne à la fin du fichier.
+\ Intet linjeskift ved filafslutning
 +	voting
-diff -Nur evolution-exchange-2.6.3.dfsg/docs/Makefile.in evolution-exchange-2.6.3.dfsg.new/docs/Makefile.in
---- evolution-exchange-2.6.3.dfsg/docs/Makefile.in	2006-07-31 15:41:11.000000000 +0200
-+++ evolution-exchange-2.6.3.dfsg.new/docs/Makefile.in	2006-10-17 21:49:04.000000000 +0200
-@@ -231,7 +231,6 @@
+diff -Nur evolution-exchange-2.10.1/docs/Makefile.in evolution-exchange-2.10.1.new/docs/Makefile.in
+--- evolution-exchange-2.10.1/docs/Makefile.in	2007-04-09 14:14:38.000000000 +0200
++++ evolution-exchange-2.10.1.new/docs/Makefile.in	2007-04-25 00:29:34.000000000 +0200
+@@ -263,7 +263,6 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  SUBDIRS = \
 -	ietf			\
  	reference
  
- 
+ EXTRA_DIST = \

Modified: unstable/evolution-exchange/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/rules?rev=782&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/rules (original)
+++ unstable/evolution-exchange/debian/rules Tue Apr 24 22:47:42 2007
@@ -6,5 +6,5 @@
 CFLAGS += -fPIC
 
 binary-install/evolution-exchange::
-	rm debian/evolution-exchange/usr/lib/evolution-data-server-1.2/camel-providers-8/libcamelexchange.a
-	rm debian/evolution-exchange/usr/lib/evolution-data-server-1.2/camel-providers-8/libcamelexchange.la
+	rm debian/evolution-exchange/usr/lib/evolution-data-server-1.2/camel-providers-10/libcamelexchange.a
+	rm debian/evolution-exchange/usr/lib/evolution-data-server-1.2/camel-providers-10/libcamelexchange.la




More information about the pkg-evolution-commits mailing list