[wesnoth] 02/03: Revert "also use dh-systemd and add tmpfile"

[Vincent Cheng]

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

vcheng pushed a commit to branch wheezy-backports-sloppy
in repository wesnoth.

commit cab51119224cebee48458c58229fdc9d739acc6f
Author: Vincent Cheng <vcheng at debian.org>
Date:   Wed Jul 15 20:22:00 2015 -0700

    Revert "also use dh-systemd and add tmpfile"
    
    This reverts commit f8d70759149a2143a1b0b72d6ab9d4421ec6991f.
    
    Conflicts:
    	debian/changelog
    	debian/rules
---
 debian/control                          | 2 +-
 debian/control.in                       | 2 +-
 debian/rules                            | 2 --
 debian/wesnoth-1.12-server.tmpfile      | 1 -
 debian/wesnoth-BRANCH-server.tmpfile.in | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 1d008c7..55a442b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7), libsdl-image1.2-dev, libfreetype6-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
   libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
   libboost-program-options-dev, libboost-filesystem-dev, libboost-locale-dev,
-  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6), dh-systemd (>= 1.5)
+  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6)
 Standards-Version: 3.9.6
 Uploaders: Rhonda D'Vine <rhonda at debian.org>,
   Vincent Cheng <vcheng at debian.org>
diff --git a/debian/control.in b/debian/control.in
index 94762db..fcd0c62 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7), libsdl-image1.2-dev, libfreetype6-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
   libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
   libboost-program-options-dev, libboost-filesystem-dev, libboost-locale-dev,
-  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6), dh-systemd (>= 1.5)
+  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6)
 Standards-Version: 3.9.6
 Uploaders: Rhonda D'Vine <rhonda at debian.org>,
   Vincent Cheng <vcheng at debian.org>
diff --git a/debian/rules b/debian/rules
index f867bd4..f3917d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,9 +111,7 @@ binary-common:
 	dh_installexamples
 	dh_installmenu
 	dh_lintian
-	dh_systemd_enable
 	dh_installinit
-	dh_systemd_start
 	dh_installman
 	dh_strip --dbg-package=wesnoth-$(BRANCH_VERSION)-dbg
 	dh_compress
diff --git a/debian/wesnoth-1.12-server.tmpfile b/debian/wesnoth-1.12-server.tmpfile
deleted file mode 100644
index 00167b7..0000000
--- a/debian/wesnoth-1.12-server.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/wesnothd 0700 root root -
diff --git a/debian/wesnoth-BRANCH-server.tmpfile.in b/debian/wesnoth-BRANCH-server.tmpfile.in
deleted file mode 100644
index 00167b7..0000000
--- a/debian/wesnoth-BRANCH-server.tmpfile.in
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/wesnothd 0700 root root -

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