[Python-apps-commits] r9685 - in packages/slapos.core/trunk/debian (11 files)

[arnau at users.alioth.debian.org]

    Date: Tuesday, May 28, 2013 @ 02:50:54
  Author: arnau
Revision: 9685

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.

Added:
  packages/slapos.core/trunk/debian/slapos-client.links
  packages/slapos.core/trunk/debian/slapos-node-unofficial.links
Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/slapos-client.dirs
  packages/slapos.core/trunk/debian/slapos-client.install
  packages/slapos.core/trunk/debian/slapos-client.postinst
  packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs
  packages/slapos.core/trunk/debian/slapos-node-unofficial.install
  packages/slapos.core/trunk/debian/slapos-node-unofficial.postinst
Deleted:
  packages/slapos.core/trunk/debian/slapos-client.examples
  packages/slapos.core/trunk/debian/slapos-node-unofficial.examples

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/trunk/debian/changelog	2013-05-28 02:50:54 UTC (rev 9685)
@@ -1,13 +1,17 @@
-slapos.core (0.35.1-4) UNRELEASED; urgency=low
+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.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:05:47 +0200
+ -- Arnaud Fontaine <arnau at debian.org>  Tue, 28 May 2013 11:31:24 +0900
 
 slapos.core (0.35.1-3) unstable; urgency=low
 

Modified: packages/slapos.core/trunk/debian/slapos-client.dirs
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.dirs	2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/trunk/debian/slapos-client.dirs	2013-05-28 02:50:54 UTC (rev 9685)
@@ -1,3 +1,5 @@
 etc/slapos/
 etc/slapos/ssl/
 usr/bin/
+usr/share/slapos-client
+usr/share/doc/slapos-client/examples

Deleted: packages/slapos.core/trunk/debian/slapos-client.examples
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.examples	2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/trunk/debian/slapos-client.examples	2013-05-28 02:50:54 UTC (rev 9685)
@@ -1 +0,0 @@
-debian/conf/slapos-client.cfg

Modified: packages/slapos.core/trunk/debian/slapos-client.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.install	2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/trunk/debian/slapos-client.install	2013-05-28 02:50:54 UTC (rev 9685)
@@ -12,3 +12,4 @@
 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

Added: packages/slapos.core/trunk/debian/slapos-client.links
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.links	                        (rev 0)
+++ packages/slapos.core/trunk/debian/slapos-client.links	2013-05-28 02:50:54 UTC (rev 9685)
@@ -0,0 +1 @@
+usr/share/slapos-client/slapos-client.cfg	usr/share/doc/slapos-client/examples/slapos-client.cfg

Modified: packages/slapos.core/trunk/debian/slapos-client.postinst
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.postinst	2013-05-27 21:45:19 UTC (rev 9684)
+++ packages/slapos.core/trunk/debian/slapos-client.postinst	2013-05-28 02:50:54 UTC (rev 9685)
@@ -14,7 +14,7 @@
 # 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
+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

Modified: packages/slapos.core/trunk/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/trunk/debian/slapos-node-unofficial.dirs	2013-05-28 02:50:54 UTC (rev 9685)
@@ -2,3 +2,5 @@
 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/trunk/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/trunk/debian/slapos-node-unofficial.examples	2013-05-28 02:50:54 UTC (rev 9685)
@@ -1 +0,0 @@
-debian/conf/slapos-node-unofficial.cfg

Modified: packages/slapos.core/trunk/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/trunk/debian/slapos-node-unofficial.install	2013-05-28 02:50:54 UTC (rev 9685)
@@ -21,3 +21,4 @@
 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

Added: packages/slapos.core/trunk/debian/slapos-node-unofficial.links
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.links	                        (rev 0)
+++ packages/slapos.core/trunk/debian/slapos-node-unofficial.links	2013-05-28 02:50:54 UTC (rev 9685)
@@ -0,0 +1 @@
+usr/share/slapos-node-unofficial/slapos-node-unofficial.cfg	usr/share/doc/slapos-node-unofficial/examples/slapos-node-unofficial.cfg

Modified: packages/slapos.core/trunk/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/trunk/debian/slapos-node-unofficial.postinst	2013-05-28 02:50:54 UTC (rev 9685)
@@ -14,7 +14,7 @@
 # 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 \
+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