[Pkg-citadel-commit] r336 - in citadel/trunk/debian: . patches

[Michael Meskes]

Author: meskes
Date: 2009-04-24 10:18:48 +0000 (Fri, 24 Apr 2009)
New Revision: 336

Added:
   citadel/trunk/debian/patches/750a.diff
Modified:
   citadel/trunk/debian/changelog
   citadel/trunk/debian/patches/series
   citadel/trunk/debian/watch
Log:
Added patch to upgrade to 7.50a.
Updated watch firl for new page layout.


Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2009-04-21 09:11:44 UTC (rev 335)
+++ citadel/trunk/debian/changelog	2009-04-24 10:18:48 UTC (rev 336)
@@ -1,3 +1,10 @@
+citadel (7.50-2) unstable; urgency=low
+
+  * Added bug fixing patch to update to upstream version 7.50a.
+  * Updated watch file for new page layout.
+
+ -- Michael Meskes <meskes at debian.org>  Fri, 24 Apr 2009 12:11:03 +0200
+
 citadel (7.50-1) unstable; urgency=low
 
   * New upstream version.

Added: citadel/trunk/debian/patches/750a.diff
===================================================================
--- citadel/trunk/debian/patches/750a.diff	                        (rev 0)
+++ citadel/trunk/debian/patches/750a.diff	2009-04-24 10:18:48 UTC (rev 336)
@@ -0,0 +1,45 @@
+diff -ruN citadel-7.50/svn_revision.c citadel-7.50/svn_revision.c
+--- citadel-7.50/svn_revision.c	2009-04-09 15:57:12.000000000 +0200
++++ citadel-7.50/svn_revision.c	2009-04-13 18:24:33.000000000 +0200
+@@ -9,6 +9,6 @@
+  
+ const char *svn_revision (void)
+ {
+-	const char *SVN_Version = "7313";
++	const char *SVN_Version = "7336";
+ 	return SVN_Version;
+ }
+diff -ruN citadel-7.50/sysdep.c citadel-7.50/sysdep.c
+--- citadel-7.50/sysdep.c	2009-04-09 15:56:14.000000000 +0200
++++ citadel-7.50/sysdep.c	2009-04-13 18:23:19.000000000 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: sysdep.c 7294 2009-04-06 21:07:38Z ajc $
++ * $Id: sysdep.c 7333 2009-04-11 21:29:21Z ajc $
+  *
+  * Citadel "system dependent" stuff.
+  * See COPYING for copyright information.
+@@ -566,17 +566,19 @@
+ 
+ void buffer_output(void) {
+ #ifdef HAVE_TCP_BUFFERING
+-	if (!CC->redirect_ssl) {
++#ifdef HAVE_OPENSSL
++	if (!CC->redirect_ssl)
++#endif
+ 		setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+-	}
+ #endif
+ }
+ 
+ void unbuffer_output(void) {
+ #ifdef HAVE_TCP_BUFFERING
+-	if (!CC->redirect_ssl) {
++#ifdef HAVE_OPENSSL
++	if (!CC->redirect_ssl)
++#endif
+ 		setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+-	}
+ #endif
+ }
+ 

Modified: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series	2009-04-21 09:11:44 UTC (rev 335)
+++ citadel/trunk/debian/patches/series	2009-04-24 10:18:48 UTC (rev 336)
@@ -0,0 +1 @@
+750a.diff

Modified: citadel/trunk/debian/watch
===================================================================
--- citadel/trunk/debian/watch	2009-04-21 09:11:44 UTC (rev 335)
+++ citadel/trunk/debian/watch	2009-04-24 10:18:48 UTC (rev 336)
@@ -1,5 +1,5 @@
 version=3
 
-http://www.citadel.org/doku.php?id=installation:start \
-http://easyinstall.citadel.org/citadel-([\d\.]+).tar.gz
+http://www.citadel.org/doku.php/installation:source \
+http://easyinstall.citadel.org/citadel-([\d\.]+)[a-z].tar.gz