From cbedee15491dec30533a6386667667ffdf7739af Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Tue, 5 Sep 2023 23:11:30 +0200 Subject: [PATCH] Drop patches applied upstream --- debian/patches/build-without-git.patch | 30 -------------------------- debian/patches/manpage.patch | 24 --------------------- debian/patches/series | 2 -- 3 files changed, 56 deletions(-) delete mode 100644 debian/patches/build-without-git.patch delete mode 100644 debian/patches/manpage.patch diff --git a/debian/patches/build-without-git.patch b/debian/patches/build-without-git.patch deleted file mode 100644 index ea88a3f..0000000 --- a/debian/patches/build-without-git.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Allow building without git installed - Upstream runs 'git' during configure to inject commit info into the binary. - We don't have 'git' installed on our buildds. -Author: IOhannes m zmölnig -Origin: Debian -Bug: https://github.com/jacktrip/jacktrip/issues/1184 -Last-Update: 2023-08-30 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- jacktrip.orig/meson.build -+++ jacktrip/meson.build -@@ -36,12 +36,15 @@ - c_defines += ['-DNDEBUG'] - endif - --git_tags_cmd = run_command('git', 'describe', '--tags', check: false) --git_hash_cmd = run_command('git', 'rev-parse', '--short', 'HEAD', check: false) --if git_tags_cmd.returncode() == 0 and git_hash_cmd.returncode() == 0 -+git = find_program('git', required: false) -+if git.found() -+ git_tags_cmd = run_command(git, 'describe', '--tags', check: false) -+ git_hash_cmd = run_command(git, 'rev-parse', '--short', 'HEAD', check: false) -+ if git_tags_cmd.returncode() == 0 and git_hash_cmd.returncode() == 0 - git_tags = git_tags_cmd.stdout().strip() - git_hash = git_hash_cmd.stdout().strip() - defines += ['-DJACKTRIP_BUILD_INFO=' + git_tags + '-' + git_hash] -+ endif - endif - - src = [ 'src/DataProtocol.cpp', diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch deleted file mode 100644 index 2f46d3c..0000000 --- a/debian/patches/manpage.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Provide a useful whatis entry in the manpage -Author: IOhannes m zmölnig -Origin: Debian -Bug: https://github.com/jacktrip/jacktrip/issues/1185 -Last-Update: 2023-08-30 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- jacktrip.orig/meson.build -+++ jacktrip/meson.build -@@ -293,6 +293,7 @@ - if help2man.found() - gzip = find_program('gzip', required: false) - help2man_opts = [ -+ '--name="Network Music Performance over the Internet"', - '--no-info', - '--section=1'] - manfile = custom_target('jacktrip.1', -@@ -317,4 +318,4 @@ - summary({'Application ID': application_id, - 'GUI': not get_option('nogui'), - 'WAIR': get_option('wair'), -- 'Manpage': help2man.found()}, bool_yn: true, section: 'Configuration') -\ No newline at end of file -+ 'Manpage': help2man.found()}, bool_yn: true, section: 'Configuration') diff --git a/debian/patches/series b/debian/patches/series index 30016a2..0d8f1ee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -build-without-git.patch gui-launcher.patch -manpage.patch -- 2.30.2