[Pkg-citadel-commit] r355 - in citadel/trunk/debian: patches po

[Michael Meskes]

Author: meskes
Date: 2009-06-04 07:10:50 +0000 (Thu, 04 Jun 2009)
New Revision: 355

Removed:
   citadel/trunk/debian/patches/750a.diff
Modified:
   citadel/trunk/debian/patches/series
   citadel/trunk/debian/po/ru.po
Log:
Patch is no longer needed.



Deleted: citadel/trunk/debian/patches/750a.diff
===================================================================
--- citadel/trunk/debian/patches/750a.diff	2009-06-04 07:09:14 UTC (rev 354)
+++ citadel/trunk/debian/patches/750a.diff	2009-06-04 07:10:50 UTC (rev 355)
@@ -1,45 +0,0 @@
-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-06-04 07:09:14 UTC (rev 354)
+++ citadel/trunk/debian/patches/series	2009-06-04 07:10:50 UTC (rev 355)
@@ -1 +0,0 @@
-750a.diff

Modified: citadel/trunk/debian/po/ru.po
===================================================================
--- citadel/trunk/debian/po/ru.po	2009-06-04 07:09:14 UTC (rev 354)
+++ citadel/trunk/debian/po/ru.po	2009-06-04 07:10:50 UTC (rev 355)
@@ -17,7 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: string
 #. Description
@@ -86,11 +87,6 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
-#| msgid ""
-#| "Please enter the name of the Citadel user account that should be granted "
-#| "administrative privileges once created. If using internal "
-#| "authentification this user account will be created if it does not exist. "
-#| "For external authentification this user account has to exist."
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -117,4 +113,3 @@
 msgstr ""
 "Хотя это необязательно, настоятельно рекомендуется задать пароль для "
 "административного пользователя."
-