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

[arnau at users.alioth.debian.org]

    Date: Wednesday, November 16, 2016 @ 05:20:43
  Author: arnau
Revision: 13706

Let dpkg handle /etc/slapos for both binary packages. Closes: #825564.

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/slapos-client.postrm
  packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs
  packages/slapos.core/trunk/debian/slapos-node-unofficial.postrm

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2016-11-16 05:18:13 UTC (rev 13705)
+++ packages/slapos.core/trunk/debian/changelog	2016-11-16 05:20:43 UTC (rev 13706)
@@ -3,14 +3,12 @@
   * New upstream release.
     + d/control: Update Homepage.
     + d/patches/*: Refresh patches.
-    + d/conf/slapos-node-unofficial.cfg: Update to match current example
-      configuration file.
+    + d/conf/slapos-node-unofficial.cfg: Updated.
   * d/control:
     + Add dh-python to Build-Depends (dh_python2 warning).
     + Bump Standards-Version to 3.9.8. No change needed.
-  * debhelper compat level 7 is deprecated so switch to level 10:
-    + d/control: Builds-Depends on debhelper 
-    + d/compat: Bump to 10.
+  * debhelper compat level 7 is deprecated so switch to level 10.
+  * Let dpkg handle /etc/slapos for both binary packages. Closes: #825564.
 
  -- Arnaud Fontaine <arnau at debian.org>  Wed, 16 Nov 2016 13:10:16 +0900
 

Modified: packages/slapos.core/trunk/debian/slapos-client.postrm
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.postrm	2016-11-16 05:18:13 UTC (rev 13705)
+++ packages/slapos.core/trunk/debian/slapos-client.postrm	2016-11-16 05:20:43 UTC (rev 13706)
@@ -6,7 +6,6 @@
 case "$1" in
     purge)
         ucf --purge /etc/slapos/slapos-client.cfg || true
-        rm -rf /etc/slapos/
 	;;
 esac
 

Modified: packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs	2016-11-16 05:18:13 UTC (rev 13705)
+++ packages/slapos.core/trunk/debian/slapos-node-unofficial.dirs	2016-11-16 05:20:43 UTC (rev 13706)
@@ -4,3 +4,4 @@
 usr/sbin/
 usr/share/slapos-node-unofficial
 usr/share/doc/slapos-node-unofficial/examples
+etc/slapos/

Modified: packages/slapos.core/trunk/debian/slapos-node-unofficial.postrm
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.postrm	2016-11-16 05:18:13 UTC (rev 13705)
+++ packages/slapos.core/trunk/debian/slapos-node-unofficial.postrm	2016-11-16 05:20:43 UTC (rev 13706)
@@ -9,7 +9,7 @@
         db_get slapos-node-unofficial/software_root
         SOFTWARE_ROOT="$RET"
 
-        rm -rf /etc/slapos/ /var/log/slapos/ /var/lib/slapos/ \
+        rm -rf /var/log/slapos/ /var/lib/slapos/ \
             /var/cache/slapos/certificates/ "$SOFTWARE_ROOT"
 	;;
 esac