This patch contains the differences between the upstream tarball and
the sources actually used for building the package.

Option single-debian-patch is used as the changes are tracked in git.


--- pushpin-1.0.0.orig/Makefile
+++ pushpin-1.0.0/Makefile
@@ -1,6 +1,7 @@
-prefix = /usr/local
-varprefix = /var/local
-configdir = $(prefix)/etc/pushpin
+INSTALL_ROOT=$(DESTDIR)
+prefix = /usr
+varprefix = /var
+configdir = /etc/pushpin
 bindir = $(prefix)/bin
 libdir = $(prefix)/lib/pushpin
 rundir = $(varprefix)/run/pushpin
@@ -35,10 +36,10 @@ make-pushpin-proxy: proxy/conf.pri
 	cd proxy && make
 
 m2adapter/conf.pri:
-	cd m2adapter && ./configure
+	cd m2adapter && qt-qconf && ./configure
 
 proxy/conf.pri:
-	cd proxy && ./configure
+	cd proxy && qt-qconf && ./configure
 
 pushpin.inst: pushpin
 	sed -e "s,^default_config_dir =.*,default_config_dir = \"$(configdir)\",g" pushpin > pushpin.inst && chmod 755 pushpin.inst
--- pushpin-1.0.0.orig/runner/m2adapter.conf.template
+++ pushpin-1.0.0/runner/m2adapter.conf.template
@@ -12,22 +12,22 @@ m2_send_idents={% for i in instances %}{
 m2_control_specs={% for i in instances %}{% if not loop.first %},{% endif %}{{ i.control_spec }}{% endfor %}
 
 # zhttp in specs
-zhttp_in_specs=ipc:///tmp/pushpin-m2zhttp-in
+zhttp_in_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-in
 
 # zhttp out specs
-zhttp_out_specs=ipc:///tmp/pushpin-m2zhttp-out
+zhttp_out_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-out
 
 # zhttp out stream specs
-zhttp_out_stream_specs=ipc:///tmp/pushpin-m2zhttp-out-stream
+zhttp_out_stream_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-out-stream
 
 # zws in specs
-zws_in_specs=ipc:///tmp/pushpin-m2zws-in
+zws_in_specs=ipc:///var/run/pushpin/pushpin-m2zws-in
 
 # zws out specs
-zws_out_specs=ipc:///tmp/pushpin-m2zws-out
+zws_out_specs=ipc:///var/run/pushpin/pushpin-m2zws-out
 
 # zws out stream specs
-zws_out_stream_specs=ipc:///tmp/pushpin-m2zws-out-stream
+zws_out_stream_specs=ipc:///var/run/pushpin/pushpin-m2zws-out-stream
 
 # don't send more than this to mongrel2
 m2_client_buffer=200000
--- pushpin-1.0.0.orig/runner/services.py
+++ pushpin-1.0.0/runner/services.py
@@ -50,10 +50,10 @@ def write_m2adapter_config(configpath, r
 	instances = list()
 	for port in ports:
 		i = dict()
-		i["send_spec"] = "ipc:///tmp/pushpin-m2-out-" + str(port)
-		i["recv_spec"] = "ipc:///tmp/pushpin-m2-in-" + str(port)
+		i["send_spec"] = "ipc:///var/run/pushpin/pushpin-m2-out-" + str(port)
+		i["recv_spec"] = "ipc:///var/run/pushpin/pushpin-m2-in-" + str(port)
 		i["send_ident"] = "pushpin-m2-" + str(port)
-		i["control_spec"] = "ipc:///tmp/pushpin-m2-control-" + str(port)
+		i["control_spec"] = "ipc:///var/run/pushpin/pushpin-m2-control-" + str(port)
 		instances.append(i)
 
 	vars = dict()
--- pushpin-1.0.0.orig/runner/zurl.conf
+++ pushpin-1.0.0/runner/zurl.conf
@@ -3,13 +3,13 @@
 instance_id=
 
 # bind PULL for initiating a request
-in_spec=ipc:///tmp/pushpin-zurl-in
+in_spec=ipc:///var/run/pushpin/pushpin-zurl-in
 
 # bind DEALER for continuing a request
-in_stream_spec=ipc:///tmp/pushpin-zurl-in-stream
+in_stream_spec=ipc:///var/run/pushpin/pushpin-zurl-in-stream
 
 # bind PUB for responding
-out_spec=ipc:///tmp/pushpin-zurl-out
+out_spec=ipc:///var/run/pushpin/pushpin-zurl-out
 
 # bind ROUTER for handling non-streamed requests/responses
 in_req_spec=
--- pushpin-1.0.0.orig/runner/mongrel2.conf.template
+++ pushpin-1.0.0/runner/mongrel2.conf.template
@@ -1,7 +1,7 @@
 {% for port in ports %}handler_{{ port.value }} = Handler(
-	send_spec="ipc:///tmp/pushpin-m2-out-{{ port.value }}",
+	send_spec="ipc:///var/run/pushpin/pushpin-m2-out-{{ port.value }}",
 	send_ident="pushpin-m2-{{ port.value }}",
-	recv_spec="ipc:///tmp/pushpin-m2-in-{{ port.value }}",
+	recv_spec="ipc:///var/run/pushpin/pushpin-m2-in-{{ port.value }}",
 	recv_ident="pushpin-m2-{{ port.value }} " # trailing space needed
 )
 
@@ -13,7 +13,7 @@
 	access_log="{{ logdir }}/access_{{ port.value }}.log",
 	error_log="{{ logdir }}/error_{{ port.value }}.log",
 	pid_file="{{ rundir }}/mongrel2_{{ port.value }}.pid",
-	control_port="ipc:///tmp/pushpin-m2-control-{{ port.value }}",
+	control_port="ipc:///var/run/pushpin/pushpin-m2-control-{{ port.value }}",
 	default_host="default",
 	name="server-{{ port.value }}",
 	port={{ port.value }},
--- pushpin-1.0.0.orig/config/internal.conf
+++ pushpin-1.0.0/config/internal.conf
@@ -1,68 +1,68 @@
 [proxy]
 # list of connect PULL for receiving mongrel2 HTTP/WS requests
-m2a_in_specs=ipc:///tmp/pushpin-m2zhttp-out,ipc:///tmp/pushpin-m2zws-out
+m2a_in_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-out,ipc:///var/run/pushpin/pushpin-m2zws-out
 
 # list of connect DEALER for continuing mongrel2 HTTP/WS requests
-m2a_in_stream_specs=ipc:///tmp/pushpin-m2zhttp-out-stream,ipc:///tmp/pushpin-m2zws-out-stream
+m2a_in_stream_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-out-stream,ipc:///var/run/pushpin/pushpin-m2zws-out-stream
 
 # list of connect PUB for sending mongrel2 HTTP/WS responses
-m2a_out_specs=ipc:///tmp/pushpin-m2zhttp-in,ipc:///tmp/pushpin-m2zws-in
+m2a_out_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-in,ipc:///var/run/pushpin/pushpin-m2zws-in
 
 # list of connect PUSH for sending zurl HTTP/WS requests
-zurl_out_specs=ipc:///tmp/pushpin-zurl-in
+zurl_out_specs=ipc:///var/run/zurl/zurl-in
 
 # list of connect ROUTER for continuing zurl HTTP/WS requests
-zurl_out_stream_specs=ipc:///tmp/pushpin-zurl-in-stream
+zurl_out_stream_specs=ipc:///var/run/zurl/zurl-in-stream
 
 # list of connect SUB for receiving zurl HTTP/WS responses
-zurl_in_specs=ipc:///tmp/pushpin-zurl-out
+zurl_in_specs=ipc:///var/run/zurl/zurl-out
 
 # bind DEALER for requesting inspection info (internal, used with handler)
-handler_inspect_spec=ipc:///tmp/pushpin-inspect
+handler_inspect_spec=ipc:///var/run/pushpin/pushpin-inspect
 
 # bind PULL for receiving retry requests (internal, used with handler)
-handler_retry_in_spec=ipc:///tmp/pushpin-retry
+handler_retry_in_spec=ipc:///var/run/pushpin/pushpin-retry
 
 # bind PUSH for passing off requests (internal, used with handler)
-handler_accept_out_spec=ipc:///tmp/pushpin-accept
+handler_accept_out_spec=ipc:///var/run/pushpin/pushpin-accept
 
 # bind PULL for reading handler WS control messages
-handler_ws_control_in_spec=ipc:///tmp/pushpin-ws-control-in
+handler_ws_control_in_spec=ipc:///var/run/pushpin/pushpin-ws-control-in
 
 # bind PUSH for writing handler WS control messages
-handler_ws_control_out_spec=ipc:///tmp/pushpin-ws-control-out
+handler_ws_control_out_spec=ipc:///var/run/pushpin/pushpin-ws-control-out
 
 # bind PUB for sending stats
-stats_spec=ipc:///tmp/pushpin-proxy-stats
+stats_spec=ipc:///var/run/pushpin/pushpin-proxy-stats
 
 # bind REP for responding to commands
-command_spec=ipc:///tmp/pushpin-proxy-command
+command_spec=ipc:///var/run/pushpin/pushpin-proxy-command
 
 
 [handler]
 # connect REP for responding with inspection info (internal, used with proxy)
-proxy_inspect_spec=ipc:///tmp/pushpin-inspect
+proxy_inspect_spec=ipc:///var/run/pushpin/pushpin-inspect
 
 # connect PUSH for sending HTTP requests (internal, used with proxy)
-proxy_retry_out_spec=ipc:///tmp/pushpin-retry
+proxy_retry_out_spec=ipc:///var/run/pushpin/pushpin-retry
 
 # connect PULL for receiving HTTP requests (internal, used with proxy)
-proxy_accept_in_spec=ipc:///tmp/pushpin-accept
+proxy_accept_in_spec=ipc:///var/run/pushpin/pushpin-accept
 
 # bind PULL for reading proxy WS control messages
-proxy_ws_control_in_spec=ipc:///tmp/pushpin-ws-control-out
+proxy_ws_control_in_spec=ipc:///var/run/pushpin/pushpin-ws-control-out
 
 # bind PUSH for writing proxy WS control messages
-proxy_ws_control_out_spec=ipc:///tmp/pushpin-ws-control-in
+proxy_ws_control_out_spec=ipc:///var/run/pushpin/pushpin-ws-control-in
 
 # connect SUB for receiving stats from proxy
-proxy_stats_spec=ipc:///tmp/pushpin-proxy-stats
+proxy_stats_spec=ipc:///var/run/pushpin/pushpin-proxy-stats
 
 # connect DEALER for sending commands to proxy
-proxy_command_spec=ipc:///tmp/pushpin-proxy-command
+proxy_command_spec=ipc:///var/run/pushpin/pushpin-proxy-command
 
 # list of connect DEALER for continuing mongrel2 HTTP/WS requests
-m2a_in_stream_specs=ipc:///tmp/pushpin-m2zhttp-out-stream,ipc:///tmp/pushpin-m2zws-out-stream
+m2a_in_stream_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-out-stream,ipc:///var/run/pushpin/pushpin-m2zws-out-stream
 
 # list of connect PUB for sending mongrel2 HTTP/WS responses
-m2a_out_specs=ipc:///tmp/pushpin-m2zhttp-in,ipc:///tmp/pushpin-m2zws-in
+m2a_out_specs=ipc:///var/run/pushpin/pushpin-m2zhttp-in,ipc:///var/run/pushpin/pushpin-m2zws-in
--- pushpin-1.0.0.orig/config/pushpin.conf
+++ pushpin-1.0.0/config/pushpin.conf
@@ -5,7 +5,7 @@ include=internal.conf
 
 [runner]
 # services to start
-services=mongrel2,m2adapter,zurl,pushpin-proxy,pushpin-handler
+services=mongrel2,m2adapter,pushpin-proxy,pushpin-handler
 
 # plain HTTP port that mongrel2 should listen on
 http_port=7999
@@ -63,7 +63,7 @@ push_in_http_addr=127.0.0.1
 push_in_http_port=5561
 
 # bind PUB for sending stats (metrics, subscription info, etc)
-stats_spec=ipc:///tmp/pushpin-stats
+stats_spec=ipc:///var/run/pushpin/pushpin-stats
 
 # bind REP for responding to commands
-command_spec=ipc:///tmp/pushpin-command
+command_spec=ipc:///var/run/pushpin/pushpin-command
--- pushpin-1.0.0.orig/m2adapter/src/src.pro
+++ pushpin-1.0.0/m2adapter/src/src.pro
@@ -15,3 +15,8 @@ unix:!isEmpty(BINDIR) {
 	target.path = $$BINDIR
 	INSTALLS += target
 }
+
+QMAKE_CXXFLAGS += $(Q_CXXFLAGS)
+QMAKE_CFLAGS_DEBUG += $(Q_CFLAGS)
+QMAKE_CFLAGS_RELEASE += $(Q_CFLAGS)
+QMAKE_LFLAGS += $(Q_LDFLAGS)
--- pushpin-1.0.0.orig/proxy/tests/tests.pri
+++ pushpin-1.0.0/proxy/tests/tests.pri
@@ -18,3 +18,8 @@ INCLUDEPATH += $$QZMQ_DIR/src
 
 INCLUDEPATH += $$COMMON_DIR
 DEFINES += NO_IRISNET
+
+QMAKE_CXXFLAGS += $(Q_CXXFLAGS)
+QMAKE_CFLAGS_DEBUG += $(Q_CFLAGS)
+QMAKE_CFLAGS_RELEASE += $(Q_CFLAGS)
+QMAKE_LFLAGS += $(Q_LDFLAGS)
--- pushpin-1.0.0.orig/proxy/src/pro/pushpin-proxy/pushpin-proxy.pro
+++ pushpin-1.0.0/proxy/src/pro/pushpin-proxy/pushpin-proxy.pro
@@ -18,3 +18,8 @@ unix:!isEmpty(BINDIR) {
 	target.path = $$BINDIR
 	INSTALLS += target
 }
+
+QMAKE_CXXFLAGS += $(Q_CXXFLAGS)
+QMAKE_CFLAGS_DEBUG += $(Q_CFLAGS)
+QMAKE_CFLAGS_RELEASE += $(Q_CFLAGS)
+QMAKE_LFLAGS += $(Q_LDFLAGS)
--- pushpin-1.0.0.orig/proxy/src/pro/libpushpin-proxy/libpushpin-proxy.pro
+++ pushpin-1.0.0/proxy/src/pro/libpushpin-proxy/libpushpin-proxy.pro
@@ -11,3 +11,8 @@ OBJECTS_DIR = $$OUT_PWD/_obj
 
 include($$OUT_PWD/../../../conf.pri)
 include(libpushpin-proxy.pri)
+
+QMAKE_CXXFLAGS += $(Q_CXXFLAGS)
+QMAKE_CFLAGS_DEBUG += $(Q_CFLAGS)
+QMAKE_CFLAGS_RELEASE += $(Q_CFLAGS)
+QMAKE_LFLAGS += $(Q_LDFLAGS)
