diff -Nru postbooks-updater-2.2.5/debian/changelog postbooks-updater-2.2.5/debian/changelog --- postbooks-updater-2.2.5/debian/changelog 2013-10-07 08:26:52.000000000 +0000 +++ postbooks-updater-2.2.5/debian/changelog 2014-10-18 15:29:41.000000000 +0000 @@ -1,3 +1,27 @@ +postbooks-updater (2.2.5-8) unstable; urgency=low + + * Cumulative upload of fixes from experimental branch. + + -- Daniel Pocock Sat, 18 Oct 2014 17:29:06 +0200 + +postbooks-updater (2.2.5-7) experimental; urgency=low + + * Update patch to explicitly link libMetaSQL. + + -- Daniel Pocock Thu, 25 Sep 2014 09:06:24 +0200 + +postbooks-updater (2.2.5-6) experimental; urgency=low + + * Build against latest qt-client in experimental. + + -- Daniel Pocock Wed, 24 Sep 2014 10:21:27 +0200 + +postbooks-updater (2.2.5-5) unstable; urgency=low + + * Set version on libxtuplecommon-dev dependency + + -- Daniel Pocock Wed, 24 Sep 2014 10:03:33 +0200 + postbooks-updater (2.2.5-4) unstable; urgency=low * Set version on libxtuplecommon-dev dependency diff -Nru postbooks-updater-2.2.5/debian/control postbooks-updater-2.2.5/debian/control --- postbooks-updater-2.2.5/debian/control 2013-10-07 08:25:33.000000000 +0000 +++ postbooks-updater-2.2.5/debian/control 2014-10-18 15:28:22.000000000 +0000 @@ -2,12 +2,12 @@ Section: misc Priority: optional Maintainer: Debian xTuple Maintainers -Uploaders: Andrew Shadura , Daniel Pocock -Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libqt4-dev (>= 4.5.0), libdmtx-dev, libopenrpt-dev, libcsvimp-dev, libqtassistantclient-dev, libqt4-webkit, libz-dev, libqtwebkit-dev, libsqlite3-dev, libxtuplecommon-dev (>= 4.1.0-3) -Standards-Version: 3.9.4 +Uploaders: Andrew Shadura , Daniel Pocock +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libqt4-dev (>= 4.5.0), libdmtx-dev, libopenrpt-dev (>= 3.3.7), libcsvimp-dev (>= 0.5.0), libqtassistantclient-dev, libqt4-webkit, libz-dev, libqtwebkit-dev, libsqlite3-dev, libxtuplecommon-dev (>= 4.7.0~git20140924.1) +Standards-Version: 3.9.6 Homepage: http://www.xtuple.com/postbooks -Vcs-Git: git://git.debian.org/collab-maint/postbooks-updater.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/postbooks-updater.git;a=summary +Vcs-Git: git://anonscm.debian.org/collab-maint/postbooks-updater.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/postbooks-updater.git Package: postbooks-updater Architecture: any diff -Nru postbooks-updater-2.2.5/debian/patches/01-use-packaged-dependencies.patch postbooks-updater-2.2.5/debian/patches/01-use-packaged-dependencies.patch --- postbooks-updater-2.2.5/debian/patches/01-use-packaged-dependencies.patch 2013-09-25 17:01:11.000000000 +0000 +++ postbooks-updater-2.2.5/debian/patches/01-use-packaged-dependencies.patch 2014-10-18 15:27:56.000000000 +0000 @@ -1,5 +1,5 @@ diff --git a/builder/builder.pro b/builder/builder.pro -index fa94a46..e7631ca 100644 +index fa94a46..3627438 100644 --- a/builder/builder.pro +++ b/builder/builder.pro @@ -15,15 +15,15 @@ CONFIG += qt warn_on thread @@ -7,7 +7,7 @@ DESTDIR = ../bin -LIBS += -L../lib -lupdatercommon -L../$${OPENRPT_BLD}/lib -lcommon -lrenderer -+LIBS += -L../lib -lupdatercommon -L$${OPENRPT_BLD} -lcommon -lrenderer ++LIBS += -L../lib -lupdatercommon -L$${OPENRPT_BLD} -lMetaSQL -lrenderer -lopenrptcommon win32-msvc* { PRE_TARGETDEPS += ../lib/updatercommon.lib \ ../$${OPENRPT_BLD}/lib/common.lib \ @@ -16,7 +16,7 @@ PRE_TARGETDEPS += ../$${UPDATER_BLD}/lib/libupdatercommon.a \ - ../$${OPENRPT_BLD}/lib/libcommon.a \ - ../$${OPENRPT_BLD}/lib/librenderer.a -+ $${OPENRPT_BLD}/libcommon.so \ ++ $${OPENRPT_BLD}/libopenrptcommon.so \ + $${OPENRPT_BLD}/librenderer.so } @@ -96,7 +96,7 @@ INCLUDEPATH = $$unique(INCLUDEPATH) diff --git a/loader/loader.pro b/loader/loader.pro -index 2792498..1772524 100644 +index 2792498..aaaf776 100644 --- a/loader/loader.pro +++ b/loader/loader.pro @@ -12,14 +12,14 @@ include( ../global.pri ) @@ -112,7 +112,7 @@ UI_DIR = tmp -LIBS += -L../$${OPENRPT_BLD}/lib -L../$${XTUPLE_BLD}/lib -lxtuplecommon -L../lib -lupdatercommon -lcommon -lrenderer -+LIBS += -L$${OPENRPT_BLD} -L$${XTUPLE_BLD} -lxtuplecommon -L../lib -lupdatercommon -lcommon -lrenderer -lMetaSQL ++LIBS += -L$${OPENRPT_BLD} -L$${XTUPLE_BLD} -lxtuplecommon -L../lib -lupdatercommon -lMetaSQL -lrenderer -lopenrptcommon macx: LIBS += -lz win32-msvc* { @@ -122,7 +122,7 @@ PRE_TARGETDEPS += ../lib/libupdatercommon.a \ - ../$${OPENRPT_BLD}/lib/libcommon.a \ - ../$${OPENRPT_BLD}/lib/librenderer.a -+ $${OPENRPT_BLD}/libcommon.so \ ++ $${OPENRPT_BLD}/libopenrptcommon.so \ + $${OPENRPT_BLD}/librenderer.so }