[med-svn] r3112 - in trunk/packages/arb/trunk/debian: . patches po

[tille at alioth.debian.org]

Author: tille
Date: 2009-02-11 11:04:39 +0000 (Wed, 11 Feb 2009)
New Revision: 3112

Added:
   trunk/packages/arb/trunk/debian/po/ru.po
Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/patches/30_Makefile_main
   trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch
Log:
Russian debconf translation and -Wl,--as-needed to avoid dpkg-shlibdeps warnings


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2009-02-10 22:29:47 UTC (rev 3111)
+++ trunk/packages/arb/trunk/debian/changelog	2009-02-11 11:04:39 UTC (rev 3112)
@@ -6,8 +6,12 @@
     rxp is outdate, unmaintained and should be removed.
   * Do not use command-with-path-in-maintainer-script in
     postinst and config
+  * Add -Wl,--as-needed to avoid dpkg-shlibdeps: warning: <binary>
+    shouldn't be linked with <lib> warnings
+  * Added Russian debconf translation (Thanks to Yuri Kozlov)
+    Closes: #511376
 
- -- Andreas Tille <tille at debian.org>  Sat, 31 Jan 2009 11:57:12 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 10 Feb 2009 23:32:41 +0100
 
 arb (0.0.20071207.1-5) unstable; urgency=low
 

Modified: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2009-02-10 22:29:47 UTC (rev 3111)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2009-02-11 11:04:39 UTC (rev 3112)
@@ -22,7 +22,7 @@
  
  ifdef DEBIAN
     XHOME = /usr/X11R6
-+   lflags = -Wl,-rpath,/usr/lib/arb/lib
++   lflags = -Wl,-rpath,/usr/lib/arb/lib -Wl,--as-needed
  else
     XHOME = /usr/X11
  endif

Modified: trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch	2009-02-10 22:29:47 UTC (rev 3111)
+++ trunk/packages/arb/trunk/debian/patches/tmpfile_CVE-2008-5378.patch	2009-02-11 11:04:39 UTC (rev 3112)
@@ -15,7 +15,7 @@
  rm -f $tmp
 --- arb-0.0.20071207.1.orig/ARBDB/adcomm.c
 +++ arb-0.0.20071207.1/ARBDB/adcomm.c
-@@ -126,19 +126,29 @@
+@@ -126,19 +126,30 @@
  ***************************************************************************************/
  GBCONTAINER *gbcms_gb_main;
  void *gbcms_sighup(void){
@@ -42,12 +42,13 @@
 +    fp = popen(lsbuffer, "r");
 +    if ( fscanf(fp, "%s", buffer) == EOF ) {
 +        fprintf(stderr,"- File matching '%s' not found - exiting!\n",lsbuffer);
++	exit(EXIT_FAILURE);
 +    }
 +
      fname = GB_read_file(buffer);
      if (!fname) {
          fprintf(stderr,"- File '%s' not found - exiting!\n",buffer);
-@@ -2066,7 +2076,8 @@
+@@ -2066,7 +2077,8 @@
  {
      static long lastpid = 0;
      long pid = getpid();
@@ -57,7 +58,7 @@
      char filename[1000];
      const char *user = GB_getenvUSER();
      const char *arb_pid = GB_getenv("ARB_PID");
-@@ -2076,10 +2087,12 @@
+@@ -2076,10 +2088,12 @@
      if (lastpid == pid) return 0;
      if (lastpid == -25) return 0;   /* never install */
      lastpid = pid;

Added: trunk/packages/arb/trunk/debian/po/ru.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/ru.po	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/po/ru.po	2009-02-11 11:04:39 UTC (rev 3112)
@@ -0,0 +1,35 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray at komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: arb 0.0.20071207.1-5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-25 04:34+0200\n"
+"PO-Revision-Date: 2009-01-10 11:24+0300\n"
+"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"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"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid "Arb users:"
+msgstr "Пользователи Arb:"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid ""
+"Please choose, among the list of all unprivileged users of the system, those "
+"who will be allowed running ${pkg}."
+msgstr ""
+"Выберите всех непривилегированных пользователей системы из списка, которым "
+"будет разрешено запускать ${pkg}."
+