summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Bryars <mark@darkskiez.co.uk>2012-05-05 00:54:53 +0100
committerMark Bryars <mark@darkskiez.co.uk>2012-06-19 10:01:47 +0100
commit1ce1ec32ab086973eda4c62388e6915f305d604c (patch)
tree96a8bfbbba314700475a952263931960d5e9df8e
parent92945c1b7f1a9a3cb386a4a25efc93c344f5323b (diff)
downloadvyos-opennhrp-1ce1ec32ab086973eda4c62388e6915f305d604c.tar.gz
vyos-opennhrp-1ce1ec32ab086973eda4c62388e6915f305d604c.zip
Just use the default socket location [for now]
For some reason opennhrpctl isnt working with a changed location.
-rw-r--r--debian/changelog6
-rw-r--r--debian/files1
-rw-r--r--debian/init.d2
-rw-r--r--debian/opennhrp.debhelper.log48
-rw-r--r--debian/opennhrp.substvars2
5 files changed, 7 insertions, 52 deletions
diff --git a/debian/changelog b/debian/changelog
index 3702d25..2c615d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+opennhrp (0.13-2) unstable; urgency=low
+
+ * Kludge workaround for socket location problem
+
+ -- Mark Bryars <debian@darkskiez.co.uk> Fri, 19 Jun 2012 09:54:50 +0100
+
opennhrp (0.13-1) unstable; urgency=low
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
diff --git a/debian/files b/debian/files
deleted file mode 100644
index b62cc6f..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-opennhrp_0.13-1_amd64.deb unknown extra
diff --git a/debian/init.d b/debian/init.d
index 9c7409d..4ef63f7 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -30,7 +30,7 @@ SCRIPTFILE=/etc/opennhrp/opennhrp-script
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-DAEMON_ARGS=" -d -a $CTRLPIPE -c $CONFFILE -s $SCRIPTFILE -p $PIDFILE $DAEMON_OPTS"
+DAEMON_ARGS=" -d -c $CONFFILE -s $SCRIPTFILE -p $PIDFILE $DAEMON_OPTS"
# -a /var/run/opennhrp/ctrl -c /etc/opennhrp/opennhrp.conf -s /etc/opennhrp/opennhrp-script -d -p /var/run/opennhrp/pid
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
diff --git a/debian/opennhrp.debhelper.log b/debian/opennhrp.debhelper.log
deleted file mode 100644
index ce685bc..0000000
--- a/debian/opennhrp.debhelper.log
+++ /dev/null
@@ -1,48 +0,0 @@
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_pysupport
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_installgsettings
-dh_bugfiles
-dh_ucf
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_builddeb
diff --git a/debian/opennhrp.substvars b/debian/opennhrp.substvars
deleted file mode 100644
index b3c9993..0000000
--- a/debian/opennhrp.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-shlibs:Depends=libc-ares2 (>= 1.7.0), libc6 (>= 2.9)
-misc:Depends=