[Python-modules-commits] r33943 - in packages/fedmsg/tags (27 files)

olasd at users.alioth.debian.org olasd at users.alioth.debian.org
Fri Aug 21 11:59:15 UTC 2015


    Date: Friday, August 21, 2015 @ 11:59:14
  Author: olasd
Revision: 33943

[svn-buildpackage] Tagging fedmsg 0.9.3-2

Added:
  packages/fedmsg/tags/0.9.3-2/
  packages/fedmsg/tags/0.9.3-2/debian/changelog
    (from rev 33942, packages/fedmsg/trunk/debian/changelog)
  packages/fedmsg/tags/0.9.3-2/debian/control
    (from rev 30163, packages/fedmsg/trunk/debian/control)
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-gateway.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-gateway.init)
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-hub.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-hub.init)
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-irc.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-irc.init)
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-relay.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-relay.init)
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg.install
    (from rev 30163, packages/fedmsg/trunk/debian/fedmsg.install)
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg.manpages
    (from rev 30228, packages/fedmsg/trunk/debian/fedmsg.manpages)
  packages/fedmsg/tags/0.9.3-2/debian/manpages/fedmsg-dg-replay.1
    (from rev 30228, packages/fedmsg/trunk/debian/manpages/fedmsg-dg-replay.1)
  packages/fedmsg/tags/0.9.3-2/debian/patches/remove_references_to_external_resources_in_docs.diff
    (from rev 30163, packages/fedmsg/trunk/debian/patches/remove_references_to_external_resources_in_docs.diff)
  packages/fedmsg/tags/0.9.3-2/debian/patches/series
    (from rev 30163, packages/fedmsg/trunk/debian/patches/series)
  packages/fedmsg/tags/0.9.3-2/debian/rules
    (from rev 33941, packages/fedmsg/trunk/debian/rules)
  packages/fedmsg/tags/0.9.3-2/debian/watch
    (from rev 33939, packages/fedmsg/trunk/debian/watch)
Deleted:
  packages/fedmsg/tags/0.9.3-2/debian/changelog
  packages/fedmsg/tags/0.9.3-2/debian/control
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-gateway.init
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-hub.init
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-irc.init
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg-relay.init
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg.install
  packages/fedmsg/tags/0.9.3-2/debian/fedmsg.manpages
  packages/fedmsg/tags/0.9.3-2/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
  packages/fedmsg/tags/0.9.3-2/debian/patches/remove_references_to_external_resources_in_docs.diff
  packages/fedmsg/tags/0.9.3-2/debian/patches/series
  packages/fedmsg/tags/0.9.3-2/debian/rules
  packages/fedmsg/tags/0.9.3-2/debian/watch

