Integrate /etc/zg-policy-rc.d.conf + /etc/policy-rc.d.conf; update Debian packaging

diff --git a/debian/changelog b/debian/changelog
index 837f86a..42bb64b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-policyrcd (0.2.0) unstable; urgency=low
+
+  * Integrate configuration files /etc/zg-policy-rc.d.conf
+    and /etc/policy-rc.d.conf from package grml-etc.
+  * Bump Standards-Version to 3.8.4 (no further changes).
+  * Update Homepage and VCS headers.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 27 Feb 2010 22:55:13 +0100
+
 grml-policyrcd (0.1-3) unstable; urgency=low
 
   * Use "Architecture: all" in debian/control to support architectures

diff --git a/debian/control b/debian/control
index 6d27b88..df9f98a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: admin
 Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
-Homepage: http://hg.grml.org/grml-policyrcd/
-XS-Vcs-hg: http://hg.grml.org/grml-policyrcd/
-XS-Vcs-Browser: http://hg.grml.org/grml-policyrcd/
+Standards-Version: 3.8.4
+Homepage: http://git.grml.org/?p=grml-policyrcd.git
+Vcs-git: git://git.grml.org/grml-policyrcd.git
+Vcs-Browser: http://git.grml.org/?p=grml-policyrcd.git
 
 Package: grml-policyrcd
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, policyrcd-script-zg2
-Conflicts: grml-scripts (<= 0.7-37)
+Conflicts: grml-scripts (<= 0.7-37), grml-etc (<< 1.1.34)
 Description: wrapper for and around invoke-rc.d and policyrcd-script-zg2
  grml-policy-rc.d is a wrapper script for invoke-rc.d to
  avoid automatical startup of init scripts via invoke-rc.d. It

diff --git a/debian/rules b/debian/rules
index 369df7c..b9e4020 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,16 +21,18 @@ install: build
        dh_testdir
        dh_testroot
        dh_clean -k 
-       dh_installdirs usr/sbin/
+       dh_installdirs usr/sbin/ etc
 
-       install -m 755 grml-policy-rc.d debian/grml-policyrcd/usr/sbin/grml-policy-rc.d
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+       install -m 755 grml-policy-rc.d    debian/grml-policyrcd/usr/sbin/grml-policy-rc.d
+       install -m 644 policy-rc.d.conf    debian/grml-policyrcd/etc/policy-rc.d.conf
+       install -m 644 zg-policy-rc.d.conf debian/grml-policyrcd/etc/zg-policy-rc.d.conf
 
 # Build architecture-dependent files here.
 binary-arch: build install
+# We have nothing to do by default.
+
+# Build architecture-independent files here.
+binary-indep: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs 

diff --git a/policy-rc.d.conf b/policy-rc.d.conf
new file mode 100644 (file)
index 0000000..0ab5642
--- /dev/null
+++ b/policy-rc.d.conf
@@ -0,0 +1,26 @@
+# Filename:      /etc/policy-rc.d.conf
+# Purpose:       configuration file for /usr/sbin/grml-policy-rc.d
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2.
+# Latest change: Sam Jul 08 01:29:41 CEST 2006 [mika]
+################################################################################
+
+# Do you want to run invoke-rc.d?
+  EXITSTATUS='0'
+
+#   0 - action allowed
+#   1 - unknown action (therefore, undefined policy)
+#  100 - unknown initscript id
+#  101 - action forbidden by policy
+#  102 - subsystem error
+#  103 - syntax error
+#  104 - [reserved]
+#  105 - behaviour uncertain, policy undefined.
+#  106 - action not allowed. Use the returned fallback actions
+#        (which are implied to be "allowed") instead.
+
+# More information:
+# http://people.debian.org/~hmh/invokerc.d-policyrc.d-specification.txt
+
+## END OF FILE #################################################################

diff --git a/zg-policy-rc.d.conf b/zg-policy-rc.d.conf
new file mode 100644 (file)
index 0000000..cc1d328
--- /dev/null
+++ b/zg-policy-rc.d.conf
@@ -0,0 +1,12 @@
+# Filename:      /etc/zg-policy-rc.d.conf
+# Purpose:       configuration file for policyrcd-script-zg2
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2.
+# Latest change: Sam Jul 08 01:27:21 CEST 2006 [mika]
+################################################################################
+
+# We want to run /usr/sbin/grml-policy-rc.d as invoke-rc.d interface:
+POLICYRCD=/usr/sbin/grml-policy-rc.d
+
+## END OF FILE #################################################################