[Python-apps-commits] r7378 - in packages/slapos.core/tags (12 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Fri Jul 29 10:09:59 UTC 2011


    Date: Friday, July 29, 2011 @ 10:09:56
  Author: arnau
Revision: 7378

[svn-buildpackage] Tagging slapos.core 0.12-1

Added:
  packages/slapos.core/tags/0.12-1/
  packages/slapos.core/tags/0.12-1/debian/changelog
    (from rev 7377, packages/slapos.core/trunk/debian/changelog)
  packages/slapos.core/tags/0.12-1/debian/control
    (from rev 7377, packages/slapos.core/trunk/debian/control)
  packages/slapos.core/tags/0.12-1/debian/po/de.po
    (from rev 7375, packages/slapos.core/trunk/debian/po/de.po)
  packages/slapos.core/tags/0.12-1/debian/po/fr.po
    (from rev 7375, packages/slapos.core/trunk/debian/po/fr.po)
  packages/slapos.core/tags/0.12-1/debian/po/ru.po
    (from rev 7375, packages/slapos.core/trunk/debian/po/ru.po)
  packages/slapos.core/tags/0.12-1/debian/rules
    (from rev 7376, packages/slapos.core/trunk/debian/rules)
Deleted:
  packages/slapos.core/tags/0.12-1/debian/changelog
  packages/slapos.core/tags/0.12-1/debian/control
  packages/slapos.core/tags/0.12-1/debian/po/fr.po
  packages/slapos.core/tags/0.12-1/debian/po/ru.po
  packages/slapos.core/tags/0.12-1/debian/rules

Deleted: packages/slapos.core/tags/0.12-1/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2011-07-27 21:25:43 UTC (rev 7367)
+++ packages/slapos.core/tags/0.12-1/debian/changelog	2011-07-29 10:09:56 UTC (rev 7378)
@@ -1,61 +0,0 @@
-slapos.core (0.12-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Arnaud Fontaine <arnau at debian.org>  Mon, 18 Jul 2011 12:07:53 +0200
-
-slapos.core (0.8+20110708+1.git5c55e0e-1) unstable; urgency=low
-
-  * New upstream snapshot.
-  * debian/patches/system_configuration_file_by_default.patch:
-    + Patch slapconsole and slapos-request as well as it now parsed
-      /etc/slapos/slapos.cfg.
-
- -- Arnaud Fontaine <arnau at debian.org>  Fri, 08 Jul 2011 13:44:25 +0200
-
-slapos.core (0.8+20110701+1.gitc5b5897-1) unstable; urgency=low
-
-  * New upstream snapshot.
-  * Allow to specify the  software release root through debconf, necessary
-    when using a  SlapOS master (it must be the  same independently of the
-    GNU/Linux distribution).
-  * debian/config:
-    + Fix typo  on ipv4_local_network name, which was  not set properly in
-      generated /etc/slapos/slapos.cfg file.
-  * debian/watch:
-    + Mangle debian version to remove the snapshot-specific versioning.
-
- -- Arnaud Fontaine <arnau at debian.org>  Fri, 01 Jul 2011 15:11:55 +0200
-
-slapos.core (0.8-1) unstable; urgency=low
-
-  * New upstream release.
-  * Add debian/watch.
-  * debian/patches/fix_zc.buildout_conflict.patch:
-    + Drop because it was applied upstream.
-
- -- Arnaud Fontaine <arnau at debian.org>  Wed, 29 Jun 2011 14:05:39 +0200
-
-slapos.core (0.3~20110608+1.git9496d81-1) unstable; urgency=low
-
-  * slapos.slap, slapos.tool.grid and slapos.tool.format have been merged
-    upstream into slapos.core.
-  * debian/po:
-    + Add Swedish translation. Thanks to Martin Bagge. Closes: #628865.
-    + Add Danish translation. Thanks to Joe Dalton. Closes: #628202.
-    + Add French translation. Thanks to Julien Patriarca. Closes: #629454.
-    + Add Portuguese translation. Thanks to Rui Branco and Miguel Figueiredo.
-      Closes: #628837.
-    + Add Czech translation. Thanks to Michal Simunek. Closes: #628151.
-    + Add Dutch translation. Thanks to Jeroen Schot. Closes: #629388.
-    + Add Spanish translation. Thanks to Francisco Javier Cuadrado.
-      Closes: #630165.
-    + Add Russian translation. Thanks to Yuri Kozlov. Closes: #628187.
-    + Add Japanese translation. Thanks to Hideki Yamane. Closes: #628705.
-  * debian/control, debian/templates:
-    + Improve phrasing. Thanks to Christian Perrier. Closes: #627640.
-  * debian/templates:
-    + Remove meaningless bridge_note debconf note (debconf abuse).
-      Closes: #626091.
-
- -- Arnaud Fontaine <arnau at debian.org>  Tue, 14 Jun 2011 15:47:56 +0900

Copied: packages/slapos.core/tags/0.12-1/debian/changelog (from rev 7377, packages/slapos.core/trunk/debian/changelog)
===================================================================
--- packages/slapos.core/tags/0.12-1/debian/changelog	                        (rev 0)
+++ packages/slapos.core/tags/0.12-1/debian/changelog	2011-07-29 10:09:56 UTC (rev 7378)
@@ -0,0 +1,69 @@
+slapos.core (0.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Bump python and python2.6 Build-Depends to 2.6.6-14 (not python only
+      because Ubuntu ships python-defaults 2.7.1 based on 2.6.6-6 from Debian)
+      which properly supports namespace packages for dh_python2.
+  * debian/po:
+    + Update Russian translation. Thanks to Yuri Kozlov. Closes: #635144.
+    + Update French translation. Thanks to Christian Perrier. Closes: #634095.
+    + Add German translation. Thanks to Chris Leick. Closes: #629045.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Mon, 18 Jul 2011 12:07:53 +0200
+
+slapos.core (0.8+20110708+1.git5c55e0e-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * debian/patches/system_configuration_file_by_default.patch:
+    + Patch slapconsole and slapos-request as well as it now parsed
+      /etc/slapos/slapos.cfg.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 08 Jul 2011 13:44:25 +0200
+
+slapos.core (0.8+20110701+1.gitc5b5897-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * Allow to specify the  software release root through debconf, necessary
+    when using a  SlapOS master (it must be the  same independently of the
+    GNU/Linux distribution).
+  * debian/config:
+    + Fix typo  on ipv4_local_network name, which was  not set properly in
+      generated /etc/slapos/slapos.cfg file.
+  * debian/watch:
+    + Mangle debian version to remove the snapshot-specific versioning.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 01 Jul 2011 15:11:55 +0200
+
+slapos.core (0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add debian/watch.
+  * debian/patches/fix_zc.buildout_conflict.patch:
+    + Drop because it was applied upstream.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 29 Jun 2011 14:05:39 +0200
+
+slapos.core (0.3~20110608+1.git9496d81-1) unstable; urgency=low
+
+  * slapos.slap, slapos.tool.grid and slapos.tool.format have been merged
+    upstream into slapos.core.
+  * debian/po:
+    + Add Swedish translation. Thanks to Martin Bagge. Closes: #628865.
+    + Add Danish translation. Thanks to Joe Dalton. Closes: #628202.
+    + Add French translation. Thanks to Julien Patriarca. Closes: #629454.
+    + Add Portuguese translation. Thanks to Rui Branco and Miguel Figueiredo.
+      Closes: #628837.
+    + Add Czech translation. Thanks to Michal Simunek. Closes: #628151.
+    + Add Dutch translation. Thanks to Jeroen Schot. Closes: #629388.
+    + Add Spanish translation. Thanks to Francisco Javier Cuadrado.
+      Closes: #630165.
+    + Add Russian translation. Thanks to Yuri Kozlov. Closes: #628187.
+    + Add Japanese translation. Thanks to Hideki Yamane. Closes: #628705.
+  * debian/control, debian/templates:
+    + Improve phrasing. Thanks to Christian Perrier. Closes: #627640.
+  * debian/templates:
+    + Remove meaningless bridge_note debconf note (debconf abuse).
+      Closes: #626091.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Tue, 14 Jun 2011 15:47:56 +0900

Deleted: packages/slapos.core/tags/0.12-1/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control	2011-07-27 21:25:43 UTC (rev 7367)
+++ packages/slapos.core/tags/0.12-1/debian/control	2011-07-29 10:09:56 UTC (rev 7378)
@@ -1,67 +0,0 @@
-Source: slapos.core
-Maintainer: Arnaud Fontaine <arnau at debian.org>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Section: net
-Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3),
-               python (>= 2.6.6-3~),
-               python2.6,
-               debhelper (>= 7.4.3)
-Build-Depends-Indep: po-debconf
-Standards-Version: 3.9.2
-X-Python-Version: 2.6
-Homepage: http://www.slapos.org
-Vcs-Svn: svn://svn.debian.org/python-apps/packages/slapos.core/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/slapos.core/trunk/
-
-Package: slapos-client
-Architecture: all
-Provides: python-slapos.slap,
-          slapgrid,
-          slapformat
-Replaces: python-slapos.slap,
-          slapgrid,
-          slapformat
-Conflicts: python-slapos.slap,
-           slapgrid,
-           slapformat,
-# slapos.grid (upstream bug)
-           python-zc.buildout
-Depends: ${misc:Depends},
-         ${python:Depends},
-# slapos.slap
-         python-xmlmarshaller (>= 0.9.3~),
-# slapos.format
-         bridge-utils,
-         uml-utilities,
-         python-netaddr (>= 0.7.5~),
-# slapos.grid (python 2.6 because of supervisor)
-         python-initgroups,
-         python-argparse,
-# Added manually due to bug in dh_python2 (fixed in 2.7.2-2)
-# http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-debian/revision/224/dh_python2
-         python-flask,
-         python-lxml,
-         python-netifaces,
-         python-pkg-resources,
-         python-setuptools,
-         python-zope.interface,
-         supervisor
-Breaks: ${python:Breaks}
-# slapos.grid
-Recommends: libc6-dev | libc-dev,
-            gcc | c-compiler,
-            g++ | c++-compiler,
-            make,
-            python2.6-dev
-Description: Client-side to deploy applications with SlapOS 
- SlapOS allows one to turn any application into SaaS (Service as a System),
- PaaS (Platform as a Service) or IaaS (Infrastructure as a Service) without
- loosing your freedom.  SlapOS defines two types of servers: SlapOS server and
- SlapOS client. This package contains libraries and tools to deploy a client.
- .
- Slapformat prepares a SlapOS node before running slapgrid. It then generates
- a report and sends the information to the configured SlapOS master.
- .
- Slapgrid allows you to easily deploy instances of software based on buildout
- profiles.

Copied: packages/slapos.core/tags/0.12-1/debian/control (from rev 7377, packages/slapos.core/trunk/debian/control)
===================================================================
--- packages/slapos.core/tags/0.12-1/debian/control	                        (rev 0)
+++ packages/slapos.core/tags/0.12-1/debian/control	2011-07-29 10:09:56 UTC (rev 7378)
@@ -0,0 +1,67 @@
+Source: slapos.core
+Maintainer: Arnaud Fontaine <arnau at debian.org>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Section: net
+Priority: optional
+Build-Depends: python-setuptools (>= 0.6b3),
+               python (>= 2.6.6-14~),
+               python2.6 (>= 2.6.6-14~),
+               debhelper (>= 7.4.3)
+Build-Depends-Indep: po-debconf
+Standards-Version: 3.9.2
+X-Python-Version: 2.6
+Homepage: http://www.slapos.org
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/slapos.core/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/slapos.core/trunk/
+
+Package: slapos-client
+Architecture: all
+Provides: python-slapos.slap,
+          slapgrid,
+          slapformat
+Replaces: python-slapos.slap,
+          slapgrid,
+          slapformat
+Conflicts: python-slapos.slap,
+           slapgrid,
+           slapformat,
+# slapos.grid (upstream bug)
+           python-zc.buildout
+Depends: ${misc:Depends},
+         ${python:Depends},
+# slapos.slap
+         python-xmlmarshaller (>= 0.9.3~),
+# slapos.format
+         bridge-utils,
+         uml-utilities,
+         python-netaddr (>= 0.7.5~),
+# slapos.grid (python 2.6 because of supervisor)
+         python-initgroups,
+         python-argparse,
+# Added manually due to bug in dh_python2 (fixed in 2.7.2-2)
+# http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-debian/revision/224/dh_python2
+         python-flask,
+         python-lxml,
+         python-netifaces,
+         python-pkg-resources,
+         python-setuptools,
+         python-zope.interface,
+         supervisor
+Breaks: ${python:Breaks}
+# slapos.grid
+Recommends: libc6-dev | libc-dev,
+            gcc | c-compiler,
+            g++ | c++-compiler,
+            make,
+            python2.6-dev
+Description: Client-side to deploy applications with SlapOS 
+ SlapOS allows one to turn any application into SaaS (Service as a System),
+ PaaS (Platform as a Service) or IaaS (Infrastructure as a Service) without
+ loosing your freedom.  SlapOS defines two types of servers: SlapOS server and
+ SlapOS client. This package contains libraries and tools to deploy a client.
+ .
+ Slapformat prepares a SlapOS node before running slapgrid. It then generates
+ a report and sends the information to the configured SlapOS master.
+ .
+ Slapgrid allows you to easily deploy instances of software based on buildout
+ profiles.

Copied: packages/slapos.core/tags/0.12-1/debian/po/de.po (from rev 7375, packages/slapos.core/trunk/debian/po/de.po)
===================================================================
--- packages/slapos.core/tags/0.12-1/debian/po/de.po	                        (rev 0)
+++ packages/slapos.core/tags/0.12-1/debian/po/de.po	2011-07-29 10:09:56 UTC (rev 7378)
@@ -0,0 +1,118 @@
+# German translation of slapos.tool.format.
+# Copyright 2010-2011, Vifib SARL and Contributors.
+# This file is distributed under the same license as the
+# slapos.tool.format package.
+# Translation by Chris Leick <c.leick at vollbio.de>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slapos.tool.format 1.0~20110420+1.git67c5b39-2\n"
+"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
+"PO-Revision-Date: 2011-05-30 21:12+0200\n"
+"Last-Translator: Chris Leick <c.leick at vollbio.de>\n"
+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "SlapOS master node URL:"
+msgstr "URL des SlapOS-Masterknotens:"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "Master node key and certificate mandatory"
+msgstr "Pflichtschlüssel und -zertifikat des Masterknotens"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"You used an HTTPS URL for the SlapOS master node, so the corresponding "
+"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
+"etc/slapos/ssl/slapos.key, readable only to root."
+msgstr ""
+"Sie haben eine HTTPS-URL für den SlapOS-Masterknoten verwandt, daher muss "
+"das zugehörige Zertifikat in /etc/slapos/ssl/slapos.crt und der Schlüssel "
+"nur für Root lesbar in /etc/slapos/ssl/slapos.key platziert werden."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+#, fuzzy
+#| msgid "SlapOS client ID:"
+msgid "SlapOS computer ID:"
+msgstr "SlapOS-Client-ID:"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Please specify a unique identifier for this SlapOS node."
+msgstr ""
+"Bitte geben Sie einen eindeutigen Bezeichner für diesen SlapOS-Knoten an."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Number of Computer Partitions on this computer:"
+msgstr "Anzahl der »Computer Partitionen« auf diesem Rechner:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
+"now define how many instances will be available on this computer."
+msgstr ""
+"Eine »Computer Partition« (CP) ist eine Instanz eines »Software-"
+"Releases« (SR). Sie können nun festlegen, wie viele Instanzen auf diesem "
+"Rechner verfügbar sein werden."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
+"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
+msgstr ""
+"Beachten Sie, dass das »Software Release« in /var/lib/slapos/software/ "
+"gespeichert wird, während die »Computer-Partition« in /var/lib/slapos/"
+"instance/ gespeichert wird."
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Local IPv4 network to be used for Computer Partitions:"
+msgstr "Lokales IPv4-Netzwerk, das für »Computer Partitionen« benutzt wird:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid ""
+"Every Computer Partition must have an address on the same IPv4 network. "
+"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
+msgstr ""
+"Jede »Computer Partition« muss eine Adresse im gleichen IPv4-Netzwerk haben. "
+"Bitte geben Sie ein Netzwerk in CIDR-Notation an (z.B 192.0.2.0/24)."

Deleted: packages/slapos.core/tags/0.12-1/debian/po/fr.po
===================================================================
--- packages/slapos.core/trunk/debian/po/fr.po	2011-07-27 21:25:43 UTC (rev 7367)
+++ packages/slapos.core/tags/0.12-1/debian/po/fr.po	2011-07-29 10:09:56 UTC (rev 7378)
@@ -1,114 +0,0 @@
-# Translation of slapos.tool debconf templates to French.
-# Copyright (C) 2011 Debian French l10n team <debian-l10n-french at lists.debian.org>
-# This file is distributed under the same license as the slapos.tool package.
-# Julien Patriarca <patriarcaj at gmail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: slapos.tool\n"
-"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-07-01 11:13+0200\n"
-"PO-Revision-Date: 2011-06-13 13:27+0100\n"
-"Last-Translator: Julien Patriarca <patriarcaj at gmail.com>\n"
-"Language-Team: FRENCH <debian-l10n-french at lists.debian.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../templates:2001
-msgid "SlapOS master node URL:"
-msgstr "Adresse du nœud maître SlapOS :"
-
-#. Type: note
-#. Description
-#: ../templates:3001
-msgid "Master node key and certificate mandatory"
-msgstr "Clé et certificat obligatoires pour le nœud maître"
-
-#. Type: note
-#. Description
-#: ../templates:3001
-msgid ""
-"You used an HTTPS URL for the SlapOS master node, so the corresponding "
-"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
-"etc/slapos/ssl/slapos.key, readable only to root."
-msgstr ""
-"Une adresse HTTPS a été choisie pour le nœud maître de SlapOS. Dans ce cas, "
-"le certificat correspondant doit être mis dans /etc/slapos/ssl/slapos.crt, "
-"et la clé dans /etc/slapos/ssl/slapos.key uniquement lisible par le "
-"superutilisateur."
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid "SlapOS computer ID:"
-msgstr "Identifiant de la machine SlapOS :"
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid "Please specify a unique identifier for this SlapOS node."
-msgstr "Veuillez indiquer un identifiant unique pour ce nœud SlapOS."
-
-#. Type: string
-#. Description
-#: ../templates:5001
-msgid "Software Releases root directory:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:5001
-msgid ""
-"If you intend to use this package only for development, then /var/lib/slapos/"
-"software is a sensible choice, however, when using a master with network "
-"cache, it is highly recommended to use the same path on all the nodes, for "
-"example /opt/slapgrid."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "Number of Computer Partitions on this computer:"
-msgstr "Nombre de « Partitions Ordinateur » présentes sur cette machine :"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
-"now define how many instances will be available on this computer."
-msgstr ""
-"Une « Partition Ordinateur » (PO) est une instance correspondant à une "
-"« Version de Logiciel » (VL).  Vous pouvez désormais définir combien "
-"d'instances seront disponibles sur cet ordinateur."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
-"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
-msgstr ""
-"Veuillez noter que les « Versions de Logiciels » seront stockées dans /var/"
-"lib/slapos/software/, tandis que les « Partitions d'Ordinateur » seront "
-"stockées dans /var/lib/slapos/instance/."
-
-#. Type: string
-#. Description
-#: ../templates:7001
-msgid "Local IPv4 network to be used for Computer Partitions:"
-msgstr "Réseau IPV4 à utiliser pour les « Partitions d'Ordinateur » :"
-
-#. Type: string
-#. Description
-#: ../templates:7001
-msgid ""
-"Every Computer Partition must have an address on the same IPv4 network. "
-"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
-msgstr ""
-"Chaque « Partition d'Ordinateur » doit avoir une adresse sur le même réseau "
-"IPV4. Veuillez indiquer un réseau avec la notation CIDR (ex: 192.168.2.0/24)."

Copied: packages/slapos.core/tags/0.12-1/debian/po/fr.po (from rev 7375, packages/slapos.core/trunk/debian/po/fr.po)
===================================================================
--- packages/slapos.core/tags/0.12-1/debian/po/fr.po	                        (rev 0)
+++ packages/slapos.core/tags/0.12-1/debian/po/fr.po	2011-07-29 10:09:56 UTC (rev 7378)
@@ -0,0 +1,123 @@
+# Translation of slapos.tool debconf templates to French.
+# Copyright (C) 2011 Debian French l10n team <debian-l10n-french at lists.debian.org>
+# This file is distributed under the same license as the slapos.tool package.
+#
+# Julien Patriarca <patriarcaj at gmail.com>, 2011.
+# Christian Perrier <bubulle at debian.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: slapos.tool\n"
+"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
+"PO-Revision-Date: 2011-07-16 21:24+0200\n"
+"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "SlapOS master node URL:"
+msgstr "Adresse du nœud maître SlapOS :"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "Master node key and certificate mandatory"
+msgstr "Clé et certificat obligatoires pour le nœud maître"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"You used an HTTPS URL for the SlapOS master node, so the corresponding "
+"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
+"etc/slapos/ssl/slapos.key, readable only to root."
+msgstr ""
+"Une adresse HTTPS a été choisie pour le nœud maître de SlapOS. Dans ce cas, "
+"le certificat correspondant doit être mis dans /etc/slapos/ssl/slapos.crt, "
+"et la clé dans /etc/slapos/ssl/slapos.key uniquement lisible par le "
+"superutilisateur."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "SlapOS computer ID:"
+msgstr "Identifiant de la machine SlapOS :"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Please specify a unique identifier for this SlapOS node."
+msgstr "Veuillez indiquer un identifiant unique pour ce nœud SlapOS."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr "Répertoire racine des publications de logiciels :"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+"Si ce paquet n'est utilisé qu'en développement, le répertoire  "
+"/var/lib/slapos/"
+"software est un choix adapté. Cependant, si un serveur maître est utilisé "
+"avec un cache réseau, il est fortement recommandé d'utiliser le même chemin "
+"sur tous les noeuds, par exemple /opt/slapgri."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Number of Computer Partitions on this computer:"
+msgstr "Nombre de « Partitions Ordinateur » présentes sur cette machine :"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
+"now define how many instances will be available on this computer."
+msgstr ""
+"Une « Partition Ordinateur » (PO) est une instance correspondant à une "
+"« Version de Logiciel » (VL).  Vous pouvez désormais définir combien "
+"d'instances seront disponibles sur cet ordinateur."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
+"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
+msgstr ""
+"Veuillez noter que les « Versions de Logiciels » seront stockées dans /var/"
+"lib/slapos/software/, tandis que les « Partitions d'Ordinateur » seront "
+"stockées dans /var/lib/slapos/instance/."
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Local IPv4 network to be used for Computer Partitions:"
+msgstr "Réseau IPV4 à utiliser pour les « Partitions d'Ordinateur » :"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid ""
+"Every Computer Partition must have an address on the same IPv4 network. "
+"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
+msgstr ""
+"Chaque « Partition d'Ordinateur » doit avoir une adresse sur le même réseau "
+"IPV4. Veuillez indiquer un réseau avec la notation CIDR (ex: 192.168.2.0/24)."
+

Deleted: packages/slapos.core/tags/0.12-1/debian/po/ru.po
===================================================================
--- packages/slapos.core/trunk/debian/po/ru.po	2011-07-27 21:25:43 UTC (rev 7367)
+++ packages/slapos.core/tags/0.12-1/debian/po/ru.po	2011-07-29 10:09:56 UTC (rev 7378)
@@ -1,113 +0,0 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the slapos.tool.format package.
-#
-# Yuri Kozlov <yuray at komyakino.ru>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: slapos.tool.format new\n"
-"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-07-01 11:13+0200\n"
-"PO-Revision-Date: 2011-06-14 20:03+0400\n"
-"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
-"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\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
-#: ../templates:2001
-msgid "SlapOS master node URL:"
-msgstr "URL главного узла SlapOS:"
-
-#. Type: note
-#. Description
-#: ../templates:3001
-msgid "Master node key and certificate mandatory"
-msgstr "Сертификат и ключ главного узла"
-
-#. Type: note
-#. Description
-#: ../templates:3001
-msgid ""
-"You used an HTTPS URL for the SlapOS master node, so the corresponding "
-"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
-"etc/slapos/ssl/slapos.key, readable only to root."
-msgstr ""
-"Для доступа к главному узлу SlapOS используется HTTPS URL, поэтому в /etc/"
-"slapos/ssl/slapos.crt должен быть соответствующий сертификат, а в /etc/"
-"slapos/ssl/slapos.key — ключ (доступны только root)."
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid "SlapOS computer ID:"
-msgstr "Идентификатор компьютера SlapOS:"
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid "Please specify a unique identifier for this SlapOS node."
-msgstr "Введите уникальный идентификатор этого узла SlapOS."
-
-#. Type: string
-#. Description
-#: ../templates:5001
-msgid "Software Releases root directory:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:5001
-msgid ""
-"If you intend to use this package only for development, then /var/lib/slapos/"
-"software is a sensible choice, however, when using a master with network "
-"cache, it is highly recommended to use the same path on all the nodes, for "
-"example /opt/slapgrid."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "Number of Computer Partitions on this computer:"
-msgstr "Количество Computer Partition на этом компьютере:"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
-"now define how many instances will be available on this computer."
-msgstr ""
-"Computer Partition (CP) — это экземпляр Software Release (SR). Сейчас вы "
-"можете указать сколько экземпляров будет доступно на этом компьютере."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
-"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
-msgstr ""
-"Заметим, что Software Release будут храниться в /var/lib/slapos/software/, а "
-"Computer Partition будет храниться в /var/lib/slapos/instance/."
-
-#. Type: string
-#. Description
-#: ../templates:7001
-msgid "Local IPv4 network to be used for Computer Partitions:"
-msgstr "Локальная сеть IPv4, которая будет использована на Computer Partition:"
-
-#. Type: string
-#. Description
-#: ../templates:7001
-msgid ""
-"Every Computer Partition must have an address on the same IPv4 network. "
-"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
-msgstr ""
-"Все Computer Partition должны иметь адреса из одной сети IPv4. Укажите адрес "
-"сети в формате CIDR (например: 192.0.2.0/24)."

Copied: packages/slapos.core/tags/0.12-1/debian/po/ru.po (from rev 7375, packages/slapos.core/trunk/debian/po/ru.po)
===================================================================
--- packages/slapos.core/tags/0.12-1/debian/po/ru.po	                        (rev 0)
+++ packages/slapos.core/tags/0.12-1/debian/po/ru.po	2011-07-29 10:09:56 UTC (rev 7378)
@@ -0,0 +1,118 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the slapos.core package.
+#
+# Yuri Kozlov <yuray at komyakino.ru>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: slapos.core 0.8+20110708+1.git5c55e0e-1\n"
+"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
+"PO-Revision-Date: 2011-07-23 07:33+0400\n"
+"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\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
+#: ../templates:2001
+msgid "SlapOS master node URL:"
+msgstr "URL главного узла SlapOS:"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "Master node key and certificate mandatory"
+msgstr "Сертификат и ключ главного узла"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"You used an HTTPS URL for the SlapOS master node, so the corresponding "
+"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
+"etc/slapos/ssl/slapos.key, readable only to root."
+msgstr ""
+"Для доступа к главному узлу SlapOS используется HTTPS URL, поэтому в /etc/"
+"slapos/ssl/slapos.crt должен быть соответствующий сертификат, а в /etc/"
+"slapos/ssl/slapos.key — ключ (доступны только root)."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "SlapOS computer ID:"
+msgstr "Идентификатор компьютера SlapOS:"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Please specify a unique identifier for this SlapOS node."
+msgstr "Введите уникальный идентификатор этого узла SlapOS."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr "Корневой каталог версий ПО:"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+"Если вы хотите использовать этот пакет только для разработки, то "
+"подходящим значением для ПО будет /var/lib/slapos/, однако при "
+"использовании главного узла с сетевым кэшем рекомендуется "
+"использовать одинаковый путь на всех узлах, например /opt/slapgrid."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Number of Computer Partitions on this computer:"
+msgstr "Количество Computer Partition на этом компьютере:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
+"now define how many instances will be available on this computer."
+msgstr ""
+"Computer Partition (CP) — это экземпляр Software Release (SR). Сейчас вы "
+"можете указать сколько экземпляров будет доступно на этом компьютере."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
+"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
+msgstr ""
+"Заметим, что Software Release будут храниться в /var/lib/slapos/software/, а "
+"Computer Partition будет храниться в /var/lib/slapos/instance/."
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Local IPv4 network to be used for Computer Partitions:"
+msgstr "Локальная сеть IPv4, которая будет использована на Computer Partition:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid ""
+"Every Computer Partition must have an address on the same IPv4 network. "
+"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
+msgstr ""
+"Все Computer Partition должны иметь адреса из одной сети IPv4. Укажите адрес "
+"сети в формате CIDR (например: 192.0.2.0/24)."
+

Deleted: packages/slapos.core/tags/0.12-1/debian/rules
===================================================================
--- packages/slapos.core/trunk/debian/rules	2011-07-27 21:25:43 UTC (rev 7367)
+++ packages/slapos.core/tags/0.12-1/debian/rules	2011-07-29 10:09:56 UTC (rev 7378)
@@ -1,40 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@ --with python2
-
-override_dh_auto_install:
-	python2.6 setup.py install --root=debian/slapos-client --install-layout=deb \
-		--install-scripts=/usr/sbin/
-
-	# Only slapconsole script is not supposed to be ran by root
-	mv debian/slapos-client/usr/sbin/slapconsole debian/slapos-client/usr/bin/
-
-# Generate the upstream tarball from upstream Git (adapted from
-# http://wiki.debian.org/SandroTosi/Svn_get-orig-source for Git)
-PACKAGE := $(shell dpkg-parsechangelog  | \
-	sed -ne 's/^Source: \([a-z.]*\).*/\1/p')
-
-SRC_VERSION := $(shell dpkg-parsechangelog | \
-	sed -ne 's/^Version: \([^-]\+\)-.*/\1/p')
-
-GIT_VERSION := $(shell echo $(SRC_VERSION) | \
-	sed -ne 's/.*git\([a-z0-9]\+\)/\1/p')
-
-TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
-
-get-orig-source:
-	rm -rf get-orig-source $(TARBALL)
-
-	git clone http://git.erp5.org/repos/slapos.core.git \
-		get-orig-source/
-
-	cd get-orig-source/ && \
-		git archive --prefix=$(PACKAGE)-$(SRC_VERSION).orig/ \
-			--format=tar $(GIT_VERSION) `/bin/ls | grep -v master` | \
-			gzip --no-name --best > ../../$(TARBALL)
-
-	rm -rf get-orig-source
-	@echo "'$(TARBALL)' created."
-
-.PHONY: get-orig-source

Copied: packages/slapos.core/tags/0.12-1/debian/rules (from rev 7376, packages/slapos.core/trunk/debian/rules)
===================================================================
--- packages/slapos.core/tags/0.12-1/debian/rules	                        (rev 0)
+++ packages/slapos.core/tags/0.12-1/debian/rules	2011-07-29 10:09:56 UTC (rev 7378)
@@ -0,0 +1,45 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with python2
+
+override_dh_auto_install:
+	python2.6 setup.py install --root=debian/slapos-client --install-layout=deb \
+		--install-scripts=/usr/sbin/
+
+	# Only slapconsole script is not supposed to be ran by root
+	mv debian/slapos-client/usr/sbin/slapconsole debian/slapos-client/usr/bin/
+
+# Generate the upstream tarball from upstream Git (adapted from
+# http://wiki.debian.org/SandroTosi/Svn_get-orig-source for Git)
+PACKAGE := $(shell dpkg-parsechangelog  | \
+	sed -ne 's/^Source: \([a-z.]*\).*/\1/p')
+
+SRC_VERSION := $(shell dpkg-parsechangelog | \
+	sed -ne 's/^Version: \([^-]\+\)-.*/\1/p')
+
+ifdef $(findstring 'git', $(SRC_VERSION))
+GIT_VERSION := $(shell echo $(SRC_VERSION) | \
+	sed -ne 's/.*git\([a-z0-9]\+\)/\1/p')
+else
+GIT_VERSION := $(shell echo $(SRC_VERSION) | \
+	sed -ne 's/\([0-9]\+:\)\?\([0-9.]\+\)/\2/p')
+endif
+
+TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+
+get-orig-source:
+	rm -rf get-orig-source $(TARBALL)
+
+	git clone http://git.erp5.org/repos/slapos.core.git \
+		get-orig-source/
+
+	cd get-orig-source/ && \
+		git archive --prefix=$(PACKAGE)-$(SRC_VERSION).orig/ \
+			--format=tar $(GIT_VERSION) `/bin/ls | grep -v master` | \
+			gzip --no-name --best > ../../$(TARBALL)
+
+	rm -rf get-orig-source
+	@echo "'$(TARBALL)' created."
+
+.PHONY: get-orig-source




More information about the Python-apps-commits mailing list