[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771331: marked as done (unblock: ola/0.9.1-1+b1 (pre-approval))

Your message dated Mon, 1 Dec 2014 20:01:20 +0000
with message-id <20141201200120.GO23644@lupin.home.powdarrmonkey.net>
and subject line Re: Bug#771331: unblock: ola/0.9.1-1+b1 (pre-approval)
has caused the Debian Bug report #771331,
regarding unblock: ola/0.9.1-1+b1 (pre-approval)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
771331: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771331
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Debian release team,

Please unblock package ola

I've been working for some days to solve several bugs on this package
with Helmut Grohne and Wouter Verhelst help.

I tried, and succeeded, to solve following bugs:

#767676: ola-rdm-tests: fails to install: subprocess installed
post-installation script returned error exit status 10
#755866: ola: FTBFS: tests fail
#769331: ola: unowned directory after purge: /etc/ola/
#769670: ola-rdm-tests: FTBFS in a sid chroot with pbuilder (no network)
#760414: [ola] Some sources are not included in your package

Right now, Wouter, who is the package maintainer, disagree on #760414
severity, thus blocking fixed package upload.

Since I haven't heard about him for a week, and given the fact that
deadline is approching, I kindly request your decision on that point:
Should #760414 be considered as serious, and thus fixed in my NMU, or not ?

Whatever your decision could be, I will provide the right NMU, ie with
or without bugfix for #760414, on mentors.debian.net.
Helmut has already accepted to sponsor the final upload.

Please find attached 2 debdiff patches:
- First one (ola_0.9.1-1.1.diff) includes all bug fixes but #760414 one.
- Second one (ola_0.9.1+dfsg1-1.1.diff) includes all fixed bugs.

Regards,
Jean Baptiste

unblock ola/0.9.1-1+b1

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'testing-updates'), (500,
'stable-updates'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


diff -Nru ola-0.9.1/debian/changelog ola-0.9.1+dfsg1/debian/changelog
--- ola-0.9.1/debian/changelog	2014-08-17 10:07:29.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/changelog	2014-11-22 00:03:06.000000000 +0100
@@ -1,3 +1,21 @@
+ola (0.9.1+dfsg1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Remove debconf calls from ola-rdm-tests postinst (Closes: #767676)
+  * Ship /etc/ola within ola & ola-rdm-tests packages (Closes: #769331)
+  * Add a patch which fix failing test when running in pbuilder
+    (Closes: #769670)
+  * Fix other important issues:
+    - Remove the check for $RUN_DAEMON from both init scripts olad and
+      rdm_test_server (Package maintainer disagree about this way of
+      controling service)
+    - Remove ola-rdm-tests postinst since its only purpose was to provide
+      /etc/default/ola-rdm-tests
+    - Add postrm scripts for packages ola & ola-rdm-tests to fully remove
+      configuration files so that piuparts tests can pass
+
+ -- Jean Baptiste Favre <debian@jbfavre.org>  Sun, 16 Nov 2014 17:44:18 +0100
+
 ola (0.9.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru ola-0.9.1/debian/ola.dirs ola-0.9.1+dfsg1/debian/ola.dirs
--- ola-0.9.1/debian/ola.dirs	2014-04-21 08:19:26.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola.dirs	2014-11-22 00:03:06.000000000 +0100
@@ -1,3 +1,4 @@
+etc/ola
 usr/bin
 usr/lib
 usr/share/olad/www
diff -Nru ola-0.9.1/debian/ola.olad.init ola-0.9.1+dfsg1/debian/ola.olad.init
--- ola-0.9.1/debian/ola.olad.init	2014-08-17 09:17:40.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola.olad.init	2014-11-22 00:03:06.000000000 +0100
@@ -16,16 +16,11 @@
 PIDFILE=/var/run/$NAME.pid
 DESC="OLA daemon"
 USER=olad
+DAEMON_ARGS="--syslog --log-level 3 --config-dir /etc/ola"
 
 # Reads config file (will override defaults above)
 [ -r /etc/default/ola ] && . /etc/default/ola
 
-if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then
-  DAEMON_ARGS="--syslog --log-level 3  --config-dir  /etc/ola"
-elif [ "$1" = "start" ] || [ "$1" = "stop" ] ; then
-  echo "The init script is currently inactive;\nuse \"dpkg-reconfigure ola\" to change this." >&2
-fi
-
 [ -x "$DAEMON" ] || exit 0
 
 . /lib/lsb/init-functions
diff -Nru ola-0.9.1/debian/ola.postinst ola-0.9.1+dfsg1/debian/ola.postinst
--- ola-0.9.1/debian/ola.postinst	2014-08-17 09:17:40.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola.postinst	2014-11-22 00:03:06.000000000 +0100
@@ -8,13 +8,8 @@
 groups olad | grep plugdev > /dev/null || adduser olad plugdev
 
 # setup the config dir
-CONF_DIR=/etc/ola
-if [ ! -d ${CONF_DIR} ]; then
-  mkdir -p ${CONF_DIR};
-  chown -R olad:olad ${CONF_DIR};
-  chmod g+s ${CONF_DIR};
-fi;
-
+chown -R olad:olad /etc/ola;
+chmod g+s /etc/ola;
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff -Nru ola-0.9.1/debian/ola.postrm ola-0.9.1+dfsg1/debian/ola.postrm
--- ola-0.9.1/debian/ola.postrm	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/ola.postrm	2014-11-22 00:03:06.000000000 +0100
@@ -0,0 +1,25 @@
+#!/bin/sh
+# postrm script for ola
+
+set -e
+
+case "$1" in
+  purge)
+    if [ -f /etc/default/ola ]; then
+      rm -f /etc/default/ola
+    fi
+  ;;
+
+  remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+  ;;
+
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru ola-0.9.1/debian/ola-rdm-tests.dirs ola-0.9.1+dfsg1/debian/ola-rdm-tests.dirs
--- ola-0.9.1/debian/ola-rdm-tests.dirs	2014-04-21 08:19:26.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.dirs	2014-11-22 00:03:06.000000000 +0100
@@ -1,3 +1,4 @@
+etc/ola
 usr/bin
 usr/lib
 usr/share
diff -Nru ola-0.9.1/debian/ola-rdm-tests.postinst ola-0.9.1+dfsg1/debian/ola-rdm-tests.postinst
--- ola-0.9.1/debian/ola-rdm-tests.postinst	2014-04-21 08:19:26.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-#!/bin/sh -e
-# postinst script for ola-rdm-tests
-
-conffile="/etc/default/ola-rdm-tests"
-
-update_config_file() {
-  db_field=$1
-  config_field=$2
-
-  RET=false
-  db_get $db_field
-  if [ -n "$RET" ] ; then
-    if grep -q "^$config_field" $conffile ; then
-      # keep any admin changes, while replacing the variable content
-      sed "s/^[ ]*$config_field=\".*\"/$config_field=\"$RET\"/" < $conffile > $conffile.new && 
-      mv $conffile.new $conffile
-    else
-      echo "$config_field=\"$RET\"" >> $conffile
-    fi
-  fi
-}
-
-# Source debconf library -- we have a Depends line
-# to make sure it is there...
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-case "$1" in
-  configure)
-  if [ -f $conffile ] ; then
-    sed -i -e 's/^[ ]*DAEMON/RUN_DAEMON/g' $conffile
-  else
-    cat << EOF > $conffile
-# Defaults for ola-rdm-tests initscript (/etc/init.d/ola-rdm-tests)
-# This is a POSIX shell fragment
-
-# [automatically edited by postinst, do not change line format ]
-
-# ola-rdm-tests daemon switch. If set to true, rdm_test_server.py will run.
-RUN_DAEMON="true"
-EOF
-  fi
-
-  update_config_file ola-rdm-tests/daemon RUN_DAEMON
-
-  db_stop
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-esac
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -Nru ola-0.9.1/debian/ola-rdm-tests.postrm ola-0.9.1+dfsg1/debian/ola-rdm-tests.postrm
--- ola-0.9.1/debian/ola-rdm-tests.postrm	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.postrm	2014-11-22 00:03:06.000000000 +0100
@@ -0,0 +1,25 @@
+#!/bin/sh
+# postrm script for ola-rdm-tests
+
+set -e
+
+case "$1" in
+  purge)
+    if [ -f /etc/default/ola-rdm-tests ]; then
+      rm -f /etc/default/ola-rdm-tests
+    fi
+  ;;
+
+  remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+  ;;
+
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru ola-0.9.1/debian/ola-rdm-tests.rdm_test_server.init ola-0.9.1+dfsg1/debian/ola-rdm-tests.rdm_test_server.init
--- ola-0.9.1/debian/ola-rdm-tests.rdm_test_server.init	2014-08-17 09:17:40.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.rdm_test_server.init	2014-11-22 00:03:06.000000000 +0100
@@ -17,16 +17,11 @@
 PIDFILE=/var/run/$CMD.pid
 DESC="OLA RDM Test Server"
 USER=olad
+DAEMON_ARGS="--world-writeable"
 
 # Reads config file (will override defaults above)
 [ -r /etc/default/ola-rdm-tests ] && . /etc/default/ola-rdm-tests
 
-if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then
-  DAEMON_ARGS="--world-writeable"
-elif [ "$1" = "start" ] || [ "$1" = "stop" ] ; then
-  echo "The init script is currently inactive;\nuse \"dpkg-reconfigure ola-rdm-tests\" to change this." >&2
-fi
-
 [ -x "$DAEMON" ] || exit 0
 
 . /lib/lsb/init-functions
diff -Nru ola-0.9.1/debian/patches/include_lo_when_looking_for_network_interface.patch ola-0.9.1+dfsg1/debian/patches/include_lo_when_looking_for_network_interface.patch
--- ola-0.9.1/debian/patches/include_lo_when_looking_for_network_interface.patch	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/patches/include_lo_when_looking_for_network_interface.patch	2014-11-22 00:03:06.000000000 +0100
@@ -0,0 +1,22 @@
+Description: Include lo interface lookup for InterfacePicker.
+ Package tests fails when running in pbuilder because InterfacePickerTest does not find
+ any suitable network interface.
+ pbuilder creates a new network namespace (using "unshare -n" from util-linux) and runs
+ the build with just lo being available.
+ Removing false flag passed to picker->GetInterfaces() allows to include lo in search,
+ thus allowing tests to complete.
+Author: Jean Baptiste Favre <debian@jbfavre.org>
+Last-Update: 2014-11-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/common/network/InterfacePickerTest.cpp
++++ b/common/network/InterfacePickerTest.cpp
+@@ -63,7 +63,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Interfac
+  */
+ void InterfacePickerTest::testGetInterfaces() {
+   auto_ptr<InterfacePicker> picker(InterfacePicker::NewPicker());
+-  vector<Interface> interfaces = picker->GetInterfaces(false);
++  vector<Interface> interfaces = picker->GetInterfaces(true);
+   OLA_ASSERT_TRUE(interfaces.size() > 0);
+ 
+   vector<Interface>::iterator iter;
diff -Nru ola-0.9.1/debian/patches/series ola-0.9.1+dfsg1/debian/patches/series
--- ola-0.9.1/debian/patches/series	2014-04-21 11:13:06.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/patches/series	2014-11-22 10:51:44.000000000 +0100
@@ -1 +1,2 @@
 debian-changes
+include_lo_when_looking_for_network_interface.patch

diff -Nru ola-0.9.1/debian/changelog ola-0.9.1+dfsg1/debian/changelog
--- ola-0.9.1/debian/changelog	2014-08-17 10:07:29.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/changelog	2014-11-22 00:03:06.000000000 +0100
@@ -1,3 +1,23 @@
+ola (0.9.1+dfsg1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Remove debconf calls from ola-rdm-tests postinst (Closes: #767676)
+  * Ship /etc/ola within ola & ola-rdm-tests packages (Closes: #769331)
+  * Add a patch which fix failing test when running in pbuilder
+    (Closes: #769670)
+  * Remove minified JS files. Add patch to remove references to
+    minified JS files in tools/rdm/Makefile.am (Closes: #760414)
+  * Fix other important issues:
+    - Remove the check for $RUN_DAEMON from both init scripts olad and
+      rdm_test_server (Package maintainer disagree about this way of
+      controling service)
+    - Remove ola-rdm-tests postinst since its only purpose was to provide
+      /etc/default/ola-rdm-tests
+    - Add postrm scripts for packages ola & ola-rdm-tests to fully remove
+      configuration files so that piuparts tests can pass
+
+ -- Jean Baptiste Favre <debian@jbfavre.org>  Sun, 16 Nov 2014 17:44:18 +0100
+
 ola (0.9.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru ola-0.9.1/debian/ola.dirs ola-0.9.1+dfsg1/debian/ola.dirs
--- ola-0.9.1/debian/ola.dirs	2014-04-21 08:19:26.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola.dirs	2014-11-22 00:03:06.000000000 +0100
@@ -1,3 +1,4 @@
+etc/ola
 usr/bin
 usr/lib
 usr/share/olad/www
diff -Nru ola-0.9.1/debian/ola.olad.init ola-0.9.1+dfsg1/debian/ola.olad.init
--- ola-0.9.1/debian/ola.olad.init	2014-08-17 09:17:40.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola.olad.init	2014-11-22 00:03:06.000000000 +0100
@@ -16,16 +16,11 @@
 PIDFILE=/var/run/$NAME.pid
 DESC="OLA daemon"
 USER=olad
+DAEMON_ARGS="--syslog --log-level 3 --config-dir /etc/ola"
 
 # Reads config file (will override defaults above)
 [ -r /etc/default/ola ] && . /etc/default/ola
 
-if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then
-  DAEMON_ARGS="--syslog --log-level 3  --config-dir  /etc/ola"
-elif [ "$1" = "start" ] || [ "$1" = "stop" ] ; then
-  echo "The init script is currently inactive;\nuse \"dpkg-reconfigure ola\" to change this." >&2
-fi
-
 [ -x "$DAEMON" ] || exit 0
 
 . /lib/lsb/init-functions
diff -Nru ola-0.9.1/debian/ola.postinst ola-0.9.1+dfsg1/debian/ola.postinst
--- ola-0.9.1/debian/ola.postinst	2014-08-17 09:17:40.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola.postinst	2014-11-22 00:03:06.000000000 +0100
@@ -8,13 +8,8 @@
 groups olad | grep plugdev > /dev/null || adduser olad plugdev
 
 # setup the config dir
-CONF_DIR=/etc/ola
-if [ ! -d ${CONF_DIR} ]; then
-  mkdir -p ${CONF_DIR};
-  chown -R olad:olad ${CONF_DIR};
-  chmod g+s ${CONF_DIR};
-fi;
-
+chown -R olad:olad /etc/ola;
+chmod g+s /etc/ola;
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff -Nru ola-0.9.1/debian/ola.postrm ola-0.9.1+dfsg1/debian/ola.postrm
--- ola-0.9.1/debian/ola.postrm	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/ola.postrm	2014-11-22 00:03:06.000000000 +0100
@@ -0,0 +1,25 @@
+#!/bin/sh
+# postrm script for ola
+
+set -e
+
+case "$1" in
+  purge)
+    if [ -f /etc/default/ola ]; then
+      rm -f /etc/default/ola
+    fi
+  ;;
+
+  remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+  ;;
+
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru ola-0.9.1/debian/ola-rdm-tests.dirs ola-0.9.1+dfsg1/debian/ola-rdm-tests.dirs
--- ola-0.9.1/debian/ola-rdm-tests.dirs	2014-04-21 08:19:26.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.dirs	2014-11-22 00:03:06.000000000 +0100
@@ -1,3 +1,4 @@
+etc/ola
 usr/bin
 usr/lib
 usr/share
diff -Nru ola-0.9.1/debian/ola-rdm-tests.postinst ola-0.9.1+dfsg1/debian/ola-rdm-tests.postinst
--- ola-0.9.1/debian/ola-rdm-tests.postinst	2014-04-21 08:19:26.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-#!/bin/sh -e
-# postinst script for ola-rdm-tests
-
-conffile="/etc/default/ola-rdm-tests"
-
-update_config_file() {
-  db_field=$1
-  config_field=$2
-
-  RET=false
-  db_get $db_field
-  if [ -n "$RET" ] ; then
-    if grep -q "^$config_field" $conffile ; then
-      # keep any admin changes, while replacing the variable content
-      sed "s/^[ ]*$config_field=\".*\"/$config_field=\"$RET\"/" < $conffile > $conffile.new && 
-      mv $conffile.new $conffile
-    else
-      echo "$config_field=\"$RET\"" >> $conffile
-    fi
-  fi
-}
-
-# Source debconf library -- we have a Depends line
-# to make sure it is there...
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-case "$1" in
-  configure)
-  if [ -f $conffile ] ; then
-    sed -i -e 's/^[ ]*DAEMON/RUN_DAEMON/g' $conffile
-  else
-    cat << EOF > $conffile
-# Defaults for ola-rdm-tests initscript (/etc/init.d/ola-rdm-tests)
-# This is a POSIX shell fragment
-
-# [automatically edited by postinst, do not change line format ]
-
-# ola-rdm-tests daemon switch. If set to true, rdm_test_server.py will run.
-RUN_DAEMON="true"
-EOF
-  fi
-
-  update_config_file ola-rdm-tests/daemon RUN_DAEMON
-
-  db_stop
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-esac
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -Nru ola-0.9.1/debian/ola-rdm-tests.postrm ola-0.9.1+dfsg1/debian/ola-rdm-tests.postrm
--- ola-0.9.1/debian/ola-rdm-tests.postrm	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.postrm	2014-11-22 00:03:06.000000000 +0100
@@ -0,0 +1,25 @@
+#!/bin/sh
+# postrm script for ola-rdm-tests
+
+set -e
+
+case "$1" in
+  purge)
+    if [ -f /etc/default/ola-rdm-tests ]; then
+      rm -f /etc/default/ola-rdm-tests
+    fi
+  ;;
+
+  remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+  ;;
+
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru ola-0.9.1/debian/ola-rdm-tests.rdm_test_server.init ola-0.9.1+dfsg1/debian/ola-rdm-tests.rdm_test_server.init
--- ola-0.9.1/debian/ola-rdm-tests.rdm_test_server.init	2014-08-17 09:17:40.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/ola-rdm-tests.rdm_test_server.init	2014-11-22 00:03:06.000000000 +0100
@@ -17,16 +17,11 @@
 PIDFILE=/var/run/$CMD.pid
 DESC="OLA RDM Test Server"
 USER=olad
+DAEMON_ARGS="--world-writeable"
 
 # Reads config file (will override defaults above)
 [ -r /etc/default/ola-rdm-tests ] && . /etc/default/ola-rdm-tests
 
-if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then
-  DAEMON_ARGS="--world-writeable"
-elif [ "$1" = "start" ] || [ "$1" = "stop" ] ; then
-  echo "The init script is currently inactive;\nuse \"dpkg-reconfigure ola-rdm-tests\" to change this." >&2
-fi
-
 [ -x "$DAEMON" ] || exit 0
 
 . /lib/lsb/init-functions
diff -Nru ola-0.9.1/debian/patches/include_lo_when_looking_for_network_interface.patch ola-0.9.1+dfsg1/debian/patches/include_lo_when_looking_for_network_interface.patch
--- ola-0.9.1/debian/patches/include_lo_when_looking_for_network_interface.patch	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/patches/include_lo_when_looking_for_network_interface.patch	2014-11-22 00:03:06.000000000 +0100
@@ -0,0 +1,22 @@
+Description: Include lo interface lookup for InterfacePicker.
+ Package tests fails when running in pbuilder because InterfacePickerTest does not find
+ any suitable network interface.
+ pbuilder creates a new network namespace (using "unshare -n" from util-linux) and runs
+ the build with just lo being available.
+ Removing false flag passed to picker->GetInterfaces() allows to include lo in search,
+ thus allowing tests to complete.
+Author: Jean Baptiste Favre <debian@jbfavre.org>
+Last-Update: 2014-11-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/common/network/InterfacePickerTest.cpp
++++ b/common/network/InterfacePickerTest.cpp
+@@ -63,7 +63,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Interfac
+  */
+ void InterfacePickerTest::testGetInterfaces() {
+   auto_ptr<InterfacePicker> picker(InterfacePicker::NewPicker());
+-  vector<Interface> interfaces = picker->GetInterfaces(false);
++  vector<Interface> interfaces = picker->GetInterfaces(true);
+   OLA_ASSERT_TRUE(interfaces.size() > 0);
+ 
+   vector<Interface>::iterator iter;
diff -Nru ola-0.9.1/debian/patches/remove_minified_js_files.patch ola-0.9.1+dfsg1/debian/patches/remove_minified_js_files.patch
--- ola-0.9.1/debian/patches/remove_minified_js_files.patch	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/patches/remove_minified_js_files.patch	2014-11-22 00:03:06.000000000 +0100
@@ -0,0 +1,14 @@
+Index: ola-0.9.1/tools/rdm/Makefile.am
+===================================================================
+--- ola-0.9.1.orig/tools/rdm/Makefile.am	2014-06-21 22:39:56.000000000 +0200
++++ ola-0.9.1/tools/rdm/Makefile.am	2014-11-21 23:40:19.013472735 +0100
+@@ -17,9 +17,7 @@
+ testserver_static_files = \
+     static/MIT-LICENSE.txt \
+     static/common.css \
+-    static/jquery-1.7.2.min.js \
+     static/jquery-ui-1.8.21.custom.css \
+-    static/jquery-ui-1.8.21.custom.min.js \
+     static/rdm_tests.js \
+     static/rdmtests.html \
+     static/ui.multiselect.css \
diff -Nru ola-0.9.1/debian/patches/series ola-0.9.1+dfsg1/debian/patches/series
--- ola-0.9.1/debian/patches/series	2014-04-21 11:13:06.000000000 +0200
+++ ola-0.9.1+dfsg1/debian/patches/series	2014-11-22 10:51:44.000000000 +0100
@@ -1 +1,3 @@
+remove_minified_js_files.patch
 debian-changes
+include_lo_when_looking_for_network_interface.patch
diff -Nru ola-0.9.1/debian/README.source ola-0.9.1+dfsg1/debian/README.source
--- ola-0.9.1/debian/README.source	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/README.source	2014-11-22 10:40:24.000000000 +0100
@@ -0,0 +1,20 @@
+The upstream version of this package provides 2 minified javascript files
+without providing the unminified ones:
+
+tools/rdm/static/jquery-1.7.2.min.js
+tools/rdm/static/jquery-ui-1.8.21.custom.min.js
+
+In order to comply with Debian Free Software Guidelines (DFSG) [1] #2, theses
+files are to be removed from upstream source using debian/repack.sh script.
+Usage:
+
+./debian/repack.sh --upstream-version <version> <filename>
+
+For example, assuming upstream version is 0.9.1, you should run
+
+./debian/repack.sh --upstream-version 0.9.1 ../ola_0.9.1.orig.tar.gz
+
+You then obtain ../ola_0.9.1+dfsg1.orig.tar.gz which you can use as upstream
+package to build binary packages.
+
+[1] https://www.debian.org/social_contract.en.html#guidelines
diff -Nru ola-0.9.1/debian/repack.sh ola-0.9.1+dfsg1/debian/repack.sh
--- ola-0.9.1/debian/repack.sh	1970-01-01 01:00:00.000000000 +0100
+++ ola-0.9.1+dfsg1/debian/repack.sh	2014-11-22 00:09:52.000000000 +0100
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Repackage upstream source to exclude non-distributable files.
+# Should be called as "repack sh --upstream-source <version> <file>
+# (for example, via uscan).
+
+set -e
+set -u
+
+if [ $# -ne 3 ]; then
+        echo "Usage: $0 --upstream-source <version> <file>"
+        exit 1
+fi
+
+OPT_VERSION=$2
+OPT_FILE=$3
+TMPDIR=`mktemp -d`
+trap "rm -rf $TMPDIR" QUIT INT EXIT
+
+echo "Repackaging $OPT_FILE"
+
+orig_file_path=$(readlink --canonicalize $OPT_FILE)
+package_name=$(dpkg-parsechangelog | sed -n 's/^Source: //p')
+dfsg_directory=${package_name}_${OPT_VERSION}+dfsg1
+dfsg_file_path=$(dirname ${orig_file_path})/${dfsg_directory}.orig.tar.gz
+
+zcat "${orig_file_path}" | \
+tar --wildcards \
+    --delete '*min.js' | \
+gzip -c > $dfsg_file_path
+
+echo "File $OPT_FILE repackaged successfully to $dfsg_file_path"

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
On Sun, Nov 30, 2014 at 10:49:52PM +0100, Jean Baptiste Favre wrote:
> Anyway, my NMU has been uploaded by Helmut and reached sid today.
> I just removed the moreinfo tag has requested.

Unblocked.


-- 
Jonathan Wiltshire                                      jmw@debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: