diff options
| author | Yangfl <mmyangfl@gmail.com> | 2026-01-08 09:47:21 +0800 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2026-01-09 10:42:02 +0000 |
| commit | 2ed27cd4a1823616912b9e32174c6b94f868f814 (patch) | |
| tree | 3698aa5310803372d86f2d71c22bf0b44dd668a9 | |
| parent | 6e5d463eabb3fb8bff20439f794fdc7c8ef62a35 (diff) | |
1.1.0-3 (patches unapplied)HEADimport/1.1.0-3ubuntu/stonking-develubuntu/stonkingubuntu/resolute-proposedubuntu/resolute-develubuntu/resoluteubuntu/develdebian/sid
Imported using git-ubuntu import.
Notes
Notes:
* Fix fail to build source after successful build (Closes: #1048705)
* Fix FTBFS with make --shuffle=reverse (Closes: #1105481)
* Bump Standards-Version to 4.7.3
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | debian/gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | debian/patches/0001-Install-pc-file-to-libdir.patch (renamed from debian/patches/Install-pc-file-to-libdir.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/0002-Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch (renamed from debian/patches/Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/0003-Fix-FTBFS-with-make-shuffle-reverse.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 5 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/upstream/metadata | 8 | ||||
| -rw-r--r-- | debian/watch | 8 |
11 files changed, 50 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index e651538..02684e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libjsonparser (1.1.0-3) unstable; urgency=medium + + * Fix fail to build source after successful build (Closes: #1048705) + * Fix FTBFS with make --shuffle=reverse (Closes: #1105481) + * Bump Standards-Version to 4.7.3 + + -- Yangfl <mmyangfl@gmail.com> Thu, 08 Jan 2026 09:47:21 +0800 + libjsonparser (1.1.0-2) unstable; urgency=medium * Pick upstream commits diff --git a/debian/control b/debian/control index 973efe8..84d79cf 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,8 @@ Section: libs Priority: optional Maintainer: Yangfl <mmyangfl@gmail.com> Build-Depends: debhelper-compat (= 13) -Rules-Requires-Root: no -Standards-Version: 4.5.0 -Homepage: https://github.com/udp/json-parser +Standards-Version: 4.7.3 +Homepage: https://github.com/json-parser/json-parser Vcs-Git: https://salsa.debian.org/yangfl-guest/json-parser.git Vcs-Browser: https://salsa.debian.org/yangfl-guest/json-parser diff --git a/debian/copyright b/debian/copyright index 7e528f5..9be0318 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libjsonparser -Source: https://github.com/udp/json-parser +Source: https://github.com/json-parser/json-parser Files: * Copyright: 2012-2014 James McLaughlin <james@clickteam.com> @@ -12,7 +12,7 @@ Copyright: 2012 Mathias Kaerlev <matpow2@gmail.com> License: BSD-2-Clause Files: debian/* -Copyright: 2018 Yangfl <mmyangfl@gmail.com> +Copyright: 2018-2026 Yangfl <mmyangfl@gmail.com> License: BSD-2-Clause License: BSD-2-Clause diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml deleted file mode 100644 index 0c22dc4..0000000 --- a/debian/gitlab-ci.yml +++ /dev/null @@ -1,3 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git a/debian/patches/Install-pc-file-to-libdir.patch b/debian/patches/0001-Install-pc-file-to-libdir.patch index 7ce9bab..7ce9bab 100644 --- a/debian/patches/Install-pc-file-to-libdir.patch +++ b/debian/patches/0001-Install-pc-file-to-libdir.patch diff --git a/debian/patches/Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch b/debian/patches/0002-Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch index f6bad96..f6bad96 100644 --- a/debian/patches/Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch +++ b/debian/patches/0002-Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch diff --git a/debian/patches/0003-Fix-FTBFS-with-make-shuffle-reverse.patch b/debian/patches/0003-Fix-FTBFS-with-make-shuffle-reverse.patch new file mode 100644 index 0000000..58384f1 --- /dev/null +++ b/debian/patches/0003-Fix-FTBFS-with-make-shuffle-reverse.patch @@ -0,0 +1,24 @@ +From d28d58d830dd6bb559237cc064349c073159a714 Mon Sep 17 00:00:00 2001 +From: yangfl <yangfl@users.noreply.github.com> +Date: Wed, 3 Dec 2025 11:53:15 +0800 +Subject: [PATCH] Fix FTBFS with make --shuffle=reverse + +--- + Makefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.in b/Makefile.in +index e67cbef..dec14b2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -56,6 +56,7 @@ install-shared: libjsonparser.$(SO_EXT) + + install-static: libjsonparser.a + @echo Installing static library: $(libdir)/libjsonparser.a ++ @install -d $(libdir) || true + @install -m 0755 libjsonparser.a $(libdir)/libjsonparser.a + @install -d $(includedir)/json-parser || true + @install -m 0644 ./json.h $(includedir)/json-parser/json.h +-- +2.51.0 + diff --git a/debian/patches/series b/debian/patches/series index 0e56a04..c781e1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,5 +18,6 @@ upstream/0018-Regenerate-configure-so-make-install-won-t-complain-.patch upstream/0019-Fix-buffer-overrun-in-truncated-unicode-escape-seque.patch upstream/0020-Update-AUTHORS.patch vlc/0001-json-fix-fall-through-warnings.patch -Install-pc-file-to-libdir.patch -Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch +0001-Install-pc-file-to-libdir.patch +0002-Respect-LDFLAGS-CPPFLAGS-and-add-missing-lm.patch +0003-Fix-FTBFS-with-make-shuffle-reverse.patch diff --git a/debian/rules b/debian/rules index 6b5e485..09c63aa 100755 --- a/debian/rules +++ b/debian/rules @@ -13,3 +13,6 @@ export DEB_LDFLAGS_MAINT_APPEND = override_dh_auto_install: dh_auto_install --no-parallel + +execute_after_dh_autoreconf_clean: + $(RM) Makefile config.log config.status json-parser.pc diff --git a/debian/upstream/metadata b/debian/upstream/metadata index aebd3c8..44c2990 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,4 +1,4 @@ -Bug-Database: https://github.com/udp/json-parser/issues -Bug-Submit: https://github.com/udp/json-parser/issues/new -Repository: https://github.com/udp/json-parser.git -Repository-Browse: https://github.com/udp/json-parser +Bug-Database: https://github.com/json-parser/json-parser/issues +Bug-Submit: https://github.com/json-parser/json-parser/issues/new +Repository: https://github.com/json-parser/json-parser.git +Repository-Browse: https://github.com/json-parser/json-parser diff --git a/debian/watch b/debian/watch index 565d3d0..e7c6ced 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ -version=4 -opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%libjsonparser-$1.tar.gz%" \ - https://github.com/udp/json-parser/releases \ - (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate +Version: 5 +Template: Github +Owner: json-parser +Project: json-parser |