Merge tag 'upstream/0.23.5'

Upstream version 0.23.5

7 files changed, 28 insertions, 146 deletions

diff --git a/src/unit/Unit.c b/src/unit/Unit.c
new file mode 100644
index 0000000..d652834
--- /dev/null
+++ b/src/unit/Unit.c
@@ -0,0 +1,28 @@
+/* Unit.c generated by valac 0.32.1, the Vala compiler
+ * generated from Unit.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+
+void unit_init (GError** error);
+void unit_terminate (void);
+
+
+void unit_init (GError** error) {
+}
+
+
+void unit_terminate (void) {
+}
+
+
+
diff --git a/src/unit/mk/unit.mk b/src/unit/mk/unit.mk
deleted file mode 100644
index 618ebca..0000000
--- a/src/unit/mk/unit.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# UNIT_NAME is the Vala namespace.  A file named UNIT_NAME.vala must be in this directory with
-# a init() and terminate() function declared in the namespace.
-UNIT_NAME := Unit
-
-# UNIT_DIR should match the subdirectory the files are located in.  Generally UNIT_NAME in all
-# lowercase.  The name of this file should be UNIT_DIR.mk.
-UNIT_DIR := unit
-
-# All Vala files in the unit should be listed here with no subdirectory prefix.
-#
-# NOTE: Do *not* include the unit's master file, i.e. UNIT_NAME.vala.
-UNIT_FILES :=
-
-# Any unit this unit relies upon (and should be initialized before it's initialized) should
-# be listed here using its Vala namespace.
-#
-# NOTE: All units are assumed to rely upon the unit-unit.  Do not include that here.
-UNIT_USES :=
-
-# List any additional files that are used in the build process as a part of this unit that should
-# be packaged in the tarball.  File names should be relative to the unit's home directory.
-UNIT_RC := \
-	rc/UnitInternals.m4 \
-	rc/Unit.m4 \
-	rc/template.mk \
-	rc/unitize_entry.m4 \
-	rc/template.vala
-
-# unitize.mk must be called at the end of each UNIT_DIR.mk file.
-include unitize.mk
-
diff --git a/src/unit/rc/Unit.m4 b/src/unit/rc/Unit.m4
deleted file mode 100644
index 2665dd6..0000000
--- a/src/unit/rc/Unit.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-/* This file is the master unit file for the _UNIT_NAME_ unit.  It should be edited to include
- * whatever code is deemed necessary.
- *
- * The init() and terminate() methods are mandatory.
- *
- * If the unit needs to be configured prior to initialization, add the proper parameters to
- * the preconfigure() method, implement it, and ensure in init() that it's been called.
- */
-
-namespace _UNIT_NAME_ {
-
-// preconfigure may be deleted if not used.
-public void preconfigure() {
-}
-
-public void init() throws Error {
-}
-
-public void terminate() {
-}
-
-}
-
diff --git a/src/unit/rc/UnitInternals.m4 b/src/unit/rc/UnitInternals.m4
deleted file mode 100644
index 71614d4..0000000
--- a/src/unit/rc/UnitInternals.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-namespace _UNIT_NAME_ {
-
-private int _unit_init_count = 0;
-
-public void init_entry() throws Error {
-    if (_unit_init_count++ != 0)
-        return;
-    
-    _UNIT_USES_INITS_
-    
-    _UNIT_NAME_.init();
-}
-
-public void terminate_entry() {
-    if (_unit_init_count == 0 || --_unit_init_count != 0)
-        return;
-    
-    _UNIT_NAME_.terminate();
-    
-    _UNIT_USES_TERMINATORS_
-}
-
-}
-
diff --git a/src/unit/rc/template.mk b/src/unit/rc/template.mk
deleted file mode 100644
index 34873d3..0000000
--- a/src/unit/rc/template.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# UNIT_NAME is the Vala namespace.  A file named UNIT_NAME.vala must be in this directory with
-# a init() and terminate() function declared in the namespace.
-UNIT_NAME := _UNIT_NAME_
-
-# UNIT_DIR should match the subdirectory the files are located in.  Generally UNIT_NAME in all
-# lowercase.  The name of this file should be UNIT_DIR.mk.
-UNIT_DIR := _UNIT_DIR_
-
-# All Vala files in the unit should be listed here with no subdirectory prefix.
-#
-# NOTE: Do *not* include the unit's master file, i.e. UNIT_NAME.vala.
-UNIT_FILES :=
-
-# Any unit this unit relies upon (and should be initialized before it's initialized) should
-# be listed here using its Vala namespace.
-#
-# NOTE: All units are assumed to rely upon the unit-unit.  Do not include that here.
-UNIT_USES :=
-
-# List any additional files that are used in the build process as a part of this unit that should
-# be packaged in the tarball.  File names should be relative to the unit's home directory.
-UNIT_RC :=
-
-# unitize.mk must be called at the end of each UNIT_DIR.mk file.
-include unitize.mk
-
diff --git a/src/unit/rc/template.vala b/src/unit/rc/template.vala
deleted file mode 100644
index 31fc93d..0000000
--- a/src/unit/rc/template.vala
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
diff --git a/src/unit/rc/unitize_entry.m4 b/src/unit/rc/unitize_entry.m4
deleted file mode 100644
index 31602b2..0000000
--- a/src/unit/rc/unitize_entry.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-namespace _APP_UNIT_ {
-
-public void app_init() throws Error {
-    _APP_UNIT_.init_entry();
-}
-
-public void app_terminate() {
-    _APP_UNIT_.terminate_entry();
-}
-
-}