Merge lp:~autopilot/xpathselect/update-for-1.3 into lp:xpathselect

[Thomi Richards]

Update xpathselect with new API for 1.3 series.

Update of xpathselect for 1.3

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/xpathselect-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/xpathselect-raring-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/xpathselect-raring-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/xpathselect-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/xpathselect-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-raring-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/xpathselect-raring-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/xpathselect-ci/2/rebuild

review: Approve (continuous-integration)

[lp:~autopilot/xpathselect/update-for-1.3]

38. By Christopher Lee on 2013-04-18

Update changelog

[Michael Terry (mterry)]

Looks good!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-02-11 19:49:18 +0000
+++ CMakeLists.txt	2013-04-18 23:14:25 +0000
@@ -6,7 +6,7 @@
 
 include (GNUInstallDirs)
 
-set (VERSION 1.2)
+set (VERSION 1.3)
 
 if(CMAKE_BUILD_TYPE STREQUAL "coverage")
   message("Building for coverage")

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-25 11:05:39 +0000
+++ debian/changelog	2013-04-18 23:14:25 +0000
@@ -1,3 +1,9 @@
+xpathselect (1.3) UNRELEASED; urgency=low
+
+  * Bump version number
+
+ -- Christopher Lee <[e-mail]>  Thu, 18 Apr 2013 14:08:13 +1200
+
 xpathselect (1.2~daily13.02.25-0ubuntu1) raring; urgency=low
 
   [ Thomi Richards ]

=== modified file 'debian/control'
--- debian/control	2013-02-11 19:49:18 +0000
+++ debian/control	2013-04-18 23:14:25 +0000
@@ -20,14 +20,14 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libxpathselect1.2 (= ${binary:Version}),
+         libxpathselect1.3 (= ${binary:Version}),
 Description: Select objects in an object tree using XPath queries - development files
  This library allows you to select arbitrary objects in an object tree using a
  small subset of the XPath specification.
  .
  This package contains development files for xpathselect.
 
-Package: libxpathselect1.2
+Package: libxpathselect1.3
 Section: libs
 Architecture: any
 Multi-Arch: same

=== renamed file 'debian/libxpathselect1.2.install' => 'debian/libxpathselect1.3.install'
=== modified file 'lib/node.h'
--- lib/node.h	2012-08-10 04:06:05 +0000
+++ lib/node.h	2013-04-18 23:14:25 +0000
@@ -34,6 +34,9 @@
         /// Get the node's name.
         virtual std::string GetName() const =0;
 
+        /// Get the node's full path
+        virtual std::string GetPath() const =0;
+
         /// Return true if the node matches the property with the given name & value
         ///\note: All property values are treated as strings. It is the implementors
         /// responsibility to convert the value to the appropriate type.

=== modified file 'test/dummynode.h'
--- test/dummynode.h	2012-08-10 04:06:05 +0000
+++ test/dummynode.h	2013-04-18 23:14:25 +0000
@@ -35,6 +35,11 @@
         return name_;
     }
 
+    std::string GetPath() const override
+    {
+        return std::string();
+    }
+
     void SetName(std::string const& name)
     {
         name_ = name;