[sdformat] 04/07: Update debian files to new major 3.x prerelease

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository sdformat.

commit 9a55e7a4105f696918f731d846400d1d584ba354
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Jul 15 02:20:20 2015 +0000

    Update debian files to new major 3.x prerelease
---
 debian/changelog                                    |  7 +++++++
 debian/control                                      | 12 +++++++-----
 .../{libsdformat2.install => libsdformat3.install}  |  0
 debian/patches/0001-avoid-network-needed-test.patch | 21 ---------------------
 debian/patches/series                               |  1 -
 debian/rules                                        |  2 +-
 6 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8107f4..a9ada4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sdformat (3.0.0~pre3.0.6-1-1) trusty; urgency=medium
+
+  * Update watch file
+  * Imported Upstream version 3.0.0~pre3.0.6-1
+
+ -- Jose Luis Rivero <jrivero at osrfoundation.org>  Wed, 15 Jul 2015 04:13:57 +0200
+
 sdformat (2.3.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 896a0ff..aaff990 100644
--- a/debian/control
+++ b/debian/control
@@ -20,12 +20,13 @@ Build-Depends: cmake,
                texlive-base,
                texlive-fonts-recommended,
                texlive-latex-extra,
-               ruby | ruby-interpreter
+               ruby | ruby-interpreter,
+               libignition-math2-dev
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/sdformat.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/sdformat.git
 Homepage: http://sdformat.org
 
-Package: libsdformat2
+Package: libsdformat3
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
@@ -53,7 +54,8 @@ Depends: libboost-system-dev,
          libboost-regex-dev,
          libtinyxml-dev,
          liburdfdom-dev,
-         libsdformat2 (= ${binary:Version}),
+         libignition-math2-dev,
+         libsdformat3 (= ${binary:Version}),
          ${misc:Depends}
 Multi-Arch: same
 Description: Simulation Description Format (SDF) parser - Development files
@@ -86,12 +88,12 @@ Description: Simulation Description Format (SDF) parser - SDF files
  This package contains SDF (Simulation Description Format) XML files needed by
  the libsdformat.
  
-Package: libsdformat2-dbg
+Package: libsdformat3-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends:
-     libsdformat2 (= ${binary:Version}),
+     libsdformat3 (= ${binary:Version}),
      ${misc:Depends}
 Multi-Arch: same
 Description: Simulation Description Format (SDF) parser - Debugging symbols
diff --git a/debian/libsdformat2.install b/debian/libsdformat3.install
similarity index 100%
rename from debian/libsdformat2.install
rename to debian/libsdformat3.install
diff --git a/debian/patches/0001-avoid-network-needed-test.patch b/debian/patches/0001-avoid-network-needed-test.patch
deleted file mode 100644
index cb359ad..0000000
--- a/debian/patches/0001-avoid-network-needed-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: remove test that uses networking
-Forwarded: not-needed
-
-diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
-index fb9c7e3..40d1e40 100644
---- a/test/integration/CMakeLists.txt
-+++ b/test/integration/CMakeLists.txt
-@@ -10,13 +10,9 @@ set(tests
-   plugin_attribute.cc
-   plugin_bool.cc
-   provide_feedback.cc
--  schema_test.cc
-   urdf_joint_parameters.cc
- )
- 
- link_directories(${PROJECT_BINARY_DIR}/test)
- 
- sdf_build_tests(${tests})
--
--# Need to run schema target (build .xsd files) before running schema_test
--add_dependencies(${TEST_TYPE}_schema_test schema)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e6dcb14..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-avoid-network-needed-test.patch
diff --git a/debian/rules b/debian/rules
index c43f96b..0b01fd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,4 +17,4 @@ override_dh_auto_test:
 	HOME=$(CURDIR) LC_ALL=POSIX dh_auto_test
 
 override_dh_strip:
-	dh_strip -a --dbg-package=libsdformat2-dbg
+	dh_strip -a --dbg-package=libsdformat3-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git