Merge lp:~michihenning/persistent-cache-cpp/merge-from-devel into lp:persistent-cache-cpp

[Michi Henning]

Merging fixes for autopkg test from devel.

Merging fixes for autopkg test from devel.

[Michi Henning (michihenning)]

Again, for the silo, with the right branch this time :-(

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/persistent-cache-cpp-ci/6/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Top approving, seeing that there are no code changes.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-wily-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/persistent-cache-cpp-ci/7/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-05 00:21:58 +0000
+++ debian/changelog	2015-08-07 11:00:31 +0000
@@ -1,3 +1,11 @@
+persistent-cache-cpp (1.0.3+15.10.20150805-0ubuntu3) UNRELEASED; urgency=medium
+
+  [ Michi Henning ]
+  * Suppressed lintian warning about doxygen's use of jquery.js.
+  * Added missing dependency to autopkg test.
+
+ -- Michi Henning <[e-mail]>  Fri, 07 Aug 2015 13:49:36 +1000
+
 persistent-cache-cpp (1.0.0+15.10.20150805-0ubuntu1) wily; urgency=medium
 
   [ Michi Henning ]
 
=== modified file 'debian/control'
--- debian/control	2015-08-05 00:21:52 +0000
+++ debian/control	2015-08-07 11:00:31 +0000
@@ -25,7 +25,9 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         libleveldb1,
+         libboost-dev,
+         libleveldb-dev,
+         pkg-config,
 Description: Cache of key-value pairs with persistent storage for C++ 11
  A persistent cache for arbitrary (possibly large amount of data, such as
  image files) that is fast, scalable, and crash-proof.
 
=== added file 'debian/persistent-cache-cpp-doc.lintian-overrides'
--- debian/persistent-cache-cpp-doc.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/persistent-cache-cpp-doc.lintian-overrides	2015-08-07 11:00:31 +0000
@@ -0,0 +1,3 @@
+# Nothing we can do about this because, depending on the installed version
+# of jquery.js, the tree widget breaks.
+persistent-cache-cpp-doc: embedded-javascript-library
 
=== modified file 'debian/tests/control'
--- debian/tests/control	2015-07-27 05:46:44 +0000
+++ debian/tests/control	2015-08-07 11:00:31 +0000
@@ -1,2 +1,2 @@
 Tests: test-examples
-Depends: @, g++, libstdc++6, libboost-dev, libleveldb1
+Depends: @, g++, libboost-dev, libleveldb-dev, pkg-config
 
=== modified file 'debian/tests/test-examples'
--- debian/tests/test-examples	2015-07-29 12:44:04 +0000
+++ debian/tests/test-examples	2015-08-07 11:00:31 +0000
@@ -34,3 +34,5 @@
 
 ./string_cache
 ./person_cache
+
+echo "PASSED: autopkg tests"