[Python-apps-commits] r9686 - in packages/slapos.core/tags (19 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Tue May 28 02:53:23 UTC 2013
Date: Tuesday, May 28, 2013 @ 02:53:22
Author: arnau
Revision: 9686
[svn-buildpackage] Tagging slapos.core 0.35.1-4
Added:
packages/slapos.core/tags/0.35.1-4/
packages/slapos.core/tags/0.35.1-4/debian/changelog
(from rev 9685, packages/slapos.core/trunk/debian/changelog)
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.dirs
(from rev 9685, packages/slapos.core/trunk/debian/slapos-client.dirs)
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.install
(from rev 9685, packages/slapos.core/trunk/debian/slapos-client.install)
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.links
(from rev 9685, packages/slapos.core/trunk/debian/slapos-client.links)
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.postinst
(from rev 9685, packages/slapos.core/trunk/debian/slapos-client.postinst)
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.dirs
(from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs)
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.install
(from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.install)
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.links
(from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.links)
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.postinst
(from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.postinst)
Deleted:
packages/slapos.core/tags/0.35.1-4/debian/changelog
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.dirs
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.examples
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.install
packages/slapos.core/tags/0.35.1-4/debian/slapos-client.postinst
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.dirs
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.examples
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.install
packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.postinst
Deleted: packages/slapos.core/tags/0.35.1-4/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/changelog 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1,207 +0,0 @@
-slapos.core (0.35.1-4) UNRELEASED; urgency=low
-
- [ Arnaud Fontaine ]
- * debian/patches/slapos_command_split_up.patch:
- + Fix string formatting error introduced by this patch.
-
- [ Jakub Wilk ]
- * Use canonical URIs for Vcs-* fields.
-
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 18:05:47 +0200
-
-slapos.core (0.35.1-3) unstable; urgency=low
-
- * debian/control, debian/pydist-overrides,
- debian/patches/do_not_use_debian_zc.buildout.patch:
- + Use Debian buildout, otherwise SR fails to build because at
- bootstrap, official zc.buildout is installed and later conflict with
- SlapOS patched zc.buildout as they are both in eggs directory.
-
- -- Arnaud Fontaine <arnau at debian.org> Wed, 27 Mar 2013 13:23:19 +0900
-
-slapos.core (0.35.1-2) unstable; urgency=low
-
- * debian/patches/fix_tests_install_requires.patch, debian/pydist-overrides:
- + Python modules required only for tests should not be in
- install_requires, but in tests_require.
-
- -- Arnaud Fontaine <arnau at debian.org> Mon, 04 Mar 2013 19:06:25 +0900
-
-slapos.core (0.35.1-1) unstable; urgency=low
-
- * New upstream release.
- + Refresh debian/patches/*.
- + debian/slapos-client.install: add new files.
- + debian/slapos-node-unofficial.install: new slapproxy-query command.
-
- -- Arnaud Fontaine <arnau at debian.org> Thu, 28 Feb 2013 19:25:16 +0900
-
-slapos.core (0.34-1) unstable; urgency=low
-
- * New upstream release.
- + debian/slapos-client.install: new "cache" command.
- + debian/pydist-overrides, debian/control:
- - Do not add pyflakes and unittest2 to Depends (required for
- tests only), rather add them to Suggests.
- + A new command was introduced, slapos, which allows one to specify
- node subcommands, but this should only be available if
- slapos-node-unofficial package is installed.
- - Add debian/patches/slapos_command_split_up.patch.
- - debian/slapos-client.install: add "entry" file.
- + debian/patches/system_configuration_file_by_default.patch: Update.
- + Add debian/patches/do_not_use_debian_zc.buildout.patch:
- - zc.buildout seems to have been wrongly re-introduced as a dependency.
- + debian/slapos-node-unofficial.docs:
- - Add README.proxy.txt not empty anymore.
- + Refresh debian/conf/slapos*.cfg.
- * Use ucf to manage /etc/slapos/*.cfg configuration files.
- * debian/control:
- + slapos-node-unofficial must depend on the current version of
- slapos-client, otherwise pkg_resources fails when checking version.
- + Bump Standards-Version to 3.9.4. No changes needed.
- * debian/slapos-node-unofficial.cron.d:
- + Specify ``--logfile'' and ``--pidfile'' for slapgrid commands.
- * debian/conf/slapos-node-unofficial.cfg:
- + Enable shacache for building Software Releases.
- * debian/rules:
- + Prevent *.cfg example files to be compressed as they are used as
- templates during installation.
-
- -- Arnaud Fontaine <arnau at debian.org> Thu, 07 Feb 2013 11:58:44 +0900
-
-slapos.core (0.25-2) unstable; urgency=low
-
- * debian/po/pt.po:
- + Update translation. Thanks to Rui Pedro. Closes: #674741.
- * debian/*.postinst:
- + Fix package name in configuration file generated with debconf.
-
- -- Arnaud Fontaine <arnau at debian.org> Thu, 31 May 2012 14:24:57 +0900
-
-slapos.core (0.25-1) unstable; urgency=low
-
- [ Arnaud Fontaine ]
- * New upstream release.
- + Update debian/patches/system_configuration_file_by_default.patch.
- * Split node part of slapos-client (now only contains slap library and
- slapconsole) into slapos-node-unofficial.
- + Add debian/slapos-client.NEWS.Debian.
- + Add Replaces and Conflicts against slapos-client before this version
- on slapos-node-unofficial.
- + Move debian/README.Debian to slapos-node-unofficial package.
- + Split configuration into two configuration files but synchronize
- master_url, cert_file and key_file configuration options between both
- files and define them as shared debconf templates.
- - Update debian/patches/system_configuration_file_by_default.patch.
- * Do not delete slapos-core.egg-info as data files not specified in
- setup.py will not be installed upon second build, thus replace
- debian/clean by debian/source/options to ignore that directories.
- * Bump Standards-Version to 3.9.3.
- + Update Format URL as DEP5 has been accepted.
- * debian/copyright:
- + Fix Zope license name in debian/copyright and fix GPL-3 to GPL-3+.
- * debian/control:
- + Fix typo on SaaS acronym in Descriptions.
- + Add libtool, autoconf and automake to Recommends of
- slapos-node-unofficial as they are commonly needed.
- * debian/rules: fix creation of snapshot upstream tarball.
- * debian/conf/slapos-node-unofficial.cfg:
- + Fix typo in supervisord_socket option.
- + Add log_file option to slapproxy section.
-
- [ Christian Perrier ]
- * Fix pending l10n issues. Debconf translations:
- + Danish (Joe Hansen). Closes: #650951
- + Spanish; (Javier Fernández-Sanguino). Closes: #656397
- + Polish (Michał Kułach). Closes: #667950
- + Italian (Beatrice Torracca). Closes: #668628
- + Czech (Michal Simunek). Closes: #668632
-
- -- Arnaud Fontaine <arnau at debian.org> Sat, 19 May 2012 16:49:01 +0900
-
-slapos.core (0.12-2) unstable; urgency=low
-
- * debian/control:
- + Use python2.7 instead (as supervisor is now working fine with
- python2.7) and Build-Depends explicitly on >= 2.7.2-2~ because of a
- bug when generating Depends in previous versions. Closes: #643999.
- - Drop debian/patches/fix_python26_missing_initgroups.patch.
- * debian/po:
- + Update German translation. Thanks to Chris Leick. Closes: #642137.
- + Update Swedish translation. Thanks to Martin Bagge. Closes: #640047.
- + Update Dutch translation. Thanks to Jeroen Schot. Closes: #638981.
- * debian/copyright:
- + Fix DEP5 syntax error (missing dots to separate paragraphs).
- + Add standalone License paragraph as GPL-3 is referenced multiple times.
-
- -- Arnaud Fontaine <arnau at debian.org> Wed, 05 Oct 2011 14:07:41 +0900
-
-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
Copied: packages/slapos.core/tags/0.35.1-4/debian/changelog (from rev 9685, packages/slapos.core/trunk/debian/changelog)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/changelog (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/changelog 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1,211 @@
+slapos.core (0.35.1-4) unstable; urgency=low
+
+ [ Arnaud Fontaine ]
+ * Move configuration files used by debconf from
+ /usr/share/doc/<package>/examples to /usr/share/<package> as the
+ former is a policy violation (12.3) and link them in
+ /usr/share/doc/examples instead. Closes: #710067.
+ * debian/patches/slapos_command_split_up.patch:
+ + Fix string formatting error introduced by this patch.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Arnaud Fontaine <arnau at debian.org> Tue, 28 May 2013 11:31:24 +0900
+
+slapos.core (0.35.1-3) unstable; urgency=low
+
+ * debian/control, debian/pydist-overrides,
+ debian/patches/do_not_use_debian_zc.buildout.patch:
+ + Use Debian buildout, otherwise SR fails to build because at
+ bootstrap, official zc.buildout is installed and later conflict with
+ SlapOS patched zc.buildout as they are both in eggs directory.
+
+ -- Arnaud Fontaine <arnau at debian.org> Wed, 27 Mar 2013 13:23:19 +0900
+
+slapos.core (0.35.1-2) unstable; urgency=low
+
+ * debian/patches/fix_tests_install_requires.patch, debian/pydist-overrides:
+ + Python modules required only for tests should not be in
+ install_requires, but in tests_require.
+
+ -- Arnaud Fontaine <arnau at debian.org> Mon, 04 Mar 2013 19:06:25 +0900
+
+slapos.core (0.35.1-1) unstable; urgency=low
+
+ * New upstream release.
+ + Refresh debian/patches/*.
+ + debian/slapos-client.install: add new files.
+ + debian/slapos-node-unofficial.install: new slapproxy-query command.
+
+ -- Arnaud Fontaine <arnau at debian.org> Thu, 28 Feb 2013 19:25:16 +0900
+
+slapos.core (0.34-1) unstable; urgency=low
+
+ * New upstream release.
+ + debian/slapos-client.install: new "cache" command.
+ + debian/pydist-overrides, debian/control:
+ - Do not add pyflakes and unittest2 to Depends (required for
+ tests only), rather add them to Suggests.
+ + A new command was introduced, slapos, which allows one to specify
+ node subcommands, but this should only be available if
+ slapos-node-unofficial package is installed.
+ - Add debian/patches/slapos_command_split_up.patch.
+ - debian/slapos-client.install: add "entry" file.
+ + debian/patches/system_configuration_file_by_default.patch: Update.
+ + Add debian/patches/do_not_use_debian_zc.buildout.patch:
+ - zc.buildout seems to have been wrongly re-introduced as a dependency.
+ + debian/slapos-node-unofficial.docs:
+ - Add README.proxy.txt not empty anymore.
+ + Refresh debian/conf/slapos*.cfg.
+ * Use ucf to manage /etc/slapos/*.cfg configuration files.
+ * debian/control:
+ + slapos-node-unofficial must depend on the current version of
+ slapos-client, otherwise pkg_resources fails when checking version.
+ + Bump Standards-Version to 3.9.4. No changes needed.
+ * debian/slapos-node-unofficial.cron.d:
+ + Specify ``--logfile'' and ``--pidfile'' for slapgrid commands.
+ * debian/conf/slapos-node-unofficial.cfg:
+ + Enable shacache for building Software Releases.
+ * debian/rules:
+ + Prevent *.cfg example files to be compressed as they are used as
+ templates during installation.
+
+ -- Arnaud Fontaine <arnau at debian.org> Thu, 07 Feb 2013 11:58:44 +0900
+
+slapos.core (0.25-2) unstable; urgency=low
+
+ * debian/po/pt.po:
+ + Update translation. Thanks to Rui Pedro. Closes: #674741.
+ * debian/*.postinst:
+ + Fix package name in configuration file generated with debconf.
+
+ -- Arnaud Fontaine <arnau at debian.org> Thu, 31 May 2012 14:24:57 +0900
+
+slapos.core (0.25-1) unstable; urgency=low
+
+ [ Arnaud Fontaine ]
+ * New upstream release.
+ + Update debian/patches/system_configuration_file_by_default.patch.
+ * Split node part of slapos-client (now only contains slap library and
+ slapconsole) into slapos-node-unofficial.
+ + Add debian/slapos-client.NEWS.Debian.
+ + Add Replaces and Conflicts against slapos-client before this version
+ on slapos-node-unofficial.
+ + Move debian/README.Debian to slapos-node-unofficial package.
+ + Split configuration into two configuration files but synchronize
+ master_url, cert_file and key_file configuration options between both
+ files and define them as shared debconf templates.
+ - Update debian/patches/system_configuration_file_by_default.patch.
+ * Do not delete slapos-core.egg-info as data files not specified in
+ setup.py will not be installed upon second build, thus replace
+ debian/clean by debian/source/options to ignore that directories.
+ * Bump Standards-Version to 3.9.3.
+ + Update Format URL as DEP5 has been accepted.
+ * debian/copyright:
+ + Fix Zope license name in debian/copyright and fix GPL-3 to GPL-3+.
+ * debian/control:
+ + Fix typo on SaaS acronym in Descriptions.
+ + Add libtool, autoconf and automake to Recommends of
+ slapos-node-unofficial as they are commonly needed.
+ * debian/rules: fix creation of snapshot upstream tarball.
+ * debian/conf/slapos-node-unofficial.cfg:
+ + Fix typo in supervisord_socket option.
+ + Add log_file option to slapproxy section.
+
+ [ Christian Perrier ]
+ * Fix pending l10n issues. Debconf translations:
+ + Danish (Joe Hansen). Closes: #650951
+ + Spanish; (Javier Fernández-Sanguino). Closes: #656397
+ + Polish (Michał Kułach). Closes: #667950
+ + Italian (Beatrice Torracca). Closes: #668628
+ + Czech (Michal Simunek). Closes: #668632
+
+ -- Arnaud Fontaine <arnau at debian.org> Sat, 19 May 2012 16:49:01 +0900
+
+slapos.core (0.12-2) unstable; urgency=low
+
+ * debian/control:
+ + Use python2.7 instead (as supervisor is now working fine with
+ python2.7) and Build-Depends explicitly on >= 2.7.2-2~ because of a
+ bug when generating Depends in previous versions. Closes: #643999.
+ - Drop debian/patches/fix_python26_missing_initgroups.patch.
+ * debian/po:
+ + Update German translation. Thanks to Chris Leick. Closes: #642137.
+ + Update Swedish translation. Thanks to Martin Bagge. Closes: #640047.
+ + Update Dutch translation. Thanks to Jeroen Schot. Closes: #638981.
+ * debian/copyright:
+ + Fix DEP5 syntax error (missing dots to separate paragraphs).
+ + Add standalone License paragraph as GPL-3 is referenced multiple times.
+
+ -- Arnaud Fontaine <arnau at debian.org> Wed, 05 Oct 2011 14:07:41 +0900
+
+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.35.1-4/debian/slapos-client.dirs
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.dirs 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.dirs 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1,3 +0,0 @@
-etc/slapos/
-etc/slapos/ssl/
-usr/bin/
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-client.dirs (from rev 9685, packages/slapos.core/trunk/debian/slapos-client.dirs)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-client.dirs (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.dirs 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1,5 @@
+etc/slapos/
+etc/slapos/ssl/
+usr/bin/
+usr/share/slapos-client
+usr/share/doc/slapos-client/examples
Deleted: packages/slapos.core/tags/0.35.1-4/debian/slapos-client.examples
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.examples 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.examples 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1 +0,0 @@
-debian/conf/slapos-client.cfg
Deleted: packages/slapos.core/tags/0.35.1-4/debian/slapos-client.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.install 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.install 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1,14 +0,0 @@
-usr/lib/python2.*/dist-packages/slapos.core*.egg-info/
-usr/lib/python2.*/dist-packages/slapos/entry.py
-usr/lib/python2.*/dist-packages/slapos/client.py
-usr/lib/python2.*/dist-packages/slapos/util.py
-usr/lib/python2.*/dist-packages/slapos/version.py
-usr/lib/python2.*/dist-packages/slapos/cache.py
-usr/lib/python2.*/dist-packages/slapos/slapos.xsd
-usr/lib/python2.*/dist-packages/slapos/slap/
-usr/lib/python2.*/dist-packages/slapos/tests/__init__.py
-usr/lib/python2.*/dist-packages/slapos/tests/slap.py
-usr/lib/python2.*/dist-packages/slapos/tests/interface.py
-usr/lib/python2.*/dist-packages/slapos.core-*-nspkg.pth
-usr/bin/slapconsole
-usr/bin/slapos
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-client.install (from rev 9685, packages/slapos.core/trunk/debian/slapos-client.install)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-client.install (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.install 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1,15 @@
+usr/lib/python2.*/dist-packages/slapos.core*.egg-info/
+usr/lib/python2.*/dist-packages/slapos/entry.py
+usr/lib/python2.*/dist-packages/slapos/client.py
+usr/lib/python2.*/dist-packages/slapos/util.py
+usr/lib/python2.*/dist-packages/slapos/version.py
+usr/lib/python2.*/dist-packages/slapos/cache.py
+usr/lib/python2.*/dist-packages/slapos/slapos.xsd
+usr/lib/python2.*/dist-packages/slapos/slap/
+usr/lib/python2.*/dist-packages/slapos/tests/__init__.py
+usr/lib/python2.*/dist-packages/slapos/tests/slap.py
+usr/lib/python2.*/dist-packages/slapos/tests/interface.py
+usr/lib/python2.*/dist-packages/slapos.core-*-nspkg.pth
+usr/bin/slapconsole
+usr/bin/slapos
+debian/conf/slapos-client.cfg usr/share/slapos-client
\ No newline at end of file
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-client.links (from rev 9685, packages/slapos.core/trunk/debian/slapos-client.links)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-client.links (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.links 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1 @@
+usr/share/slapos-client/slapos-client.cfg usr/share/doc/slapos-client/examples/slapos-client.cfg
Deleted: packages/slapos.core/tags/0.35.1-4/debian/slapos-client.postinst
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.postinst 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.postinst 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1,46 +0,0 @@
-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-. /usr/share/debconf/confmodule
-
-# First, create a temporary configuration file before letting ucf handles the
-# changes between the existing file (if any) and the new version
-TEMP_CONFIG_FILE=`mktemp --tmpdir=/tmp slapos-client.cfg.XXXXXX.cfg`
-chmod 0644 $TEMP_CONFIG_FILE
-
-echo "# Never edit this file by hand as it has been automatically generated by
-# debconf. You can change the settings at any time by running:
-# ``dpkg-reconfigure -pmedium slapos-client''" > $TEMP_CONFIG_FILE
-
-cat < /usr/share/doc/slapos-client/examples/slapos-client.cfg >> $TEMP_CONFIG_FILE
-
-# Synchronize master_url, key_file and cert_file with slapos-client.cfg
-SLAPOS_NODE_CONFIG_FILE=/etc/slapos/slapos-node-unofficial.cfg
-if [ ! -f $SLAPOS_NODE_CONFIG_FILE ]; then
- SLAPOS_NODE_CONFIG_FILE=
-fi
-
-db_get shared/slapos/master_url
-MASTER_URL="$RET"
-WITH_HTTPS=$(echo "$MASTER_URL" | grep -q "^https://" && echo true || echo false)
-
-sed -e "s#^\s*master_url\s*=.*#master_url = $MASTER_URL#" \
- -i $TEMP_CONFIG_FILE $SLAPOS_NODE_CONFIG_FILE
-
-# Handle HTTPS URLs by just commenting/uncommenting the relevant lines
-if $WITH_HTTPS; then
- sed -i 's/^\s*#\+\s*\(key_file\|cert_file\)/\1/' \
- $TEMP_CONFIG_FILE $SLAPOS_NODE_CONFIG_FILE
-else
- sed -i 's/^\s*[^#]*\s*\(key_file\|cert_file\)/#\1/' \
- $TEMP_CONFIG_FILE $SLAPOS_NODE_CONFIG_FILE
-fi
-
-ucf --three-way --debconf-ok $TEMP_CONFIG_FILE /etc/slapos/slapos-client.cfg
-db_go
-
-rm -f $TEMP_CONFIG_FILE
-
-exit 0
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-client.postinst (from rev 9685, packages/slapos.core/trunk/debian/slapos-client.postinst)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-client.postinst (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-client.postinst 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1,46 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+. /usr/share/debconf/confmodule
+
+# First, create a temporary configuration file before letting ucf handles the
+# changes between the existing file (if any) and the new version
+TEMP_CONFIG_FILE=`mktemp --tmpdir=/tmp slapos-client.cfg.XXXXXX.cfg`
+chmod 0644 $TEMP_CONFIG_FILE
+
+echo "# Never edit this file by hand as it has been automatically generated by
+# debconf. You can change the settings at any time by running:
+# ``dpkg-reconfigure -pmedium slapos-client''" > $TEMP_CONFIG_FILE
+
+cat < /usr/share/slapos-client/slapos-client.cfg >> $TEMP_CONFIG_FILE
+
+# Synchronize master_url, key_file and cert_file with slapos-client.cfg
+SLAPOS_NODE_CONFIG_FILE=/etc/slapos/slapos-node-unofficial.cfg
+if [ ! -f $SLAPOS_NODE_CONFIG_FILE ]; then
+ SLAPOS_NODE_CONFIG_FILE=
+fi
+
+db_get shared/slapos/master_url
+MASTER_URL="$RET"
+WITH_HTTPS=$(echo "$MASTER_URL" | grep -q "^https://" && echo true || echo false)
+
+sed -e "s#^\s*master_url\s*=.*#master_url = $MASTER_URL#" \
+ -i $TEMP_CONFIG_FILE $SLAPOS_NODE_CONFIG_FILE
+
+# Handle HTTPS URLs by just commenting/uncommenting the relevant lines
+if $WITH_HTTPS; then
+ sed -i 's/^\s*#\+\s*\(key_file\|cert_file\)/\1/' \
+ $TEMP_CONFIG_FILE $SLAPOS_NODE_CONFIG_FILE
+else
+ sed -i 's/^\s*[^#]*\s*\(key_file\|cert_file\)/#\1/' \
+ $TEMP_CONFIG_FILE $SLAPOS_NODE_CONFIG_FILE
+fi
+
+ucf --three-way --debconf-ok $TEMP_CONFIG_FILE /etc/slapos/slapos-client.cfg
+db_go
+
+rm -f $TEMP_CONFIG_FILE
+
+exit 0
Deleted: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.dirs
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.dirs 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1,4 +0,0 @@
-var/log/slapos/
-var/lib/slapos/instance/
-var/cache/slapos/certificates/
-usr/sbin/
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.dirs (from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.dirs (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.dirs 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1,6 @@
+var/log/slapos/
+var/lib/slapos/instance/
+var/cache/slapos/certificates/
+usr/sbin/
+usr/share/slapos-node-unofficial
+usr/share/doc/slapos-node-unofficial/examples
Deleted: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.examples
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.examples 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.examples 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1 +0,0 @@
-debian/conf/slapos-node-unofficial.cfg
Deleted: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.install 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1,23 +0,0 @@
-usr/lib/python2.*/dist-packages/slapos/register
-usr/lib/python2.*/dist-packages/slapos/proxy
-usr/lib/python2.*/dist-packages/slapos/bang.py
-usr/lib/python2.*/dist-packages/slapos/tests/entry.py
-usr/lib/python2.*/dist-packages/slapos/tests/slapgrid.py
-usr/lib/python2.*/dist-packages/slapos/tests/mock
-usr/lib/python2.*/dist-packages/slapos/tests/pyflakes
-usr/lib/python2.*/dist-packages/slapos/tests/slapobject.py
-usr/lib/python2.*/dist-packages/slapos/tests/slapproxy.py
-usr/lib/python2.*/dist-packages/slapos/tests/slapformat.py
-usr/lib/python2.*/dist-packages/slapos/format.py
-usr/lib/python2.*/dist-packages/slapos/grid
-usr/bin/slapos-watchdog usr/sbin
-usr/bin/slapformat usr/sbin
-usr/bin/slapgrid-supervisorctl usr/sbin
-usr/bin/slapgrid-supervisord usr/sbin
-usr/bin/slapproxy usr/sbin
-usr/bin/slapproxy-query usr/bin
-usr/bin/slapgrid-sr usr/sbin
-usr/bin/bang usr/sbin
-usr/bin/slapgrid usr/sbin
-usr/bin/slapgrid-ur usr/sbin
-usr/bin/slapgrid-cp usr/sbin
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.install (from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.install)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.install (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.install 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1,24 @@
+usr/lib/python2.*/dist-packages/slapos/register
+usr/lib/python2.*/dist-packages/slapos/proxy
+usr/lib/python2.*/dist-packages/slapos/bang.py
+usr/lib/python2.*/dist-packages/slapos/tests/entry.py
+usr/lib/python2.*/dist-packages/slapos/tests/slapgrid.py
+usr/lib/python2.*/dist-packages/slapos/tests/mock
+usr/lib/python2.*/dist-packages/slapos/tests/pyflakes
+usr/lib/python2.*/dist-packages/slapos/tests/slapobject.py
+usr/lib/python2.*/dist-packages/slapos/tests/slapproxy.py
+usr/lib/python2.*/dist-packages/slapos/tests/slapformat.py
+usr/lib/python2.*/dist-packages/slapos/format.py
+usr/lib/python2.*/dist-packages/slapos/grid
+usr/bin/slapos-watchdog usr/sbin
+usr/bin/slapformat usr/sbin
+usr/bin/slapgrid-supervisorctl usr/sbin
+usr/bin/slapgrid-supervisord usr/sbin
+usr/bin/slapproxy usr/sbin
+usr/bin/slapproxy-query usr/bin
+usr/bin/slapgrid-sr usr/sbin
+usr/bin/bang usr/sbin
+usr/bin/slapgrid usr/sbin
+usr/bin/slapgrid-ur usr/sbin
+usr/bin/slapgrid-cp usr/sbin
+debian/conf/slapos-node-unofficial.cfg usr/share/slapos-node-unofficial
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.links (from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.links)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.links (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.links 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1 @@
+usr/share/slapos-node-unofficial/slapos-node-unofficial.cfg usr/share/doc/slapos-node-unofficial/examples/slapos-node-unofficial.cfg
Deleted: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.postinst
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.postinst 2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.postinst 2013-05-28 02:53:22 UTC (rev 9686)
@@ -1,67 +0,0 @@
-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-. /usr/share/debconf/confmodule
-
-# First, create a temporary configuration file before letting ucf handles the
-# changes between the existing file (if any) and the new version
-TEMP_CONFIG_FILE=`mktemp --tmpdir=/tmp slapos-node-unofficial.XXXXXX.cfg`
-chmod 0644 $TEMP_CONFIG_FILE
-
-echo "# Never edit this file by hand as it has been automatically generated by
-# debconf. You can change the settings at any time by running:
-# ``dpkg-reconfigure -pmedium slapos-node-unofficial''" > $TEMP_CONFIG_FILE
-
-cat < /usr/share/doc/slapos-node-unofficial/examples/slapos-node-unofficial.cfg \
- >> $TEMP_CONFIG_FILE
-
-# Synchronize master_url, key_file and cert_file with slapos-client.cfg
-SLAPOS_CLIENT_CONFIG_FILE=/etc/slapos/slapos-client.cfg
-if [ ! -f $SLAPOS_CLIENT_CONFIG_FILE ]; then
- SLAPOS_CLIENT_CONFIG_FILE=
-fi
-
-db_get shared/slapos/master_url
-MASTER_URL="$RET"
-WITH_HTTPS=$(echo "$MASTER_URL" | grep -q "^https://" && echo true || echo false)
-
-db_get slapos-node-unofficial/computer_id
-COMPUTER_ID="$RET"
-
-sed -e "s#^\s*master_url\s*=.*#master_url = $MASTER_URL#" \
- -e "s#^\s*computer_id\s*=.*#computer_id = $COMPUTER_ID#" \
- -i $TEMP_CONFIG_FILE $SLAPOS_CLIENT_CONFIG_FILE
-
-# Handle HTTPS URLs by just commenting/uncommenting the relevant lines
-if $WITH_HTTPS; then
- sed -i 's/^\s*#\+\s*\(key_file\|cert_file\|certificate_repository_path\)/\1/' \
- $TEMP_CONFIG_FILE $SLAPOS_CLIENT_CONFIG_FILE
-else
- sed -i 's/^\s*[^#]*\s*\(key_file\|cert_file\|certificate_repository_path\)/#\1/' \
- $TEMP_CONFIG_FILE $SLAPOS_CLIENT_CONFIG_FILE
-fi
-
-db_get slapos-node-unofficial/software_root
-SOFTWARE_ROOT="$RET"
-
-db_get slapos-node-unofficial/partition_amount
-PARTITION_AMOUNT="$RET"
-
-db_get slapos-node-unofficial/ipv4_local_network
-IPV4_LOCAL_NETWORK="$RET"
-
-sed -e "s#^\s*software_root\s*=.*#software_root = $SOFTWARE_ROOT#" \
- -e "s#^\s*partition_amount\s*=.*#partition_amount = $PARTITION_AMOUNT#" \
- -e "s#^\s*ipv4_local_network\s*=.*#ipv4_local_network = $IPV4_LOCAL_NETWORK#" \
- -i $TEMP_CONFIG_FILE
-
-ucf --three-way --debconf-ok $TEMP_CONFIG_FILE \
- /etc/slapos/slapos-node-unofficial.cfg
-
-db_go
-
-rm -f $TEMP_CONFIG_FILE
-
-exit 0
Copied: packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.postinst (from rev 9685, packages/slapos.core/trunk/debian/slapos-node-unofficial.postinst)
===================================================================
--- packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.postinst (rev 0)
+++ packages/slapos.core/tags/0.35.1-4/debian/slapos-node-unofficial.postinst 2013-05-28 02:53:22 UTC (rev 9686)
@@ -0,0 +1,67 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+. /usr/share/debconf/confmodule
+
+# First, create a temporary configuration file before letting ucf handles the
+# changes between the existing file (if any) and the new version
+TEMP_CONFIG_FILE=`mktemp --tmpdir=/tmp slapos-node-unofficial.XXXXXX.cfg`
+chmod 0644 $TEMP_CONFIG_FILE
+
+echo "# Never edit this file by hand as it has been automatically generated by
+# debconf. You can change the settings at any time by running:
+# ``dpkg-reconfigure -pmedium slapos-node-unofficial''" > $TEMP_CONFIG_FILE
+
+cat < /usr/share/slapos-node-unofficial/slapos-node-unofficial.cfg \
+ >> $TEMP_CONFIG_FILE
+
+# Synchronize master_url, key_file and cert_file with slapos-client.cfg
+SLAPOS_CLIENT_CONFIG_FILE=/etc/slapos/slapos-client.cfg
+if [ ! -f $SLAPOS_CLIENT_CONFIG_FILE ]; then
+ SLAPOS_CLIENT_CONFIG_FILE=
+fi
+
+db_get shared/slapos/master_url
+MASTER_URL="$RET"
+WITH_HTTPS=$(echo "$MASTER_URL" | grep -q "^https://" && echo true || echo false)
+
+db_get slapos-node-unofficial/computer_id
+COMPUTER_ID="$RET"
+
+sed -e "s#^\s*master_url\s*=.*#master_url = $MASTER_URL#" \
+ -e "s#^\s*computer_id\s*=.*#computer_id = $COMPUTER_ID#" \
+ -i $TEMP_CONFIG_FILE $SLAPOS_CLIENT_CONFIG_FILE
+
+# Handle HTTPS URLs by just commenting/uncommenting the relevant lines
+if $WITH_HTTPS; then
+ sed -i 's/^\s*#\+\s*\(key_file\|cert_file\|certificate_repository_path\)/\1/' \
+ $TEMP_CONFIG_FILE $SLAPOS_CLIENT_CONFIG_FILE
+else
+ sed -i 's/^\s*[^#]*\s*\(key_file\|cert_file\|certificate_repository_path\)/#\1/' \
+ $TEMP_CONFIG_FILE $SLAPOS_CLIENT_CONFIG_FILE
+fi
+
+db_get slapos-node-unofficial/software_root
+SOFTWARE_ROOT="$RET"
+
+db_get slapos-node-unofficial/partition_amount
+PARTITION_AMOUNT="$RET"
+
+db_get slapos-node-unofficial/ipv4_local_network
+IPV4_LOCAL_NETWORK="$RET"
+
+sed -e "s#^\s*software_root\s*=.*#software_root = $SOFTWARE_ROOT#" \
+ -e "s#^\s*partition_amount\s*=.*#partition_amount = $PARTITION_AMOUNT#" \
+ -e "s#^\s*ipv4_local_network\s*=.*#ipv4_local_network = $IPV4_LOCAL_NETWORK#" \
+ -i $TEMP_CONFIG_FILE
+
+ucf --three-way --debconf-ok $TEMP_CONFIG_FILE \
+ /etc/slapos/slapos-node-unofficial.cfg
+
+db_go
+
+rm -f $TEMP_CONFIG_FILE
+
+exit 0
More information about the Python-apps-commits
mailing list