From 52204ec50256489efff19f2c2785335477977a49 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 03:05:45 +1000 Subject: [PATCH] Remove incorrect use of 'Origin: vendor' from DEP-3 patch headers. --- debian/changelog | 1 + debian/patches/08-fix-gnu-make-detection.patch | 1 - ...on-size-specific-icon-and-add-keywords-to-desktop-file.patch | 1 - debian/patches/11-no-cruft.patch | 1 - debian/patches/12-fix-spelling-of-up-to.patch | 1 - debian/patches/13-fix-missing-language-field-in-po-files.patch | 1 - debian/patches/14-make-builds-reproducible.patch | 1 - debian/patches/15-show-new-pkg-tracker.patch | 1 - .../16-remove-auto-build-of-doco-from-install-rule.patch | 1 - debian/patches/17-fix-all-but-deprecated-api-warnings.patch | 1 - debian/patches/18-update-copyright-in-about-dialog.patch | 1 - debian/patches/19-show-text-files-with-abs-path.patch | 1 - debian/patches/20-display-changelog-credits-and-todo.patch | 1 - debian/patches/22-fix-hurd-i386-ftbfs.patch | 1 - debian/patches/23-add-bdrom-support.patch | 2 +- debian/patches/24-show-gpl3-license.patch | 1 - debian/patches/25-fix-man-pages.patch | 1 - debian/patches/26-fix-display-of-manual.pdf.patch | 1 - debian/patches/27-allow-opening-in-browser-again.patch | 1 - debian/patches/28-fudge-pdf-doc-ids.patch | 1 - 20 files changed, 2 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1fcb36f..9d70d5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * debian/watch: Avoid repacking upstream tarballs unnecessarily. * Fix more typos in error messages and docs. * Fix FTBFS on Hurd and kFreeBSD. + * Remove incorrect use of 'Origin: vendor' from DEP-3 patch headers. -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 diff --git a/debian/patches/08-fix-gnu-make-detection.patch b/debian/patches/08-fix-gnu-make-detection.patch index 2293129..31584a9 100644 --- a/debian/patches/08-fix-gnu-make-detection.patch +++ b/debian/patches/08-fix-gnu-make-detection.patch @@ -10,7 +10,6 @@ Description: Fix GNU Make detection. This change allows for more predictable behaviour: grep returns an error code of 0 or 1. Author: Carlos Maddela -Origin: vendor Bug-Debian: https://bugs.debian.org/848811 Forwarded: no Last-Update: 2016-12-18 diff --git a/debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch b/debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch index dc2820f..0df309f 100644 --- a/debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch +++ b/debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch @@ -4,7 +4,6 @@ Subject: Use non-size-specific icon and add keywords to desktop file. Description: Use non-size-specific icon and add keywords to desktop file. Author: Carlos Maddela -Origin: vendor Forwarded: no Last-Update: 2016-12-19 --- diff --git a/debian/patches/11-no-cruft.patch b/debian/patches/11-no-cruft.patch index 8ecbee1..de7ca91 100644 --- a/debian/patches/11-no-cruft.patch +++ b/debian/patches/11-no-cruft.patch @@ -4,7 +4,6 @@ Subject: Do not install cruft. Description: Do not install cruft. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2017-01-05 --- diff --git a/debian/patches/12-fix-spelling-of-up-to.patch b/debian/patches/12-fix-spelling-of-up-to.patch index 7f55cc4..f854e11 100644 --- a/debian/patches/12-fix-spelling-of-up-to.patch +++ b/debian/patches/12-fix-spelling-of-up-to.patch @@ -4,7 +4,6 @@ Subject: Fix spelling: upto -> up to Description: Fix spelling: upto -> up to Author: Carlos Maddela -Origin: vendor Forwarded: no Last-Update: 2017-01-05 --- diff --git a/debian/patches/13-fix-missing-language-field-in-po-files.patch b/debian/patches/13-fix-missing-language-field-in-po-files.patch index ad09c24..3df60eb 100644 --- a/debian/patches/13-fix-missing-language-field-in-po-files.patch +++ b/debian/patches/13-fix-missing-language-field-in-po-files.patch @@ -4,7 +4,6 @@ Subject: Fix missing language fields in PO files. Description: Fix missing language fields in PO files. Author: Carlos Maddela -Origin: vendor Forwarded: no Last-Update: 2017-01-05 --- diff --git a/debian/patches/14-make-builds-reproducible.patch b/debian/patches/14-make-builds-reproducible.patch index 772a827..d93e63e 100644 --- a/debian/patches/14-make-builds-reproducible.patch +++ b/debian/patches/14-make-builds-reproducible.patch @@ -6,7 +6,6 @@ Description: Make builds reproducible. Use the Debian changelog details to derive a build number and date, so that we can make reproducible binaries. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2016-12-19 --- diff --git a/debian/patches/15-show-new-pkg-tracker.patch b/debian/patches/15-show-new-pkg-tracker.patch index 911c07d..1029d7f 100644 --- a/debian/patches/15-show-new-pkg-tracker.patch +++ b/debian/patches/15-show-new-pkg-tracker.patch @@ -5,7 +5,6 @@ Subject: Update help dialog to show link to the new Debian package tracker. Description: Update help dialog to show link to the new Debian package tracker. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2016-12-19 --- diff --git a/debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch b/debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch index 66e7b54..0a76df2 100644 --- a/debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch +++ b/debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch @@ -5,7 +5,6 @@ Subject: Don't build and install documentation automatically. Description: Don't build and install documentation automatically. This allows for better control over binary-arch and binary-indep builds. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2017-01-05 --- diff --git a/debian/patches/17-fix-all-but-deprecated-api-warnings.patch b/debian/patches/17-fix-all-but-deprecated-api-warnings.patch index 6076123..01ababb 100644 --- a/debian/patches/17-fix-all-but-deprecated-api-warnings.patch +++ b/debian/patches/17-fix-all-but-deprecated-api-warnings.patch @@ -4,7 +4,6 @@ Subject: Fix all warnings except for those related to deprecated API. Description: Fix all warnings except for those related to deprecated API. Author: Carlos Maddela -Origin: vendor Bug-Debian: https://bugs.debian.org/748416 Forwarded: no Last-Update: 2017-01-05 diff --git a/debian/patches/18-update-copyright-in-about-dialog.patch b/debian/patches/18-update-copyright-in-about-dialog.patch index e142205..6597cd0 100644 --- a/debian/patches/18-update-copyright-in-about-dialog.patch +++ b/debian/patches/18-update-copyright-in-about-dialog.patch @@ -4,7 +4,6 @@ Subject: Update copyright notice in about dialog. Description: Update copyright notice in about dialog. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2017-01-05 --- diff --git a/debian/patches/19-show-text-files-with-abs-path.patch b/debian/patches/19-show-text-files-with-abs-path.patch index 10c1d3b..e8ed62a 100644 --- a/debian/patches/19-show-text-files-with-abs-path.patch +++ b/debian/patches/19-show-text-files-with-abs-path.patch @@ -4,7 +4,6 @@ Subject: Allow ShowTextFile() to work with absolute path names. Description: Allow ShowTextFile() to work with absolute path names. Author: Carlos Maddela -Origin: vendor Forwarded: no Last-Update: 2016-12-21 --- diff --git a/debian/patches/20-display-changelog-credits-and-todo.patch b/debian/patches/20-display-changelog-credits-and-todo.patch index 8f5d4be..119f4b7 100644 --- a/debian/patches/20-display-changelog-credits-and-todo.patch +++ b/debian/patches/20-display-changelog-credits-and-todo.patch @@ -7,7 +7,6 @@ Description: Fix display of changelog, credits and to-do files. duplicates in /usr/share/doc/dvdisaster-doc or build with source path embedded anymore. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2017-01-05 --- diff --git a/debian/patches/22-fix-hurd-i386-ftbfs.patch b/debian/patches/22-fix-hurd-i386-ftbfs.patch index 86f3208..d1eb4dc 100644 --- a/debian/patches/22-fix-hurd-i386-ftbfs.patch +++ b/debian/patches/22-fix-hurd-i386-ftbfs.patch @@ -6,7 +6,6 @@ Description: Fix FTBFS for hurd-i386. Hurd does not have path length restrictions, so doesn't define PATH_MAX. Assuming a PATH_MAX of 4096 as a quick workaround. Author: Carlos Maddela -Origin: vendor Forwarded: no Last-Update: 2017-01-04 --- diff --git a/debian/patches/23-add-bdrom-support.patch b/debian/patches/23-add-bdrom-support.patch index 90d169c..1d6de57 100644 --- a/debian/patches/23-add-bdrom-support.patch +++ b/debian/patches/23-add-bdrom-support.patch @@ -7,7 +7,7 @@ Description: Add support for BD-ROM media-type. media-type. This allows dvdisaster to scan and read (ie create ISO images of) BD-ROM media. Author: Corey Write -Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849518;filename=dvdisaster-add_bdrom_support.patch;msg=5 +Origin: other, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849518;filename=dvdisaster-add_bdrom_support.patch;msg=5 Bug-Debian: https://bugs.debian.org/849518 Forwarded: no Last-Update: 2016-12-27 diff --git a/debian/patches/24-show-gpl3-license.patch b/debian/patches/24-show-gpl3-license.patch index 4b8f2f4..8ea5e0e 100644 --- a/debian/patches/24-show-gpl3-license.patch +++ b/debian/patches/24-show-gpl3-license.patch @@ -4,7 +4,6 @@ Subject: Update help dialog to show GPL-3 license. Description: Update help dialog to show GPL-3 license. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2017-01-05 --- diff --git a/debian/patches/25-fix-man-pages.patch b/debian/patches/25-fix-man-pages.patch index 46c4e65..5304ca4 100644 --- a/debian/patches/25-fix-man-pages.patch +++ b/debian/patches/25-fix-man-pages.patch @@ -6,7 +6,6 @@ Description: Fix generated man pages. The generated man pages incorrectly direct users to the directory of the old HTML documentation, which is no longer available. Author: Carlos Maddela -Origin: vendor Forwarded: no Last-Update: 2016-12-21 --- diff --git a/debian/patches/26-fix-display-of-manual.pdf.patch b/debian/patches/26-fix-display-of-manual.pdf.patch index 9a94114..c12f1c3 100644 --- a/debian/patches/26-fix-display-of-manual.pdf.patch +++ b/debian/patches/26-fix-display-of-manual.pdf.patch @@ -6,7 +6,6 @@ Description: Fix display of manual.pdf. The PDF file is automatically compressed by Debhelper, so we need to account for this. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2017-01-05 --- diff --git a/debian/patches/27-allow-opening-in-browser-again.patch b/debian/patches/27-allow-opening-in-browser-again.patch index cc9b782..cbb3eea 100644 --- a/debian/patches/27-allow-opening-in-browser-again.patch +++ b/debian/patches/27-allow-opening-in-browser-again.patch @@ -4,7 +4,6 @@ Subject: Resurrect old code to support opening URLs in a browser. Description: Resurrect old code to support opening URLs in a browser. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2016-12-21 --- diff --git a/debian/patches/28-fudge-pdf-doc-ids.patch b/debian/patches/28-fudge-pdf-doc-ids.patch index c1625c1..748e7cc 100644 --- a/debian/patches/28-fudge-pdf-doc-ids.patch +++ b/debian/patches/28-fudge-pdf-doc-ids.patch @@ -4,7 +4,6 @@ Subject: Generate the same PDF document IDs for build reproducibility. Description: Generate the same PDF IDs for build reproducibility. Author: Carlos Maddela -Origin: vendor Forwarded: not-needed Last-Update: 2016-12-21 ---