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.5.0.orig/Makefile
+++ pushpin-1.5.0/Makefile
@@ -1,6 +1,7 @@
-prefix = /usr/local
+INSTALL_ROOT=$(DESTDIR)
+prefix = /usr
 varprefix = /var
-configdir = $(prefix)/etc/pushpin
+configdir = /etc/pushpin
 bindir = $(prefix)/bin
 libdir = $(prefix)/lib/pushpin
 rundir = $(varprefix)/run/pushpin
@@ -38,10 +39,10 @@ make-pushpin-proxy: proxy/Makefile
 	cd proxy && make
 
 m2adapter/Makefile:
-	cd m2adapter && ./configure
+	cd m2adapter && qt-qconf && ./configure
 
 proxy/Makefile:
-	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.5.0.orig/examples/config/internal.conf
+++ pushpin-1.5.0/examples/config/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
--- pushpin-1.5.0.orig/examples/config/pushpin.conf
+++ pushpin-1.5.0/examples/config/pushpin.conf
@@ -8,7 +8,7 @@ rundir=runner/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
@@ -57,7 +57,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.5.0.orig/m2adapter/src/src.pro
+++ pushpin-1.5.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.5.0.orig/proxy/src/app.cpp
+++ pushpin-1.5.0/proxy/src/app.cpp
@@ -274,7 +274,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.5.0.orig/proxy/src/pro/libpushpin-proxy/libpushpin-proxy.pro
+++ pushpin-1.5.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)
--- pushpin-1.5.0.orig/proxy/src/pro/pushpin-proxy/pushpin-proxy.pro
+++ pushpin-1.5.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.5.0.orig/proxy/tests/tests.pri
+++ pushpin-1.5.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)