Deleted: packages/fedmsg/tags/0.9.3-2/debian/changelog
===================================================================
--- packages/fedmsg/trunk/debian/changelog	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/changelog	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,61 +0,0 @@
-fedmsg (0.8.0-1) unstable; urgency=medium
-
-  * New upstream release
-    - Drop twitter-related workarounds as twitter was removed upstream
-  * Add GPG signature verification to debian/watch
-  * Update d/copyright
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 18:54:55 +0200
-
-fedmsg (0.7.7-1) unstable; urgency=medium
-
-  * New upstream release
-  * Update the fedmsg-tail manpage to match the upstream changes
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sun, 30 Mar 2014 20:03:33 +0200
-
-fedmsg (0.7.6-2) unstable; urgency=medium
-
-  * Add missing depends on adduser for the packages that add the fedmsg
-    user in postinst
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sat, 29 Mar 2014 08:07:30 +0100
-
-fedmsg (0.7.6-1) unstable; urgency=medium
-
-  * New upstream release (Closes: #738058)
-    - Refresh patches for new upstream release
-  * Switch buildsystem to pybuild
-  * Replace help2man'd manpages with hand-written ones (Closes: #733569)
-  * Bump Standards-Version to 3.9.5 (no changes)
-  * Introduce new binary packages fedmsg{,-gateway,-relay,-hub,-irc}
-  * Ship initscripts and systemd unit files for the daemons
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sun, 09 Mar 2014 03:04:56 +0100
-
-fedmsg (0.7.1-1) unstable; urgency=low
-
-  [ Simon Chopin ]
-  * New upstream release
-  * Run the tests at build time
-    + Added a patch to work around a missing symlink for the test certificates
-
-  [ Nicolas Dandrimont ]
-  * Add myself to uploaders
-  * Drop requirement on python-fabulous
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sat, 05 Oct 2013 11:37:16 +0200
-
-fedmsg (0.6.8+git20130813.1.60346e0-2) unstable; urgency=low
-
-  * Team upload.
-  * Remove reference to the non-main Google web fonts, recommend the
-    Debian-packaged font instead.
-
- -- Nicolas Dandrimont <olasd at debian.org>  Tue, 13 Aug 2013 23:47:52 +0200
-
-fedmsg (0.6.8+git20130813.1.60346e0-1) unstable; urgency=low
-
-  * Initial release. (Closes: #705953)
-
- -- Simon Chopin <chopin.simon at gmail.com>  Tue, 13 Aug 2013 20:48:02 +0200

Copied: packages/fedmsg/tags/0.9.3-2/debian/changelog (from rev 33942, packages/fedmsg/trunk/debian/changelog)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/changelog	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/changelog	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,82 @@
+fedmsg (0.9.3-2) unstable; urgency=medium
+
+  * Update watch file for new pypi.debian.net redirector
+  * Fix test running for new dh-python (Closes: #795391)
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Fri, 21 Aug 2015 13:54:51 +0200
+
+fedmsg (0.9.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Refresh patches
+  * Install new command /usr/bin/fedmsg-dg-replay in the fedmsg binary
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sat, 23 Aug 2014 08:49:21 -0700
+
+fedmsg (0.8.0-2) unstable; urgency=high
+
+  * Fix init scripts so that the daemons really get launched (Closes: #752895)
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 13 Jul 2014 10:30:13 +0200
+
+fedmsg (0.8.0-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop twitter-related workarounds as twitter was removed upstream
+  * Add GPG signature verification to debian/watch
+  * Update d/copyright
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 18:54:55 +0200
+
+fedmsg (0.7.7-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update the fedmsg-tail manpage to match the upstream changes
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 30 Mar 2014 20:03:33 +0200
+
+fedmsg (0.7.6-2) unstable; urgency=medium
+
+  * Add missing depends on adduser for the packages that add the fedmsg
+    user in postinst
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sat, 29 Mar 2014 08:07:30 +0100
+
+fedmsg (0.7.6-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #738058)
+    - Refresh patches for new upstream release
+  * Switch buildsystem to pybuild
+  * Replace help2man'd manpages with hand-written ones (Closes: #733569)
+  * Bump Standards-Version to 3.9.5 (no changes)
+  * Introduce new binary packages fedmsg{,-gateway,-relay,-hub,-irc}
+  * Ship initscripts and systemd unit files for the daemons
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 09 Mar 2014 03:04:56 +0100
+
+fedmsg (0.7.1-1) unstable; urgency=low
+
+  [ Simon Chopin ]
+  * New upstream release
+  * Run the tests at build time
+    + Added a patch to work around a missing symlink for the test certificates
+
+  [ Nicolas Dandrimont ]
+  * Add myself to uploaders
+  * Drop requirement on python-fabulous
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sat, 05 Oct 2013 11:37:16 +0200
+
+fedmsg (0.6.8+git20130813.1.60346e0-2) unstable; urgency=low
+
+  * Team upload.
+  * Remove reference to the non-main Google web fonts, recommend the
+    Debian-packaged font instead.
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Tue, 13 Aug 2013 23:47:52 +0200
+
+fedmsg (0.6.8+git20130813.1.60346e0-1) unstable; urgency=low
+
+  * Initial release. (Closes: #705953)
+
+ -- Simon Chopin <chopin.simon at gmail.com>  Tue, 13 Aug 2013 20:48:02 +0200

Deleted: packages/fedmsg/tags/0.9.3-2/debian/control
===================================================================
--- packages/fedmsg/trunk/debian/control	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/control	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,145 +0,0 @@
-Source: fedmsg
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Simon Chopin <chopin.simon at gmail.com>,
-           Nicolas Dandrimont <olasd at debian.org>
-Build-Depends: debhelper (>= 9),
-               dh-python,
-               dh-systemd,
-               python-all (>= 2.6.6-3~),
-               python-cloud-sptheme,
-               python-kitchen,
-               python-m2crypto,
-               python-m2ext,
-               python-mock,
-               python-moksha.hub (>= 1.3.0),
-               python-nose,
-               python-pygments,
-               python-requests,
-               python-setuptools,
-               python-six,
-               python-sphinx (>= 1.0.7+dfsg),
-               python-sqlalchemy,
-               python-twisted,
-               python-zmq
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.7
-Homepage: http://fedmsg.com/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/fedmsg/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/fedmsg/trunk/
-
-Package: python-fedmsg
-Architecture: all
-Depends: python-moksha.hub (>= 1.3.0),
-         python-setuptools,
-         python-six,
-         python-zmq (>= 2.2.0.1),
-         ${misc:Depends},
-         ${python:Depends}
-Recommends: python-m2crypto, python-m2ext, python-sqlalchemy
-Suggests: fedmsg, python-fedmsg-doc
-Description: Fedora messaging infrastructure system
- fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
- infrastructure to send and receive messages to and from applications in order
- to allow for asynchronous processes.
- .
- This package provides the fedmsg Python module, allowing native integration
- of fedmsg functionality in Python applications.
-
-Package: python-fedmsg-doc
-Section: doc
-Recommends: python-fedmsg
-Suggests: fonts-comfortaa
-Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: Fedora messaging infrastructure system documentation
- fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
- infrastructure to send and receive messages to and from applications in order
- to allow for asynchronous processes.
- .
- This package provides the documentation for the fedmsg Python package.
-
-Package: fedmsg-hub
-Architecture: all
-Depends: adduser,
-         python-fedmsg (= ${binary:Version}),
-         ${misc:Depends},
-         ${python:Depends}
-Breaks: python-fedmsg (<< 0.7.6-1~)
-Replaces: python-fedmsg (<< 0.7.6-1~)
-Description: Fedora messaging infrastructure system - receiving hub daemon
- fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
- infrastructure to send and receive messages to and from applications in order
- to allow for asynchronous processes.
- .
- This package contains the fedmsg-hub daemon, that provides a pluggable
- infrastructure for listening to the fedmsg bus on a system.
-
-Package: fedmsg-relay
-Architecture: all
-Depends: adduser,
-         python-fedmsg (= ${binary:Version}),
-         ${misc:Depends},
-         ${python:Depends}
-Breaks: python-fedmsg (<< 0.7.6-1~)
-Replaces: python-fedmsg (<< 0.7.6-1~)
-Description: Fedora messaging infrastructure system - sender relay daemon
- fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
- infrastructure to send and receive messages to and from applications in order
- to allow for asynchronous processes.
- .
- This package contains the fedmsg-relay daemon, that provides a single,
- persistent output endpoint for messages sent to the bus by ephemeral
- processes on a system.
-
-Package: fedmsg-gateway
-Architecture: all
-Depends: adduser,
-         python-fedmsg (= ${binary:Version}),
-         ${misc:Depends},
-         ${python:Depends}
-Breaks: python-fedmsg (<< 0.7.6-1~)
-Replaces: python-fedmsg (<< 0.7.6-1~)
-Description: Fedora messaging infrastructure system - gateway daemon
- fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
- infrastructure to send and receive messages to and from applications in order
- to allow for asynchronous processes.
- .
- This package contains the fedmsg-gateway daemon, that aggregates and
- broadcasts the messages received from several incoming endpoints on a
- single outgoing endpoint.
-
-Package: fedmsg-irc
-Architecture: all
-Depends: adduser,
-         python-fedmsg (= ${binary:Version}),
-         ${misc:Depends},
-         ${python:Depends}
-Breaks: python-fedmsg (<< 0.7.6-1~)
-Replaces: python-fedmsg (<< 0.7.6-1~)
-Description: Fedora messaging infrastructure system - IRC bot
- fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
- infrastructure to send and receive messages to and from applications in order
- to allow for asynchronous processes.
- .
- This package contains the fedmsg-irc bot, that sends messages received
- on the bus to an IRC channel.
-
-Package: fedmsg
-Architecture: all
-Depends: python-fedmsg (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
-Breaks: python-fedmsg (<< 0.7.6-1~)
-Replaces: python-fedmsg (<< 0.7.6-1~)
-Description: Fedora messaging infrastructure system - general utilities
- fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
- infrastructure to send and receive messages to and from applications in order
- to allow for asynchronous processes.
- .
- This package contains the following utilities:
-  - fedmsg-announce: send an announcement to the fedmsg bus
-  - fedmsg-collectd: a collectd plugin feeding off fedmsg messages
-  - fedmsg-config: aggregate and dump the fedmsg config to stdout
-  - fedmsg-logger: send a message to the fedmsg bus from the command-line
-  - fedmsg-tail: read messages on the fedmsg bus from the command-line
-  - fedmsg-trigger: trigger a command on receiving an event on the fedmsg bus

Copied: packages/fedmsg/tags/0.9.3-2/debian/control (from rev 30163, packages/fedmsg/trunk/debian/control)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/control	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/control	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,148 @@
+Source: fedmsg
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Simon Chopin <chopin.simon at gmail.com>,
+           Nicolas Dandrimont <olasd at debian.org>
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               dh-systemd,
+               python-all (>= 2.6.6-3~),
+               python-cloud-sptheme,
+               python-kitchen,
+               python-m2crypto,
+               python-m2ext,
+               python-mock,
+               python-moksha.hub (>= 1.3.0),
+               python-nose,
+               python-psutil,
+               python-pygments,
+               python-requests,
+               python-setuptools,
+               python-six,
+               python-sphinx (>= 1.0.7+dfsg),
+               python-sqlalchemy,
+               python-twisted,
+               python-zmq
+Standards-Version: 3.9.5
+X-Python-Version: >= 2.7
+Homepage: http://fedmsg.com/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/fedmsg/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/fedmsg/trunk/
+
+Package: python-fedmsg
+Architecture: all
+Depends: python-moksha.hub (>= 1.3.0),
+         python-setuptools,
+         python-six,
+         python-zmq (>= 2.2.0.1),
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: python-m2crypto, python-m2ext, python-sqlalchemy
+Suggests: fedmsg, python-fedmsg-doc
+Description: Fedora messaging infrastructure system
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package provides the fedmsg Python module, allowing native integration
+ of fedmsg functionality in Python applications.
+
+Package: python-fedmsg-doc
+Section: doc
+Recommends: python-fedmsg
+Suggests: fonts-comfortaa
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Fedora messaging infrastructure system documentation
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package provides the documentation for the fedmsg Python package.
+
+Package: fedmsg-hub
+Architecture: all
+Depends: adduser,
+         python-fedmsg (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: python-fedmsg (<< 0.7.6-1~)
+Replaces: python-fedmsg (<< 0.7.6-1~)
+Description: Fedora messaging infrastructure system - receiving hub daemon
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-hub daemon, that provides a pluggable
+ infrastructure for listening to the fedmsg bus on a system.
+
+Package: fedmsg-relay
+Architecture: all
+Depends: adduser,
+         python-fedmsg (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: python-fedmsg (<< 0.7.6-1~)
+Replaces: python-fedmsg (<< 0.7.6-1~)
+Description: Fedora messaging infrastructure system - sender relay daemon
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-relay daemon, that provides a single,
+ persistent output endpoint for messages sent to the bus by ephemeral
+ processes on a system.
+
+Package: fedmsg-gateway
+Architecture: all
+Depends: adduser,
+         python-fedmsg (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: python-fedmsg (<< 0.7.6-1~)
+Replaces: python-fedmsg (<< 0.7.6-1~)
+Description: Fedora messaging infrastructure system - gateway daemon
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-gateway daemon, that aggregates and
+ broadcasts the messages received from several incoming endpoints on a
+ single outgoing endpoint.
+
+Package: fedmsg-irc
+Architecture: all
+Depends: adduser,
+         python-fedmsg (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: python-fedmsg (<< 0.7.6-1~)
+Replaces: python-fedmsg (<< 0.7.6-1~)
+Description: Fedora messaging infrastructure system - IRC bot
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-irc bot, that sends messages received
+ on the bus to an IRC channel.
+
+Package: fedmsg
+Architecture: all
+Depends: python-fedmsg (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: python-fedmsg (<< 0.7.6-1~)
+Replaces: python-fedmsg (<< 0.7.6-1~)
+Description: Fedora messaging infrastructure system - general utilities
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the following utilities:
+  - fedmsg-announce: send an announcement to the fedmsg bus
+  - fedmsg-collectd: a collectd plugin feeding off fedmsg messages
+  - fedmsg-config: aggregate and dump the fedmsg config to stdout
+  - fedmsg-logger: send a message to the fedmsg bus from the command-line
+  - fedmsg-tail: read messages on the fedmsg bus from the command-line
+  - fedmsg-trigger: trigger a command on receiving an event on the fedmsg bus

Deleted: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-gateway.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-gateway.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-gateway.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-gateway
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg gateway daemon
-# Description:       Gateway daemon for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="gateway daemon for the fedmsg bus"
-NAME=fedmsg-gateway
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-gateway.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-gateway.init)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/fedmsg-gateway.init	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-gateway.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-gateway
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg gateway daemon
+# Description:       Gateway daemon for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="gateway daemon for the fedmsg bus"
+NAME=fedmsg-gateway
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Deleted: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-hub.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-hub.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-hub.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-hub
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg producer/consumer hub daemon
-# Description:       Producer/consumer hub daemon for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="producer/consumer hub daemon for the fedmsg bus"
-NAME=fedmsg-hub
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-hub.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-hub.init)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/fedmsg-hub.init	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-hub.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-hub
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg producer/consumer hub daemon
+# Description:       Producer/consumer hub daemon for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="producer/consumer hub daemon for the fedmsg bus"
+NAME=fedmsg-hub
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Deleted: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-irc.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-irc.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-irc.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-irc
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg IRC bot
-# Description:       IRC bot for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="IRC bot for the fedmsg bus"
-NAME=fedmsg-irc
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-irc.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-irc.init)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/fedmsg-irc.init	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-irc.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-irc
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg IRC bot
+# Description:       IRC bot for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="IRC bot for the fedmsg bus"
+NAME=fedmsg-irc
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Deleted: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-relay.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-relay.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-relay.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-relay
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg relay daemon
-# Description:       Relay daemon for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="relay daemon for the fedmsg bus"
-NAME=fedmsg-relay
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.9.3-2/debian/fedmsg-relay.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-relay.init)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/fedmsg-relay.init	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg-relay.init	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-relay
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg relay daemon
+# Description:       Relay daemon for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="relay daemon for the fedmsg bus"
+NAME=fedmsg-relay
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Deleted: packages/fedmsg/tags/0.9.3-2/debian/fedmsg.install
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg.install	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg.install	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,6 +0,0 @@
-usr/bin/fedmsg-announce
-usr/bin/fedmsg-collectd
-usr/bin/fedmsg-config
-usr/bin/fedmsg-logger
-usr/bin/fedmsg-tail
-usr/bin/fedmsg-trigger

Copied: packages/fedmsg/tags/0.9.3-2/debian/fedmsg.install (from rev 30163, packages/fedmsg/trunk/debian/fedmsg.install)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/fedmsg.install	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg.install	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,7 @@
+usr/bin/fedmsg-announce
+usr/bin/fedmsg-collectd
+usr/bin/fedmsg-config
+usr/bin/fedmsg-dg-replay
+usr/bin/fedmsg-logger
+usr/bin/fedmsg-tail
+usr/bin/fedmsg-trigger

Deleted: packages/fedmsg/tags/0.9.3-2/debian/fedmsg.manpages
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg.manpages	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg.manpages	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,6 +0,0 @@
-debian/manpages/fedmsg-announce.1
-debian/manpages/fedmsg-collectd.1
-debian/manpages/fedmsg-config.1
-debian/manpages/fedmsg-logger.1
-debian/manpages/fedmsg-tail.1
-debian/manpages/fedmsg-trigger.1

Copied: packages/fedmsg/tags/0.9.3-2/debian/fedmsg.manpages (from rev 30228, packages/fedmsg/trunk/debian/fedmsg.manpages)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/fedmsg.manpages	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/fedmsg.manpages	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,7 @@
+debian/manpages/fedmsg-announce.1
+debian/manpages/fedmsg-collectd.1
+debian/manpages/fedmsg-config.1
+debian/manpages/fedmsg-dg-replay.1
+debian/manpages/fedmsg-logger.1
+debian/manpages/fedmsg-tail.1
+debian/manpages/fedmsg-trigger.1

Copied: packages/fedmsg/tags/0.9.3-2/debian/manpages/fedmsg-dg-replay.1 (from rev 30228, packages/fedmsg/trunk/debian/manpages/fedmsg-dg-replay.1)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/manpages/fedmsg-dg-replay.1	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/manpages/fedmsg-dg-replay.1	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,92 @@
+.TH FEDMSG-DG-REPLAY 1
+
+.SH NAME
+fedmsg\-dg\-replay \- replay a message from the datagrepper history on your local bus
+
+.SH SYNOPSIS
+.B fedmsg\-dg\-replay
+.BR "\-\-msg\-id " MSG_ID
+.RB [ "\-\-datagrepper\-url " DATAGREPPER_URL]
+.RI [ "<common fedmsg options>" ]
+.PP
+.B fedmsg\-dg\-replay
+.RB [ \-h | \-\-help ]
+.SH OPTIONS
+.TP
+.BR \-h ", " \-\-help
+Print an help message and exit
+.TP
+.BR "\-\-msg\-id " MSG_ID
+Message id of the message to replay.
+.TP
+.BR "\-\-datagrepper\-url " DATAGREPPER_URL
+URL of a datagrepper instance to query for history.
+
+.SH COMMON FEDMSG OPTIONS
+.TP
+.BR "\-\-io\-threads " IO_THREADS
+Number of io threads for 0mq to use
+.TP
+.BR "\-\-topic\-prefix " TOPIC_PREFIX
+Prefix for the topic of each message sent.
+.TP
+.BR "\-\-post\-init\-sleep " POST_INIT_SLEEP
+Number of seconds to sleep after initializing.
+.TP
+.BR "\-\-config\-filename " CONFIG_FILENAME
+Config file to use.
+.TP
+.BR \-\-print\-config
+Simply print out the configuration and exit. No action taken.
+.TP
+.BR "\-\-timeout " TIMEOUT
+Timeout in seconds for any blocking zmq operations.
+.TP
+.BR "\-\-high\-water\-mark " HIGH_WATER_MARK
+Limit on the number of messages in the queue before
+blocking.
+.TP
+.BR "\-\-linger " ZMQ_LINGER
+Number of milliseconds to wait before timing out connections.
+
+.SH DESCRIPTION
+.PP
+.B fedmsg\-dg-replay
+is an ephemeral command that queries a datagrepper instance for a
+message to send to the local fedmsg bus, through a configured
+.BR fedmsg\-relay (1)
+instance.
+
+The message is stripped of its original credentials. Local credentials are applied if the
+.B sign_messages
+configuration variable is set to True.
+
+.SH SEE ALSO
+.PP
+.BR fedmsg\-relay (1)
+
+.SH AUTHORS
+.TP
+.BR "The Fedora Infrastructure team" " <\&messaging\-sig at lists\&.fedoraproject\&.org\&>"
+.RB "Wrote the " fedmsg " software\&."
+.TP
+.BR "Nicolas Dandrimont" " <\&olasd at debian\&.org\&>"
+Wrote this manpage for the Debian system\&.
+
+.SH COPYRIGHT
+.br
+Copyright \(co 2014 Nicolas Dandrimont
+.br
+.PP
+This manual page was written for the Debian system (and may be used by
+others)\&.
+.PP
+You can redistribute it and/or modify it under the terms of the GNU
+Lesser General Public License as published by the Free Software
+Foundation; either version 2.1 of the License, or (at your option) any
+later version.
+.PP
+On Debian systems, a copy of the license can be found in the
+.I /usr/share/common-licenses/LGPL-2.1
+file.
+.sp

Deleted: packages/fedmsg/tags/0.9.3-2/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
===================================================================
--- packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,20 +0,0 @@
-Description: Replace fedmsg_meta_fedora_infrastructure with fedmsg_meta_debian
-Author: Nicolas Dandrimont <olasd at debian.org>
-Forwarded: not-needed
-
-Index: fedmsg-0.7.6/fedmsg/doc_utilities.py
-===================================================================
---- fedmsg-0.7.6.orig/fedmsg/doc_utilities.py	2013-11-13 23:20:03.000000000 +0100
-+++ fedmsg-0.7.6/fedmsg/doc_utilities.py	2014-03-08 15:10:25.263916431 +0100
-@@ -101,8 +101,9 @@
-     fname = output_dir + "/topics.rst"
- 
-     global outfile
--    import fedmsg_meta_fedora_infrastructure
--    filename = fedmsg_meta_fedora_infrastructure.__file__
-+    return
-+    import fedmsg_meta_debian
-+    filename = fedmsg_meta_debian.__file__
-     folder = os.path.sep + os.path.join(*filename.split('/')[:-1])
-     test_classes = load_classes(folder)
- 

Deleted: packages/fedmsg/tags/0.9.3-2/debian/patches/remove_references_to_external_resources_in_docs.diff
===================================================================
--- packages/fedmsg/trunk/debian/patches/remove_references_to_external_resources_in_docs.diff	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/patches/remove_references_to_external_resources_in_docs.diff	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,58 +0,0 @@
-Description: <short summary of the patch>
-Author: Simon Chopin <chopin.simon at gmail.com>
-Forwarded: not-needed
-
-Index: fedmsg-0.7.6/doc/_static/site.css
-===================================================================
---- fedmsg-0.7.6.orig/doc/_static/site.css	2014-03-09 00:55:16.557560231 +0100
-+++ fedmsg-0.7.6/doc/_static/site.css	2014-03-09 00:55:16.549560637 +0100
-@@ -1,5 +1,4 @@
- @import url("cloud.css");
-- at import url("http://fonts.googleapis.com/css?family=Comfortaa");
- 
- .fedmsg-logo span {
-     background: url("fedmsg.png") no-repeat scroll 0 0 transparent;
-Index: fedmsg-0.7.6/doc/_templates/fedmsg-logo.html
-===================================================================
---- fedmsg-0.7.6.orig/doc/_templates/fedmsg-logo.html	2014-03-09 00:55:16.557560231 +0100
-+++ fedmsg-0.7.6/doc/_templates/fedmsg-logo.html	2014-03-09 00:55:16.549560637 +0100
-@@ -1,3 +1 @@
- <h1 class='fedmsg-logo'><span></span>fedmsg</h1>
--<iframe src="http://ghbtns.com/github-btn.html?user=fedora-infra&repo=fedmsg&type=watch&count=true&size=large"
--    allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
-Index: fedmsg-0.7.6/doc/_templates/page.html
-===================================================================
---- fedmsg-0.7.6.orig/doc/_templates/page.html	2014-03-09 00:55:16.557560231 +0100
-+++ fedmsg-0.7.6/doc/_templates/page.html	2014-03-09 00:55:16.549560637 +0100
-@@ -1,9 +1,4 @@
- {% extends "!page.html" %}
- {% block footer -%}
- {{ super() }}
--<a href="http://github.com/fedora-infra/fedmsg">
--  <img style="position: absolute; top: 0; right: 0; border: 0; max-width: 149px;"
--  src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"
--  alt="Fork me on GitHub">
--</a>
- {%- endblock %}
-Index: fedmsg-0.7.6/doc/proposal.rst
-===================================================================
---- fedmsg-0.7.6.orig/doc/proposal.rst	2013-10-22 21:15:27.000000000 +0200
-+++ fedmsg-0.7.6/doc/proposal.rst	2014-03-09 00:55:44.560140048 +0100
-@@ -154,7 +154,7 @@
- as an example of how Fedora Infrastructure could be reorganized with AMQP
- and a set of federated AMQP brokers (qpid).
- 
--.. image:: https://github.com/fedora-infra/fedmsg/raw/develop/doc/_static/reorganize-amqp-j5.png
-+.. image:: _static/reorganize-amqp-j5.png
- 
- The gist is that each service in the Fedora Infrastructure would have the
- address of a central message broker on hand.  On startup, each service would
-@@ -185,7 +185,7 @@
- organized with a decentralized 0mq bus parallel to the spirit of J5's
- recreated diagram in the AMQP section above.
- 
--.. image:: https://github.com/fedora-infra/fedmsg/raw/develop/doc/_static/reorganize-0mq-overview.png
-+.. image:: _static/reorganize-0mq-overview.png
- 
- No broker.  The gist is that each service will open a port and begin
- publishing messages ("bind to" in zmq-language).  Each other service will

Copied: packages/fedmsg/tags/0.9.3-2/debian/patches/remove_references_to_external_resources_in_docs.diff (from rev 30163, packages/fedmsg/trunk/debian/patches/remove_references_to_external_resources_in_docs.diff)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/patches/remove_references_to_external_resources_in_docs.diff	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/patches/remove_references_to_external_resources_in_docs.diff	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,58 @@
+Description: <short summary of the patch>
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: not-needed
+
+Index: fedmsg-0.7.6/doc/_static/site.css
+===================================================================
+--- fedmsg-0.7.6.orig/doc/_static/site.css	2014-03-09 00:55:16.557560231 +0100
++++ fedmsg-0.7.6/doc/_static/site.css	2014-03-09 00:55:16.549560637 +0100
+@@ -1,5 +1,4 @@
+ @import url("cloud.css");
+- at import url("https://fonts.googleapis.com/css?family=Comfortaa");
+ 
+ .fedmsg-logo span {
+     background: url("fedmsg.png") no-repeat scroll 0 0 transparent;
+Index: fedmsg-0.7.6/doc/_templates/fedmsg-logo.html
+===================================================================
+--- fedmsg-0.7.6.orig/doc/_templates/fedmsg-logo.html	2014-03-09 00:55:16.557560231 +0100
++++ fedmsg-0.7.6/doc/_templates/fedmsg-logo.html	2014-03-09 00:55:16.549560637 +0100
+@@ -1,3 +1 @@
+ <h1 class='fedmsg-logo'><span></span>fedmsg</h1>
+-<iframe src="http://ghbtns.com/github-btn.html?user=fedora-infra&repo=fedmsg&type=watch&count=true&size=large"
+-    allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+Index: fedmsg-0.7.6/doc/_templates/page.html
+===================================================================
+--- fedmsg-0.7.6.orig/doc/_templates/page.html	2014-03-09 00:55:16.557560231 +0100
++++ fedmsg-0.7.6/doc/_templates/page.html	2014-03-09 00:55:16.549560637 +0100
+@@ -1,9 +1,4 @@
+ {% extends "!page.html" %}
+ {% block footer -%}
+ {{ super() }}
+-<a href="https://github.com/fedora-infra/fedmsg">
+-  <img style="position: absolute; top: 0; right: 0; border: 0; max-width: 149px;"
+-  src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"
+-  alt="Fork me on GitHub">
+-</a>
+ {%- endblock %}
+Index: fedmsg-0.7.6/doc/proposal.rst
+===================================================================
+--- fedmsg-0.7.6.orig/doc/proposal.rst	2013-10-22 21:15:27.000000000 +0200
++++ fedmsg-0.7.6/doc/proposal.rst	2014-03-09 00:55:44.560140048 +0100
+@@ -154,7 +154,7 @@
+ as an example of how Fedora Infrastructure could be reorganized with AMQP
+ and a set of federated AMQP brokers (qpid).
+ 
+-.. image:: https://github.com/fedora-infra/fedmsg/raw/develop/doc/_static/reorganize-amqp-j5.png
++.. image:: _static/reorganize-amqp-j5.png
+ 
+ The gist is that each service in the Fedora Infrastructure would have the
+ address of a central message broker on hand.  On startup, each service would
+@@ -185,7 +185,7 @@
+ organized with a decentralized 0mq bus parallel to the spirit of J5's
+ recreated diagram in the AMQP section above.
+ 
+-.. image:: https://github.com/fedora-infra/fedmsg/raw/develop/doc/_static/reorganize-0mq-overview.png
++.. image:: _static/reorganize-0mq-overview.png
+ 
+ No broker.  The gist is that each service will open a port and begin
+ publishing messages ("bind to" in zmq-language).  Each other service will

Deleted: packages/fedmsg/tags/0.9.3-2/debian/patches/series
===================================================================
--- packages/fedmsg/trunk/debian/patches/series	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/patches/series	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,4 +0,0 @@
-default_prefix
-remove_references_to_external_resources_in_docs.diff
-bypass_fedmsg_meta_fedora_infrastructure.patch
-fix_tests_path.diff

Copied: packages/fedmsg/tags/0.9.3-2/debian/patches/series (from rev 30163, packages/fedmsg/trunk/debian/patches/series)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/patches/series	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/patches/series	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,3 @@
+default_prefix
+remove_references_to_external_resources_in_docs.diff
+fix_tests_path.diff

Deleted: packages/fedmsg/tags/0.9.3-2/debian/rules
===================================================================
--- packages/fedmsg/trunk/debian/rules	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/rules	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,46 +0,0 @@
-#!/usr/bin/make -f
-
-UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
-
-%:
-	dh $@ --with python2,sphinxdoc,systemd --buildsystem=pybuild
-
-override_dh_auto_build:
-	dh_auto_build
-	PYTHONPATH=$(CURDIR) sphinx-build doc/ doc/_build/html
-
-override_dh_auto_install:
-	dh_auto_install
-
-	# Grab the fedmsg config
-	mkdir -p debian/tmp/etc/
-	cp -r fedmsg.d debian/tmp/etc/
-
-	# Install the extras
-	mkdir -p debian/tmp/usr/share/fedmsg/
-	cp -r extras debian/tmp/usr/share/fedmsg
-
-	# useless SOURCES.txt files
-	rm debian/tmp/usr/lib/python2*/dist-packages/fedmsg*.egg-info/SOURCES.txt
-
-override_dh_install:
-	dh_install --fail-missing
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf doc/_build/
-	rm -rf fedmsg/tests/fedmsg.d/
-
-override_dh_installchangelogs:
-	dh_installchangelogs -k CHANGELOG.rst
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cp -r fedmsg.d fedmsg/tests/
-	dh_auto_test
-endif
-
-get-orig-source:
-	git clone --bare git://github.com/fedora-infra/fedmsg.git fedmsg-orig.git
-	git --git-dir=fedmsg-orig.git archive $(shell echo $(UPSTREAM) | cut -d + -f 2  | cut -d . -f 3) | gzip > ../fedmsg_$(UPSTREAM).orig.tar.gz
-	rm -rf fedmsg-orig.git

Copied: packages/fedmsg/tags/0.9.3-2/debian/rules (from rev 33941, packages/fedmsg/trunk/debian/rules)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/rules	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/rules	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,48 @@
+#!/usr/bin/make -f
+
+UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
+
+%:
+	dh $@ --with python2,sphinxdoc,systemd --buildsystem=pybuild
+
+override_dh_auto_build:
+	dh_auto_build
+	PYTHONPATH=$(CURDIR) sphinx-build doc/ doc/_build/html
+
+override_dh_auto_install:
+	dh_auto_install
+
+	# Grab the fedmsg config
+	mkdir -p debian/tmp/etc/
+	cp -r fedmsg.d debian/tmp/etc/
+
+	# Install the extras
+	mkdir -p debian/tmp/usr/share/fedmsg/
+	cp -r extras debian/tmp/usr/share/fedmsg
+
+	# useless SOURCES.txt files
+	rm debian/tmp/usr/lib/python2*/dist-packages/fedmsg*.egg-info/SOURCES.txt
+
+override_dh_install:
+	dh_install --fail-missing
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf doc/_build/
+	rm -rf fedmsg/tests/fedmsg.d/
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k CHANGELOG.rst
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	cp -r fedmsg.d/ fedmsg/tests/
+	PYBUILD_SYSTEM=custom \
+	  PYBUILD_TEST_ARGS="{interpreter} setup.py test" \
+	  dh_auto_test
+endif
+
+get-orig-source:
+	git clone --bare git://github.com/fedora-infra/fedmsg.git fedmsg-orig.git
+	git --git-dir=fedmsg-orig.git archive $(shell echo $(UPSTREAM) | cut -d + -f 2  | cut -d . -f 3) | gzip > ../fedmsg_$(UPSTREAM).orig.tar.gz
+	rm -rf fedmsg-orig.git

Deleted: packages/fedmsg/tags/0.9.3-2/debian/watch
===================================================================
--- packages/fedmsg/trunk/debian/watch	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.9.3-2/debian/watch	2015-08-21 11:59:14 UTC (rev 33943)
@@ -1,4 +0,0 @@
-version=3
-
-opts="pgpsigurlmangle=s/$/.asc/" \
-https://pypi.python.org/packages/source/f/fedmsg/fedmsg-(.+).tar.gz

Copied: packages/fedmsg/tags/0.9.3-2/debian/watch (from rev 33939, packages/fedmsg/trunk/debian/watch)
===================================================================
--- packages/fedmsg/tags/0.9.3-2/debian/watch	                        (rev 0)
+++ packages/fedmsg/tags/0.9.3-2/debian/watch	2015-08-21 11:59:14 UTC (rev 33943)
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ \
+http://pypi.debian.net/fedmsg/fedmsg-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file




More information about the Python-modules-commits mailing list