[debian-edu-commits] debian-edu/ 01/01: Add Depends on cfengine3 to tasks/common.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu.

commit e14f33d3f993d2b335a3611fa5baf4c35a61b355
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Dec 6 11:46:04 2017 +0100

    Add Depends on cfengine3 to tasks/common.
    
    This allows to migrate cfengine2 configuration step by step.
---
 debian-edu-tasks.desc | 13 +++++++++++++
 debian/changelog      |  5 +++++
 debian/control        |  3 ++-
 tasks/common          |  5 ++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 87ac6e0..dd0fa72 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -14,6 +14,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -137,6 +138,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -283,6 +285,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -396,6 +399,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -509,6 +513,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -896,6 +901,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -1259,6 +1265,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -1639,6 +1646,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -1811,6 +1819,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -1928,6 +1937,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -2043,6 +2053,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -2415,6 +2426,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
@@ -2785,6 +2797,7 @@ Packages: list
  procinfo
  openssh-client
  cfengine2
+ cfengine3
  vim
  nullidentd
  openbsd-inetd
diff --git a/debian/changelog b/debian/changelog
index c6bd280..9757bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,16 @@ debian-edu (1.932) UNRELEASED; urgency=medium
 
   [ Wolfgang Schweer ]
   * Add Depends on iptables to tasks/thin-client.
+  * Add Depends on cfengine3 to tasks/common. 
+    This allows to migrate cfengine2 configuration step by step. 
   * Update after running 'make dist'.
 
   [ Holger Levsen ]
   * Bump standards version to 4.1.2, no changes needed. 
 
+  [ Wolfgang Schweer ]
+  * 
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 01 Dec 2017 16:40:16 +0100
 
 debian-edu (1.931) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 53a35e5..6803ef6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
  Dominik George <nik at naturalnet.de>
 Build-Depends: debhelper (>= 10.2.5~), blends-dev (>= 0.6.100)
-Standards-Version: 4.1.2
+Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/debian-edu/debian-edu.git
 Vcs-Browser: https://anonscm.debian.org/git/debian-edu/debian-edu.git
 Homepage: http://www.skolelinux.org
@@ -89,6 +89,7 @@ Depends: ${misc:Depends},
  bc,
  bind9-host,
  cfengine2,
+ cfengine3,
  cifs-utils,
  cups,
  cups-browsed,
diff --git a/tasks/common b/tasks/common
index 50cd0f5..3a7310b 100644
--- a/tasks/common
+++ b/tasks/common
@@ -25,7 +25,10 @@ Depends:
  cfengine2,
 NeedConfig: yes - cfengine2 configures system at install time
                   description files in debian-edu-config, cf/ folder.
-
+Depends:
+ cfengine3,
+NeedConfig: yes - cfengine2 needs to be migrated to cfengine3
+                  configuration files in /var/lib/cfengine3/inputs/.
 Depends:
  vim,
 Avoid:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git