diff -Nru muroard-0.1.9/debian/changelog muroard-0.1.9/debian/changelog --- muroard-0.1.9/debian/changelog 2011-12-05 08:26:42.000000000 +0000 +++ muroard-0.1.9/debian/changelog 2012-02-25 09:30:54.000000000 +0000 @@ -1,10 +1,10 @@ -muroard (0.1.9-1ubuntu1) precise; urgency=low +muroard (0.1.9-2) unstable; urgency=low - * Merge from Debian testing (LP: #900006). Remaining changes: - - Add undef-crypt.diff to resolve undefined reference to crypt. Fixes - FTBFS. + * Bump Standards-Version to 3.9.3 (no changed needed). + * Add lintian override about no-symbols-control-file. + * Add patch 02-init-status, which adds the status option to the init script. - -- Leo Iannacone Sun, 04 Dec 2011 19:45:09 +0100 + -- Patrick Matthäi Sat, 25 Feb 2012 10:30:21 +0100 muroard (0.1.9-1) unstable; urgency=low @@ -21,13 +21,6 @@ -- Patrick Matthäi Sun, 13 Nov 2011 14:24:17 +0100 -muroard (0.1.8-1ubuntu1) precise; urgency=low - - * Add undef-crypt.diff to resolve undefined reference to crypt. Fixes - FTBFS. - - -- Daniel T Chen Sun, 13 Nov 2011 16:48:24 -0500 - muroard (0.1.8-1) unstable; urgency=low [ Philipp Schafft ] @@ -173,4 +166,3 @@ Closes: #574895 -- Patrick Matthäi Mon, 22 Mar 2010 00:16:03 +0100 - diff -Nru muroard-0.1.9/debian/control muroard-0.1.9/debian/control --- muroard-0.1.9/debian/control 2011-12-05 08:26:42.000000000 +0000 +++ muroard-0.1.9/debian/control 2012-02-25 09:30:54.000000000 +0000 @@ -1,7 +1,6 @@ Source: muroard Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Patrick Matthäi +Maintainer: Patrick Matthäi Uploaders: Philipp Schafft Build-Depends: debhelper (>= 7), libmuroar-dev (>= 0.1.3), @@ -9,7 +8,7 @@ libdnet-dev [linux-any], libvorbis-dev, hardening-wrapper -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Section: sound Homepage: http://roaraudio.keep-cool.org/ diff -Nru muroard-0.1.9/debian/libmuroard2.lintian-overrides muroard-0.1.9/debian/libmuroard2.lintian-overrides --- muroard-0.1.9/debian/libmuroard2.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ muroard-0.1.9/debian/libmuroard2.lintian-overrides 2012-02-25 09:30:54.000000000 +0000 @@ -0,0 +1,2 @@ +libmuroard2: no-symbols-control-file usr/lib/libmuroard-backend.so.2 +libmuroard2: no-symbols-control-file usr/lib/libmuroard.so.2 diff -Nru muroard-0.1.9/debian/patches/02-init-status.diff muroard-0.1.9/debian/patches/02-init-status.diff --- muroard-0.1.9/debian/patches/02-init-status.diff 1970-01-01 00:00:00.000000000 +0000 +++ muroard-0.1.9/debian/patches/02-init-status.diff 2012-02-25 09:30:54.000000000 +0000 @@ -0,0 +1,41 @@ +# Add status command to the muroards init script. + +diff -Naur muroard-0.1.9.orig/dist/debian-like/muroard muroard-0.1.9/dist/debian-like/muroard +--- muroard-0.1.9.orig/dist/debian-like/muroard 2011-09-17 17:57:36.000000000 +0200 ++++ muroard-0.1.9/dist/debian-like/muroard 2012-02-25 10:24:23.186317957 +0100 +@@ -143,8 +143,34 @@ + $0 stop + $0 start + ;; ++ status) ++ echo -n "Status of $DESC: " ++ set +e ++ if [ "$PIDFILE" != '' ] ++ then ++ PID=`cat $PIDFILE 2> /dev/null` ++ if [ "$PID" != '' ] ++ then ++ kill -0 $PID 2> /dev/null ++ if [ "$?" = '0' ] ++ then ++ echo "running." ++ exit 0; ++ else ++ echo "dead (stale pid file)." ++ exit 1; ++ fi ++ else ++ echo "not running." ++ exit 3; ++ fi ++ fi ++ set -e ++ echo "unknown (no pid file configured)." ++ exit 4 ++ ;; + *) +- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|terminate|shutdown}" >&2 ++ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|terminate|shutdown|status}" >&2 + exit 1 + ;; + esac diff -Nru muroard-0.1.9/debian/patches/series muroard-0.1.9/debian/patches/series --- muroard-0.1.9/debian/patches/series 2011-12-05 08:26:42.000000000 +0000 +++ muroard-0.1.9/debian/patches/series 2012-02-25 09:30:54.000000000 +0000 @@ -1,2 +1,2 @@ 01-hyphen-used-as-minus.diff -undef-crypt.diff +02-init-status.diff diff -Nru muroard-0.1.9/debian/patches/undef-crypt.diff muroard-0.1.9/debian/patches/undef-crypt.diff --- muroard-0.1.9/debian/patches/undef-crypt.diff 2011-12-05 08:27:42.000000000 +0000 +++ muroard-0.1.9/debian/patches/undef-crypt.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -93,7 +93,7 @@ - rm -f '$(DESTDIR)$(PREFIX_CKPORT)'/$(CKPORTDB) - - muroard: $(OBJS) $(OBJS_DRIVER) $(OBJS_MAIN) -- ${CC} ${LDFLAGS} -o muroard $(OBJS) $(OBJS_DRIVER) $(OBJS_MAIN) ${LIBS} -+ ${CC} ${LDFLAGS} -o muroard $(OBJS) $(OBJS_DRIVER) $(OBJS_MAIN) ${LIBS} -lcrypt - - $(SLIB): ${OBJS} - ${CC} ${LDFLAGS} $(SHARED) -Wl,-soname,$(SLIB) -o $(SLIB) ${OBJS} ${LIBS} diff -Nru muroard-0.1.9/debian/rules muroard-0.1.9/debian/rules --- muroard-0.1.9/debian/rules 2011-11-13 13:24:22.000000000 +0000 +++ muroard-0.1.9/debian/rules 2012-02-25 09:30:54.000000000 +0000 @@ -49,6 +49,7 @@ dh_installman -a dh_install -a --list-missing dh_installinit -a + dh_lintian -a dh_strip -a --dbg-package=muroard-dbg dh_compress -a dh_fixperms -a