Hello again,
One of my packages now has an upstream dependency on muparser >= 2.3, so
I'd definitely like to see the newer version in the archive. Within the
next few days, I plan to upload a NMU containing only the previously
described changes, plus a one-line addition to install the new *.cmake
files - and will upload to DELAYED/14 as an additional safety. Please
let me know at any time if I should cancel the upload.
The latest upstream version is now 2.3.3, but it requires no further
changes to the packaging. Current diff attached.
Thanks again for your work on muparser.
--
Nicholas Breen
nbr...@debian.org
diff --git a/debian/changelog b/debian/changelog
index c48b85d..45589aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+muparser (2.3.3-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release.
+ * Drop patches - no longer needed with upstream move to cmake.
+ * Update debian/watch and Homepage in debian/control.
+
+ -- Nicholas Breen <nbr...@debian.org> Sat, 12 Mar 2022 14:13:16 -0800
+
muparser (2.2.6.1+dfsg-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index f4f7491..8febf57 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Uploaders: Gudjon I. Gudjonsson <gud...@gudjon.org>,
Scott Howard <show...@debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper (>= 12~),
- automake
+Build-Depends: cmake,
+ debhelper (>= 12~)
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/science-team/muparser
Vcs-Git: https://salsa.debian.org/science-team/muparser.git
-Homepage: http://muparser.sourceforge.net
+Homepage: https://beltoforion.de/en/muparser/
Package: libmuparser-dev
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 21065bb..3f39d20 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: muparser
Upstream-Contact: Ingo Berg <ingo_b...@gmx.de>
Source: http://muparser.sourceforge.net
-Files-Excluded: */*.dll
- */*.lib
- */vs
Files: *
-Copyright: 2004-2007 Ingo Berg <ingo_b...@gmx.de>
+Copyright: 2004-2022 Ingo Berg <ingo_b...@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
diff --git a/debian/libmuparser-dev.install b/debian/libmuparser-dev.install
index 7df81cd..f304b9d 100644
--- a/debian/libmuparser-dev.install
+++ b/debian/libmuparser-dev.install
@@ -1,3 +1,4 @@
usr/include/*
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/*
+usr/lib/*/cmake/muparser
diff --git a/debian/patches/FTBFS_hurd.patch b/debian/patches/FTBFS_hurd.patch
deleted file mode 100644
index e603046..0000000
--- a/debian/patches/FTBFS_hurd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Allow building on hurd
-Author: Scott Howard <show...@debian.org>
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533817
-
-Index: muparser/build/autoconf/aclocal.m4
-===================================================================
---- muparser.orig/build/autoconf/aclocal.m4 2013-01-26 23:30:49.773669077 -0500
-+++ muparser/build/autoconf/aclocal.m4 2013-01-26 23:30:53.421669002 -0500
-@@ -1258,7 +1258,7 @@
- ;;
-
- powerpc-apple-macos* | \
-- *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
-+ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | *-*-gnu* | \
- *-*-mirbsd* | \
- *-*-sunos4* | \
- *-*-osf* | \
-@@ -1309,7 +1309,7 @@
- SONAME_FLAG=
-
- case "${BAKEFILE_HOST}" in
-- *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
-+ *-*-linux* | *-*-gnu* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
- *-*-k*bsd*-gnu | *-*-mirbsd* )
- if test "x$SUNCXX" = "xyes"; then
- SONAME_FLAG="-h "
diff --git a/debian/patches/fix-versionnum.patch b/debian/patches/fix-versionnum.patch
deleted file mode 100644
index 1810865..0000000
--- a/debian/patches/fix-versionnum.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Teemu Ikonen <tpiko...@gmail.com>
- Andreas Tille <ti...@debian.org>
-Date: Sun, 13 Jan 2019 18:59:59 +0100
-Subject: [PATCH] Fix version number to 2.2.6 in build system.
-
----
- Makefile.in | 4 ++--
- build/autoconf/configure.ac | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 157be77..305167c 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -139,9 +139,9 @@ COND_WINDOWS_IMPLIB_1___muParser_dll___importlib = \
- @COND_USE_SOVERSION_0@__muParser_dll___targetsuf2 = .$(SO_SUFFIX)
- @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__muParser_dll___targetsuf3 \
- @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
--@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).2.2.4
-+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).2.2.6
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \
--@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.2.4.$(SO_SUFFIX)
-+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.2.6.$(SO_SUFFIX)
- @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__muParser_dll___targetsuf3 \
- @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).2
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \
-diff --git a/build/autoconf/configure.ac b/build/autoconf/configure.ac
-index 85ddd2a..6333a2b 100644
---- a/build/autoconf/configure.ac
-+++ b/build/autoconf/configure.ac
-@@ -6,7 +6,7 @@
-
- # NOTE:
- # the version of the project must be updated also in docs/Doxyfile !
--AC_INIT([muparser], [2.2.4], [mupar...@beltoforion.de])
-+AC_INIT([muparser], [2.2.6], [mupar...@beltoforion.de])
-
- AC_PREREQ([2.57])
- AC_CONFIG_AUX_DIR([build/autoconf])
---
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index df9d0cf..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-FTBFS_hurd.patch
-fix-versionnum.patch
diff --git a/debian/rules b/debian/rules
index 20a3f85..43f6419 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,24 +11,6 @@ SAVE_FILES = configure
%:
dh $@
-override_dh_update_autotools_config:
- # Save upstream configs
- for f in $(SAVE_FILES) ; do \
- if [ ! -f $$f-orig ] ; then mv $$f $$f-orig ; fi \
- done
- dh_update_autotools_config
- bash build/autoconf/acregen.sh
-
-override_dh_auto_configure:
- dh_auto_configure -- --disable-samples
-
-override_dh_clean:
- dh_clean
- # Restore upstream config
- for f in $(SAVE_FILES) ; do \
- if [ -f $$f-orig ] ; then mv $$f-orig $$f ; fi \
- done
-
override_dh_makeshlibs:
#pkgkde-symbols helper is managing the symbols file.
#Sometimes we'll FTBFS on other arch's toolchains that export or miss
diff --git a/debian/watch b/debian/watch
index ac66e52..c869838 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=4
opts="repacksuffix=+dfsg,dversionmangle=auto,repack,compression=xz" \
- https://github.com/beltoforion/muparser/releases/latest .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@
+ https://github.com/beltoforion/muparser/releases/latest .*/archive/refs/tags/v?@ANY_VERSION@@ARCHIVE_EXT@
