Source: muparser
Severity: minor
Tags: patch

If practical, please update muparser to the latest upstream version,
2.3.2.

I've attached a patch that seems to work, and also updates debian/watch
to *find* the new version.  Fortunately, a nice easy update, and one
that allows the previous patches to be dropped.  I did not look into the
dpkg-gensymbols problem that was reported earlier, though.

Thank you!


-- 
Nicholas Breen
nbr...@debian.org

diff --git a/debian/changelog b/debian/changelog
index c48b85d..33a989b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+muparser (2.3.2-1) UNRELEASED; urgency=medium
+
+  * 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, 27 Nov 2021 09:34:27 -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..11af306 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-2020 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/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@

Reply via email to