diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-10-01 22:23:09 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-10-01 22:23:09 +0200 |
| commit | 75a936e5054cb15a73f385874fa499735a00230a (patch) | |
| tree | 4bf564d7524f65e9571562970775554af4ae93f0 | |
| parent | 397db8ca4d79a1a12db6c2fd4555c93ac1b5dee0 (diff) | |
Delete not used patches
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/0105-gitversion.patch | 19 | ||||
| -rw-r--r-- | debian/patches/0110-use_relative_lib_path.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 1 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index 35780cd..0917cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ shotwell (0.30.17-1) UNRELEASED; urgency=medium * New upstream release. * Declare compliance with Debian Policy 4.6.1.0 (No changes needed). + * Delete not used patches. -- Jörg Frings-Fürst <debian@jff.email> Sat, 01 Oct 2022 21:55:48 +0200 diff --git a/debian/patches/0105-gitversion.patch b/debian/patches/0105-gitversion.patch deleted file mode 100644 index aba218b..0000000 --- a/debian/patches/0105-gitversion.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Typo in git version macro -Author: Jörg Fringy-Fürst <debian@jff.email> -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=795719 -Last-Update: 2018-05-01 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/Resources.vala -=================================================================== ---- trunk.orig/src/Resources.vala -+++ trunk/src/Resources.vala -@@ -18,7 +18,7 @@ namespace Resources { - public const string APP_DIRECT_ROLE = _("Photo Viewer"); - public const string APP_VERSION = _VERSION; - --#if _GITVERSION -+#if _GIT_VERSION - public const string? GIT_VERSION = _GIT_VERSION; - #else - public const string? GIT_VERSION = null; diff --git a/debian/patches/0110-use_relative_lib_path.patch b/debian/patches/0110-use_relative_lib_path.patch deleted file mode 100644 index 3e64e9f..0000000 --- a/debian/patches/0110-use_relative_lib_path.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Use relative path for lib -Author: Jens Georg <mail@jensge.org> -Origin: upstream, https://gitlab.gnome.org/GNOME/shotwell/-/commit/b3216719e9504518d6866adaaec532e5a7c09481 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010571 -Forwarded: not-needed -Applied-Upstream: commit -Last-Update: 2022-05-04 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/meson.build -=================================================================== ---- trunk.orig/meson.build -+++ trunk/meson.build -@@ -12,7 +12,7 @@ conf.set('_VERSION', '"@0@"'.format(meso - conf.set('_PREFIX', '"@0@"'.format(get_option('prefix'))) - conf.set('_LANG_SUPPORT_DIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('localedir')))) - conf.set('_LIBEXECDIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libexecdir')))) --conf.set('_LIB', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libdir')))) -+conf.set('_LIB', '"@0@"'.format(get_option('libdir'))) - configure_file(output : 'config.h', configuration: conf) - - config_incdir = include_directories('.') diff --git a/debian/patches/series b/debian/patches/series index cd86938..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -#0105-gitversion.patch -#0110-use_relative_lib_path.patch |