[libcmis] 24/40: Imported Debian patch 0.5.0-3

Tue Sep 13 02:52:07 UTC 2016

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

rene pushed a commit to branch master
in repository libcmis.

commit 9b76f38c8524ae9b299716709e293dbf5deba0ce
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Aug 4 14:00:05 2015 +0000

    Imported Debian patch 0.5.0-3
---
 debian/changelog                                   | 10 ++++++++++
 debian/control                                     |  7 ++++---
 debian/libcmis-0.5-5.postinst.debhelper            |  5 +++++
 debian/libcmis-0.5-5.postrm.debhelper              |  5 +++++
 debian/libcmis-0.5-5.shlibs                        |  3 ---
 debian/libcmis-0.5-5.substvars                     |  2 ++
 ...bcmis-0.5-5.install => libcmis-0.5-5v5.install} |  0
 debian/libcmis-0.5-5v5.shlibs                      |  2 ++
 debian/patches/avoid-use-after-delete.patch        | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 ++++
 11 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1171e8f..64b89aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libcmis (0.5.0-3) unstable; urgency=medium
+
+  * libstdc++6 transition: rename libcmis-0.5-5 to libcmis-0.5-5v5.
+  * bump libcppunit-dev build-dep
+
+  * merge from Ubuntu:
+    - Add avoid-use-after-delete.patch to fix test-failure
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 04 Aug 2015 14:00:05 +0000
+
 libcmis (0.5.0-2) unstable; urgency=low
 
   * update boost.m4 to fix build with gcc-5 (closes: #777942)
diff --git a/debian/control b/debian/control
index 61af145..54524b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libcmis
 Priority: optional
 Maintainer: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, libxml2-dev, libboost-dev, libboost-program-options-dev, libcurl4-gnutls-dev, libcppunit-dev, docbook-to-man, libboost-date-time-dev, dpkg-dev (>= 1.16.1), pkg-config, dh-autoreconf
+BuIld-Depends: debhelper (>= 8.0.0), autotools-dev, libxml2-dev, libboost-dev, libboost-program-options-dev, libcurl4-gnutls-dev, libcppunit-dev (= 1.13.2-2.1), docbook-to-man, libboost-date-time-dev, dpkg-dev (>= 1.16.1), pkg-config, dh-autoreconf
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://libcmis.sourceforge.net/
@@ -9,7 +9,7 @@ Homepage: http://libcmis.sourceforge.net/
 Package: libcmis-dev
 Section: libdevel
 Architecture: any
-Depends: libcmis-0.5-5 (= ${binary:Version}), ${misc:Depends}, libcurl4-gnutls-dev, libxml2-dev
+Depends: libcmis-0.5-5v5 (= ${binary:Version}), ${misc:Depends}, libcurl4-gnutls-dev, libxml2-dev
 Description: CMIS protocol client library -- development
  LibCMIS is a C++ client library for the CMIS interface.
  .
@@ -18,10 +18,11 @@ Description: CMIS protocol client library -- development
  .
  This package contains the development files (headers, ...) for libcmis.
 
-Package: libcmis-0.5-5
+Package: libcmis-0.5-5v5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libcmis-0.5-5
 Description: CMIS protocol client library
  LibCMIS is a C++ client library for the CMIS interface.
  .
diff --git a/debian/libcmis-0.5-5.postinst.debhelper b/debian/libcmis-0.5-5.postinst.debhelper
new file mode 100644
index 0000000..3d89d3e
--- /dev/null
+++ b/debian/libcmis-0.5-5.postinst.debhelper
@@ -0,0 +1,5 @@
+# Automatically added by dh_makeshlibs
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+# End automatically added section
diff --git a/debian/libcmis-0.5-5.postrm.debhelper b/debian/libcmis-0.5-5.postrm.debhelper
new file mode 100644
index 0000000..7f44047
--- /dev/null
+++ b/debian/libcmis-0.5-5.postrm.debhelper
@@ -0,0 +1,5 @@
+# Automatically added by dh_makeshlibs
+if [ "$1" = "remove" ]; then
+	ldconfig
+fi
+# End automatically added section
diff --git a/debian/libcmis-0.5-5.shlibs b/debian/libcmis-0.5-5.shlibs
deleted file mode 100644
index de4b54c..0000000
--- a/debian/libcmis-0.5-5.shlibs
+++ /dev/null
@@ -1,3 +0,0 @@
-libcmis-0.5	5	libcmis-0.5-5
-libcmis-c-0.5	5	libcmis-0.5-5
-
diff --git a/debian/libcmis-0.5-5.substvars b/debian/libcmis-0.5-5.substvars
new file mode 100644
index 0000000..23f10bb
--- /dev/null
+++ b/debian/libcmis-0.5-5.substvars
@@ -0,0 +1,2 @@
+shlibs:Depends=libboost-date-time1.55.0, libc6 (>= 2.14), libcmis-0.5-5, libcurl3-gnutls (>= 7.16.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.9), libxml2 (>= 2.7.4)
+misc:Depends=
diff --git a/debian/libcmis-0.5-5.install b/debian/libcmis-0.5-5v5.install
similarity index 100%
rename from debian/libcmis-0.5-5.install
rename to debian/libcmis-0.5-5v5.install
diff --git a/debian/libcmis-0.5-5v5.shlibs b/debian/libcmis-0.5-5v5.shlibs
new file mode 100644
index 0000000..696c26f
--- /dev/null
+++ b/debian/libcmis-0.5-5v5.shlibs
@@ -0,0 +1,2 @@
+libcmis-0.5	5	libcmis-0.5-5v5
+libcmis-c-0.5	5	libcmis-0.5-5v5
diff --git a/debian/patches/avoid-use-after-delete.patch b/debian/patches/avoid-use-after-delete.patch
new file mode 100644
index 0000000..ccbea04
--- /dev/null
+++ b/debian/patches/avoid-use-after-delete.patch
@@ -0,0 +1,23 @@
+From 58130d0f774242da1177ae2f77a711e7aaa8ab7d Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 26 Feb 2015 14:48:27 +0100
+Subject: [PATCH] avoid use-after-delete
+
+---
+ qa/mockup/mockup-config.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qa/mockup/mockup-config.cxx b/qa/mockup/mockup-config.cxx
+index 7918cef..01fec24 100644
+--- a/qa/mockup/mockup-config.cxx
++++ b/qa/mockup/mockup-config.cxx
+@@ -49,7 +49,7 @@ namespace
+         }
+     }
+ 
+-    const char** lcl_toStringArray( vector< string > vect )
++    const char** lcl_toStringArray( const vector< string >& vect )
+     {
+         const char** array = new const char*[vect.size() + 1];
+         for ( size_t i = 0; i < vect.size( ); i++ )
+
diff --git a/debian/patches/series b/debian/patches/series
index 790a917..43da49d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-docbook-to-man-call.diff
 update_boost_m4.diff
+avoid-use-after-delete.patch
diff --git a/debian/rules b/debian/rules
index fa8c7ee..0644059 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,11 @@ override_dh_clean:
 	dh_clean
 
 override_dh_auto_configure:
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	dh_auto_configure -- --disable-tests --disable-long-tests --disable-werror --disable-silent-rules
+else
 	dh_auto_configure -- --disable-long-tests --disable-werror --disable-silent-rules
+endif
 
 override_dh_auto_build:
 	$(MAKE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libcmis.git

