diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:45:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:48:45 +0000 |
| commit | 82b7d7c2d40f4760bc6e90b88d0db4103fd00e9f (patch) | |
| tree | b396fd3203fe79f9d280d6d02e3fb02685d18786 /debian/patches | |
| parent | Merging upstream version 4.4.0. (diff) | |
| download | wireshark-82b7d7c2d40f4760bc6e90b88d0db4103fd00e9f.tar.xz wireshark-82b7d7c2d40f4760bc6e90b88d0db4103fd00e9f.zip | |
Merging debian version 4.4.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-Resources-Make-our-.pc-file-static-again.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/0001-Resources-Make-our-.pc-file-static-again.patch b/debian/patches/0001-Resources-Make-our-.pc-file-static-again.patch new file mode 100644 index 00000000..d0991afe --- /dev/null +++ b/debian/patches/0001-Resources-Make-our-.pc-file-static-again.patch @@ -0,0 +1,28 @@ +From 81b2647233ced75165e37de2ef5bee4659c9d3a9 Mon Sep 17 00:00:00 2001 +From: AndersBroman <a.broman58@gmail.com> +Date: Wed, 4 Sep 2024 15:47:41 +0000 +Subject: [PATCH] Resources: Make our .pc file static again + +Partially revert 107550c9c0 and make the pkgconfig prefix static. + + +(cherry picked from commit a9d17a13afa15c7ffe5afc6db817208bc2887a13) + +Co-authored-by: Gerald Combs <gerald@wireshark.org> +--- + resources/wireshark.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resources/wireshark.pc.in b/resources/wireshark.pc.in +index 212d4ec311..a3fead0dc4 100644 +--- a/resources/wireshark.pc.in ++++ b/resources/wireshark.pc.in +@@ -1,4 +1,4 @@ +-prefix=${pcfiledir}/../.. ++prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-- +2.43.0 + diff --git a/debian/patches/series b/debian/patches/series index 162876e7..d04723a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +0001-Resources-Make-our-.pc-file-static-again.patch 09_idl2wrs.patch 0004-Use-packaged-JS-and-CSS-resources-instead-of-pulling.patch |