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.8.0.orig/examples/config/pushpin.conf
+++ pushpin-1.8.0/examples/config/pushpin.conf
@@ -7,7 +7,7 @@ rundir=run
 
 [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
@@ -53,7 +53,12 @@ upstream_key=
 sockjs_url=http://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js
 
 # output log message when a new version of pushpin is available
-updates_check=true
+#
+# NOTE: Upstream enables this feature by default. The debian package
+# disables it for privacy reasons. As automatic checks for updated
+# versions can be useful, please consider to enable it by setting
+# updates_check to true.
+updates_check=false
 
 
 [handler]
--- pushpin-1.8.0.orig/src/proxy/app.cpp
+++ pushpin-1.8.0/src/proxy/app.cpp
@@ -196,7 +196,7 @@ public:
 		QByteArray sigKey = parse_key(settings.value("proxy/sig_key").toString());
 		QByteArray upstreamKey = parse_key(settings.value("proxy/upstream_key").toString());
 		QString sockJsUrl = settings.value("proxy/sockjs_url").toString();
-		bool updatesCheck = settings.value("proxy/updates_check", true).toBool();
+		bool updatesCheck = settings.value("proxy/updates_check", false).toBool();
 
 		QList<QByteArray> origHeadersNeedMark;
 		foreach(const QString &s, origHeadersNeedMarkStr)
--- pushpin-1.8.0.orig/src/pushpin/internal.conf
+++ pushpin-1.8.0/src/pushpin/internal.conf
@@ -9,13 +9,13 @@ m2a_in_stream_specs=ipc://{rundir}/pushp
 m2a_out_specs=ipc://{rundir}/pushpin-m2zhttp-in,ipc://{rundir}/pushpin-m2zws-in
 
 # list of connect PUSH for sending zurl HTTP/WS requests
-zurl_out_specs=ipc://{rundir}/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://{rundir}/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://{rundir}/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://{rundir}/pushpin-inspect
