[Pkg-samba-maint] r2777 - in branches/samba/experimental/debian: . po

bubulle at alioth.debian.org bubulle at alioth.debian.org
Wed May 20 16:37:55 UTC 2009 

tags 528382 pending
tags 528757 pending
thanks

Author: bubulle
Date: 2009-05-20 16:37:55 +0000 (Wed, 20 May 2009)
New Revision: 2777

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/po/eu.po
   branches/samba/experimental/debian/rules
Log:
Merge 2:3.3.4-2

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2009-05-20 08:29:40 UTC (rev 2776)
+++ branches/samba/experimental/debian/changelog	2009-05-20 16:37:55 UTC (rev 2777)
@@ -2,8 +2,19 @@
 
   * New upstream pre-release
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 02 May 2009 19:54:18 +0200
+ -- Christian Perrier <bubulle at debian.org>  Wed, 20 May 2009 18:37:17 +0200
 
+samba (2:3.3.4-2) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * Do no compile with clustering support on non-Linux platforms
+    Closes: #528382
+
+  [ Debconf translations ]
+  * Basque. Closes: #528757
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 16 May 2009 17:31:09 +0200
+
 samba (2:3.3.4-1) unstable; urgency=low
 
   [ Christian Perrier ]

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2009-05-20 08:29:40 UTC (rev 2776)
+++ branches/samba/experimental/debian/control	2009-05-20 16:37:55 UTC (rev 2777)
@@ -10,7 +10,7 @@
 	libtalloc-dev (>= 1.2.0~git20080616),
 	libcap2-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	ctdb (>= 1.0.73)
+	ctdb (>= 1.0.73) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.1
 Homepage: http://www.samba.org

Modified: branches/samba/experimental/debian/po/eu.po
===================================================================
--- branches/samba/experimental/debian/po/eu.po	2009-05-20 08:29:40 UTC (rev 2776)
+++ branches/samba/experimental/debian/po/eu.po	2009-05-20 16:37:55 UTC (rev 2777)
@@ -43,7 +43,7 @@
 "to your smb.conf file so that DHCP-provided WINS settings will automatically "
 "be read from /etc/samba/dhcp.conf."
 msgstr ""
-"Zure sistemak IP helbidea sareko DHCP zerbitzari batetatik jaso ezkero, "
+"Zure sistemak IP helbidea sareko DHCP zerbitzari batetatik jasoaz gero, "
 "zerbitzari horrek sareko WINS (\"NetBIOS name servers\") zerbitzarien datuak "
 "eman ditzake.  Honek smb.conf fitxategian aldaketa bat behar du DHCP bidezko "
 "WINS ezarpenak /etc/samba/dhcp.conf-etik irakurtzeko."
@@ -88,32 +88,29 @@
 "changes yourself, and will not be able to take advantage of periodic "
 "configuration enhancements."
 msgstr ""
-"Aukera hau ez erabili ezkero, konfigurazioko edozein aldaketa eskuz egin "
+"Aukera hau ez erabiliaz gero, konfigurazioko edozein aldaketa eskuz egin "
 "beharko duzu eta ezingo duzu konfigurazio aldaketa automatikoez baliatu."
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
 msgid "Workgroup/Domain Name:"
-msgstr "Lan Talde/Domeinu izena?"
+msgstr "Lan Talde/Domeinu izena:"
 
 #. Type: string
 #. Description
 #: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
 msgid ""
 "Please specify the workgroup for this system.  This setting controls which "
 "workgroup the system will appear in when used as a server, the default "
 "workgroup to be used when browsing with various frontends, and the domain "
 "name used with the \"security=domain\" setting."
 msgstr ""
-"Mesede ezarri zure zerbitzariari sareko bezeroek galdetzean bistaraziko duen "
-"lan taldea. Kontutan izan parametro honek security=domain ezarpeneko domeinu "
-"izena ere ezartzen duela."
+"Mesedez zehaztu sistema honetarako lan-taldea. Ezarpen honek sistema "
+"zerbitzari moduan erabiltzean agertuko den lan-taldea, zenbait interfaze "
+"bidez bistaratzean erabiliko den lehenetsitako lan-taldea eta "
+"\"security=domain\" ezarpenak erabiltzen duen domeinu izena kontrolatzen "
+"ditu."
 
 #. Type: boolean
 #. Description
@@ -124,37 +121,28 @@
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
 msgid ""
 "All recent Windows clients communicate with SMB/CIFS servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
 "parameter in your Windows registry."
 msgstr ""
-"Windows bezero berrienek SMB zerbitzariekiko harremanak zifraturiko "
+"Windows bezero berri guztiek SMB zerbitzariekiko harremanak zifraturiko "
 "pasahitzak erabiliaz egiten dituzte. Testu laueko pasahitzak erabili nahi "
-"izan ezkero parametro bat aldatu behar duzu Windows erregistroan."
+"izanez gero parametro bat aldatu behar duzu Windows erregistroan."
 
 #. Type: boolean
 #. Description
 #: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
 msgid ""
 "Enabling this option is highly recommended as support for plain text "
 "passwords is no longer maintained in Microsoft Windows products. If you do, "
 "make sure you have a valid /etc/samba/smbpasswd file and that you set "
 "passwords in there for each user using the smbpasswd command."
 msgstr ""
-"Aukera hau erabiltzea oso gomendagarri da. Erabiltzea hautatu ezkero "
-"ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula eta pasahitzak "
-"smbpasswd programaren bidez ezarri dituzula."
+"Aukera hau gaitzea oso gomendagarri da testu laueko pasahitzen onarpena ez "
+"bait da aurrerantzean mantendurik egongo Microsoft produktuetan. Erabiltzea "
+"hautatuaz gero ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula "
+"eta pasahitzak smbpasswd programaren bidez ezarri dituzula."
 
 #. Type: boolean
 #. Description
@@ -186,7 +174,7 @@
 "If you do not create it, you will have to reconfigure Samba (and probably "
 "your client machines) to use plaintext passwords."
 msgstr ""
-" Fitxategi hau ez sortu ezkero beharrezkoa da Samba (eta ziurrenik Windows "
+"Fitxategi hau ez sortuaz gero beharrezkoa da Samba (eta ziurrenik Windows "
 "bezeroak) zifratu gabeko pasahitzak erabiltzeko konfiguratzea."
 
 #. Type: boolean
@@ -197,7 +185,7 @@
 "from the samba-doc package for more details."
 msgstr ""
 "Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/Samba3-Developers-Guide/"
-"pwencrypt.html begiratu argibide gehiagorako"
+"pwencrypt.html begiratu argibide gehiagorako."
 
 #. Type: select
 #. Choices

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2009-05-20 08:29:40 UTC (rev 2776)
+++ branches/samba/experimental/debian/rules	2009-05-20 16:37:55 UTC (rev 2777)
@@ -63,11 +63,11 @@
 		--with-lockdir=/var/run/samba \
 		--with-statedir=/var/lib/samba \
 		--with-cachedir=/var/cache/samba \
-		--with-ctdb --with-cluster-support=yes \
 
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \
+		--with-ctdb --with-cluster-support=yes \
 		--with-cifsmount \
 		--with-cifsupcall \
 		--with-acl-support \

More information about the Pkg-samba-maint mailing list