[muparser] 01/02: Revert SONAME; debian/copyright format changed to DEP-5; Updated debian/libmuparser2v5.symbols
Scott Sheridan Howard
showard at moszumanska.debian.org
Sun Aug 23 17:49:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
showard pushed a commit to branch master
in repository muparser.
commit 1d3f3c70afd526c7c790bbe5aa1dcecc6c7911c3
Author: Scott Howard <showard314 at gmail.com>
Date: Sun Aug 23 13:46:31 2015 -0400
Revert SONAME; debian/copyright format changed to DEP-5; Updated debian/libmuparser2v5.symbols
---
debian/changelog | 9 ++++++++
debian/control | 2 ++
debian/copyright | 41 ++++++++++++++++++++++--------------
debian/libmuparser2v5.install | 2 +-
debian/libmuparser2v5.symbols | 16 ++++++++++-----
debian/patches/gcc5.patch | 48 -------------------------------------------
debian/patches/series | 1 -
7 files changed, 49 insertions(+), 70 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 22758f9..a4c6af6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+muparser (2.2.3-6) unstable; urgency=medium
+
+ * Merge to unstable
+ - Revert SONAME
+ * debian/copyright format changed to DEP-5
+ * Updated debian/libmuparser2v5.symbols
+
+ -- Scott Howard <showard at debian.org> Sun, 23 Aug 2015 09:50:36 -0400
+
muparser (2.2.3-5) experimental; urgency=medium
* Bump SONAME for GCC 5 transition
diff --git a/debian/control b/debian/control
index bbb116c..4665e77 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libmuparser2
+Replaces: libmuparser2
Description: fast mathematical expressions parser library (runtime)
muParser is a high performance mathematical parser library, written in pure
C++. It is based on transforming an expression into a bytecode and
diff --git a/debian/copyright b/debian/copyright
index 7bfc947..38efe96 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,21 @@
-This package was debianized by Gudjon I. Gudjonsson <gudjon at gudjon.org> on
-Wed, 27 Dec 2006 17:13:11 +0100.
-
-It was downloaded from http://muparser.sourceforge.net
-
-Upstream Author: Ingo Berg <ingo_berg at gmx.de>
-
-Copyright: © 2004-2007 Ingo Berg <ingo_berg at gmx.de>
-
-muParser is licensed under the MIT license:
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: muparser
+Upstream-Contact: Ingo Berg <ingo_berg at gmx.de>
+Source: http://muparser.sourceforge.net
+
+Files: *
+Copyright: 2004-2007 Ingo Berg <ingo_berg at gmx.de>
+License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-
+ .
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
+ .
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,5 +24,19 @@ muParser is licensed under the MIT license:
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-The Debian packaging is © 2006, Gudjon I. Gudjonsson <gudjon at gudjon.org> and
-is licensed under the GPL v2, see `/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright: 2006, Gudjon I. Gudjonsson <gudjon at gudjon.org>
+ 2009-2015, Scott Howard <showard at debian.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ A copy of the full text of the license can be found on Debian systems
+ at '/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libmuparser2v5.install b/debian/libmuparser2v5.install
index 97f7c31..3ddde58 100644
--- a/debian/libmuparser2v5.install
+++ b/debian/libmuparser2v5.install
@@ -1 +1 @@
-usr/lib/*/lib*.so.*
\ No newline at end of file
+usr/lib/*/lib*.so.*
diff --git a/debian/libmuparser2v5.symbols b/debian/libmuparser2v5.symbols
index d79cb96..bd19aeb 100644
--- a/debian/libmuparser2v5.symbols
+++ b/debian/libmuparser2v5.symbols
@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 2.2.3-5~ amd64
-libmuparser.so.2v5 libmuparser2v5 #MINVER#
+# SymbolsHelper-Confirmed: 2.2.3-5~ alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x x32
+libmuparser.so.2 libmuparser2v5 #MINVER#
_Z11AsParserTagPv at Base 1.28
_Z8AsParserPv at Base 1.28
_ZN2mu10ParserBase10ClearConstEv at Base 1.28
@@ -436,6 +436,7 @@ libmuparser.so.2v5 libmuparser2v5 #MINVER#
(optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSsC2IPKcEET_S2_RKSaIcE at Base 2.2.3
(optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSsC2IPcEET_S1_RKSaIcE at Base 2.2.3
(optional=templinst)_ZNSt10_List_baseIPFiPKcPiPdESaIS5_EE8_M_clearEv at Base 2.2.3
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x)_ZNSt11_Deque_baseIiSaIiEE17_M_initialize_mapEj at Base 2.2.3-5~
(optional=templinst)_ZNSt11_Deque_baseIiSaIiEE17_M_initialize_mapEm at Base 2.2.3-5~
(optional=templinst)_ZNSt11_Deque_baseIiSaIiEED1Ev at Base 1.34
(optional=templinst)_ZNSt11_Deque_baseIiSaIiEED2Ev at Base 1.28
@@ -493,13 +494,14 @@ libmuparser.so.2v5 libmuparser2v5 #MINVER#
(optional=templinst)_ZNSt6vectorIN2mu6STokenESaIS1_EED2Ev at Base 2.2.3
(optional=templinst)_ZNSt6vectorIN2mu6STokenESaIS1_EEaSERKS3_ at Base 2.1.0
(optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_ at Base 2.2.3-5~
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS5_S7_EEjRKS5_ at Base 2.2.3-5~
(optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS5_S7_EEmRKS5_ at Base 2.2.3-5~
(optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev at Base 2.2.3-5~
(optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev at Base 2.2.3-5~
(optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_ at Base 2.2.3-5~
(optional=templinst)_ZNSt6vectorISsSaISsEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSsS1_EEmRKSs at Base 2.2.3-5~
(optional=templinst|arch=armel armhf mips mipsel powerpc sparc)_ZNSt6vectorISsSaISsEE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKSsS1_EEEEPSsjT_S9_ at Base 2.2.3
- (optional=templinst|arch=ia64 s390 s390x)_ZNSt6vectorISsSaISsEE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKSsS1_EEEEPSsmT_S9_ at Base 2.1.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EEjRKd at Base 2.2.3-5~
(optional=templinst)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EEmRKd at Base 2.2.3-5~
(optional=templinst)_ZNSt6vectorIdSaIdEED1Ev at Base 2.2.3
(optional=templinst)_ZNSt6vectorIdSaIdEED2Ev at Base 2.2.3
@@ -530,6 +532,10 @@ libmuparser.so.2v5 libmuparser2v5 #MINVER#
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_dESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_SJ_RT_ at Base 2.2.3-5~
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_dESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_SJ_RT_ at Base 2.2.3-5~
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_dESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 2.2.3-5~
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_ at Base 2.2.3-5~
+ (optional=templinst|arch=hppa x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_ at Base 2.2.3-5~
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_SJ_RT_ at Base 2.2.3-5~
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 2.2.3-5~
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_mESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_ at Base 2.2.3-5~
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_mESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_ at Base 2.2.3-5~
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_mESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_SJ_RT_ at Base 2.2.3-5~
@@ -557,8 +563,8 @@ libmuparser.so.2v5 libmuparser2v5 #MINVER#
(optional=templinst)_ZNSt8auto_ptrIN2mu17ParserTokenReaderEED2Ev at Base 1.34
(optional=templinst)_ZNSt8auto_ptrIN2mu6ParserEE5resetEPS1_ at Base 2.2.3
(optional=templinst)_ZSt13copy_backwardIPdS0_ET0_T_S2_S1_ at Base 2.2.3
- (optional=templinst|arch=armel armhf)_ZSt8_DestroyIPN2mu11ParserTokenIdSsEEEvT_S4_ at Base 2.1.0
- (optional=templinst|arch=armel armhf)_ZSt8_DestroyIPSsEvT_S1_ at Base 2.1.0
+#MISSING: 2.2.3-5~# (optional=templinst|arch=armel armhf)_ZSt8_DestroyIPN2mu11ParserTokenIdSsEEEvT_S4_ at Base 2.1.0
+#MISSING: 2.2.3-5~# (optional=templinst|arch=armel armhf)_ZSt8_DestroyIPSsEvT_S1_ at Base 2.1.0
(optional=templinst)_ZSt9use_facetIN2mu10ParserBase14change_dec_sepIcEEERKT_RKSt6locale at Base 2.1.0
_ZTIN2mu10ParserBase14change_dec_sepIcEE at Base 2.1.0
_ZTIN2mu10ParserBaseE at Base 1.28
diff --git a/debian/patches/gcc5.patch b/debian/patches/gcc5.patch
deleted file mode 100644
index a253d5e..0000000
--- a/debian/patches/gcc5.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: SONAME bump for GCC 5 transition
-Author: Scott Howard <showard at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791209
-Index: muparser/Makefile.in
-===================================================================
---- muparser.orig/Makefile.in
-+++ muparser/Makefile.in
-@@ -133,19 +133,19 @@ COND_WINDOWS_IMPLIB_1___muParser_dll___i
- -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)muparser$(DEBUG_BUILD_POSTFIX).$(DLLIMP_SUFFIX)
- @COND_WINDOWS_IMPLIB_1 at __muParser_dll___importlib = $(COND_WINDOWS_IMPLIB_1___muParser_dll___importlib)
- @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 at __muParser_dll___targetsuf2 \
-- at COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).2
-+ at COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).2v5
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 at __muParser_dll___targetsuf2 \
-- at COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.$(SO_SUFFIX)
-+ at COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2v5.$(SO_SUFFIX)
- @COND_USE_SOVERSION_0 at __muParser_dll___targetsuf2 = .$(SO_SUFFIX)
- @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 at __muParser_dll___targetsuf3 \
- @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-- at COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).2.2.3
-+ at COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).2v5.2.3
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 at __muParser_dll___targetsuf3 \
-- at COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.2.3.$(SO_SUFFIX)
-+ at COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2v5.2.3.$(SO_SUFFIX)
- @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1 at __muParser_dll___targetsuf3 \
-- at COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).2
-+ at COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).2v5
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 at __muParser_dll___targetsuf3 \
-- at COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -2.$(SO_SUFFIX)
-+ at COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -2v5.$(SO_SUFFIX)
- @COND_USE_SOVERSION_0 at __muParser_dll___targetsuf3 = .$(SO_SUFFIX)
- COND_USE_SOVERLINUX_1___muParser_dll___soname_flags = \
- $(SONAME_FLAG)$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf2)
-Index: muparser/build/bakefiles/muparser.bkl
-===================================================================
---- muparser.orig/build/bakefiles/muparser.bkl
-+++ muparser/build/bakefiles/muparser.bkl
-@@ -72,8 +72,8 @@
- <dllname>muparser$(DEBUG_BUILD_POSTFIX)</dllname>
- <libname>muparser$(DEBUG_BUILD_POSTFIX)</libname>
-
-- <version>2.2</version>
-- <so_version>2.2.3</so_version>
-+ <version>2v5.2</version>
-+ <so_version>2v5.2.3</so_version>
- <mac_version>1</mac_version> <!-- must be > 0 -->
- </dll>
-
diff --git a/debian/patches/series b/debian/patches/series
index cd51809..2504a1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-gcc5.patch
FTBFS_hurd.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/muparser.git
More information about the debian-science-commits
mailing list