El 21/12/14 a las 16:17, Tobias Hansen escribió:
Am 21.12.2014 um 16:05 schrieb Mario Izquierdo Rodríguez:
El 19/12/14 a las 22:03, Tobias Hansen escribió:
On Tue, 02 Dec 2014 21:29:29 +0100
=?UTF-8?B?TWFyaW8gSXpxdWllcmRvIFJvZHLDrWd1ZXo=?=
<mariodeb...@gmail.com> wrote:
El 24/11/14 a las 15:28, Jonathan Wiltshire escribió:
On Mon, Nov 24, 2014 at 12:05:21AM +0100, Mario Izquierdo RodrÃguez
wrote:
El 23/11/14 a las 19:40, Jonathan Wiltshire escribió:
Control: tags 765129 + pending
Dear maintainer,
I've prepared an NMU for tcos (versioned as 0.89.93+nmu1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
Hi, thanks for NMU, I'm not a DD and I have a new package but no
sponsor for
upload.
How about preparing a maintainer upload and I'll sponsor it for you?
Hi Jonathan.
I had prepared new TCOS package:
http://mariodebian.com/debian-packages/tcos_0.89.97.dsc
Only sources (not binary)
Can you upload it?
Thanks in advance.
Hi Mario,
the freeze policy allows only targeted fixes for rc bugs. The changes in
0.89.97 are too extensive. I could upload Jonathans NMU patch, unless
there's another small and important fix you want to include. Is the
patch you mentioned on Nov 24 important?
Best,
Tobias
Hi I attach the minimal patch needed to fix this bug and another one
that fix start-stop-daemon start
You can split to use only debian/control diff but the diff of
debian/tcos-standalone.init is needed to fix start-stop-daemon
Thanks in advance
Hi,
could you please prepare a maintainer upload (create a .dsc) where these
patches are applied? Please mention both changes in the changelog. Then
I upload it.
Best,
Tobias
Here is it:
http://mariodebian.com/debian-packages/tcos_0.89.96+1.dsc
Diff from 0.89.96 (current Debian unstable version) attached.
Thanks
--
Mario Izquierdo Rodríguez
http://mariodebian.com
diff --git a/debian/changelog b/debian/changelog
index fe30f0c..f5f6ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tcos (0.89.96+1) unstable; urgency=medium
+
+ * Fix build dependencies libxmlrpc-core-c3-dev (closes: #765129)
+ * Fix tcos-standalone start-stop-daemon command
+
+ -- Mario Izquierdo (mariodebian) <mariodeb...@gmail.com> Sun, 21 Dec 2014 16:23:51 +0100
+
tcos (0.89.96) unstable; urgency=medium
* Start tcosxmlrpc with start-stop-daemon
diff --git a/debian/control b/debian/control
index df22fab..3d61e7d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Mario Izquierdo (mariodebian) <mariodeb...@gmail.com>
Build-Depends: debhelper (>= 7.0.50~),
python (>= 2.6.6-3~),
dh-python,
- libxmlrpc-c3-dev | libxmlrpc-core-c3-dev,
+ libxmlrpc-core-c3-dev | libxmlrpc-c3-dev,
libxau-dev,
libxaw7-dev,
libimlib2-dev,
diff --git a/debian/tcos-standalone.init b/debian/tcos-standalone.init
index ebc2dd5..aeb1abc 100644
--- a/debian/tcos-standalone.init
+++ b/debian/tcos-standalone.init
@@ -23,7 +23,7 @@ NAME=tcosxmlrpc-standalone
DAEMON=/usr/lib/tcos/$NAME
DAEMON_WWW="/var/lib/tcos/standalone/www"
-PID_FILE="/var/lib/tcos/standalone/log/abyss.pid"
+PIDFILE="/var/lib/tcos/standalone/log/abyss.pid"
SCRIPTNAME=/etc/init.d/$NAME
DEFAULT_CONF=/etc/default/tcos-standalone
@@ -83,9 +83,9 @@ do_start()
stunnel4 /var/lib/tcos/standalone/etc/stunnel/stunnel.conf > /dev/null 2>&1 &
fi
-
+
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null || return 1
- start-stop-daemon --background --start --quiet --pidfile $PIDFILE --exec $DAEMON || return 2
+ start-stop-daemon --background --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON || return 2
}
#
@@ -139,7 +139,7 @@ do_checklog_size()
{
# clean logs when size > 5 MB
for logfile in /var/lib/tcos/standalone/log/*; do
- [ $(du $logfile| awk '{print $1}') -gt 5000 ] && \
+ [ -f "$logfile" ] && [ $(du $logfile| awk '{print $1}') -gt 5000 ] && \
cat /dev/null > $logfile
done
}
