From c71560a5f28ce13dba3b41645fa35f1989a11722 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sat, 5 Aug 2017 20:15:08 +1000 Subject: [PATCH 01/11] Bump Standards Version to 4.0.0. --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47cc40c..7d907e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dvdisaster (0.79.5-2) UNRELEASED; urgency=medium + + * Team upload. + * Bump Standards Version to 4.0.0. + + -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 + dvdisaster (0.79.5-1) unstable; urgency=medium [ Carlos Maddela ] diff --git a/debian/control b/debian/control index c010706..7fbe1ba 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 10), # Build-Depends-Indep: texlive-fonts-recommended, # texlive-latex-base, # texlive-latex-extra -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Browser: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git Vcs-Git: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git Homepage: http://dvdisaster.net/ From c68a08fb59b79c5d1b626aa417c7cf91e3b06f4f Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 01:31:35 +1000 Subject: [PATCH 02/11] Remove unnecessary calls to dpkg-parsechangelog from debian/rules. --- debian/changelog | 1 + debian/rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d907e8..3a78c20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * Team upload. * Bump Standards Version to 4.0.0. + * Remove unnecessary calls to dpkg-parsechangelog from debian/rules. -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 diff --git a/debian/rules b/debian/rules index df2b292..db7de76 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,7 @@ include /usr/share/dpkg/buildflags.mk export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) -Wall -Wno-deprecated-declarations -pedantic export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -export SOURCE_DATE_EPOCH := \ - $(shell date --date="$$(dpkg-parsechangelog -S Date)" +%s) +include /usr/share/dpkg/pkg-info.mk export FORCE_SOURCE_DATE = 1 MUTABLE_FILES := build.h $(wildcard locale/*.po) \ From bb6d3049f5d56fa65db91610983a7216800913d1 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 01:52:24 +1000 Subject: [PATCH 03/11] debian/watch: Avoid repacking upstream tarballs unnecessarily. --- debian/changelog | 1 + debian/watch | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a78c20..d5044e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * Team upload. * Bump Standards Version to 4.0.0. * Remove unnecessary calls to dpkg-parsechangelog from debian/rules. + * debian/watch: Avoid repacking upstream tarballs unnecessarily. -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 diff --git a/debian/watch b/debian/watch index cbb062b..39ff875 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,4 @@ version=3 -opts="pgpsigurlmangle=s/$/.gpg/, \ - compression=xz, \ - repack" \ +opts="pgpsigurlmangle=s/$/.gpg/" \ http://dvdisaster.net/en/index.html \ (?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate From f16a9b9c7b4afd95d325986b783b1a828b3cc32c Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 02:30:47 +1000 Subject: [PATCH 04/11] Fix more typos in error messages and docs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'sucessful' → 'successful' 'improvment' → 'improvement' --- debian/changelog | 1 + debian/patches/29-fix-more-typos.patch | 173 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 175 insertions(+) create mode 100644 debian/patches/29-fix-more-typos.patch diff --git a/debian/changelog b/debian/changelog index d5044e1..9558816 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * Bump Standards Version to 4.0.0. * Remove unnecessary calls to dpkg-parsechangelog from debian/rules. * debian/watch: Avoid repacking upstream tarballs unnecessarily. + * Fix more typos in error messages and docs. -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 diff --git a/debian/patches/29-fix-more-typos.patch b/debian/patches/29-fix-more-typos.patch new file mode 100644 index 0000000..cb083ec --- /dev/null +++ b/debian/patches/29-fix-more-typos.patch @@ -0,0 +1,173 @@ +From: Carlos Maddela +Date: Sun, 6 Aug 2017 02:16:17 +1000 +Subject: Fix more typos in error messages and docs. +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Description: Fix more typos in error messages and docs. + 'sucessful' → 'successful' + 'improvment' → 'improvement' +Author: Carlos Maddela +Last-Update: 2017-08-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + documentation/user-manual/howtos.tex | 2 +- + locale/cs.po | 2 +- + locale/de.po | 2 +- + locale/it.po | 2 +- + locale/pt_BR.po | 2 +- + locale/ru.po | 2 +- + locale/sv.po | 2 +- + preferences.c | 4 ++-- + regtest/rs01.bash | 2 +- + scsi-layer.c | 2 +- + smart-lec.c | 2 +- + 11 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/documentation/user-manual/howtos.tex b/documentation/user-manual/howtos.tex +index 51ff827..80fe9d3 100644 +--- a/documentation/user-manual/howtos.tex ++++ b/documentation/user-manual/howtos.tex +@@ -1822,7 +1822,7 @@ process of creating error correction files using these options. The + first option marked green lets dvdisaster create the error correction + file immediately after the medium has been (completely) read. + The second option marked green deletes the image when the error correction +-file has been sucessfully created. ++file has been successfully created. + + \bigskip + +diff --git a/locale/cs.po b/locale/cs.po +index ed1fc65..9010d21 100644 +--- a/locale/cs.po ++++ b/locale/cs.po +@@ -1903,7 +1903,7 @@ msgid "Media ejection" + msgstr "Vysunutí disku" + + #: preferences.c:2064 preferences.c:2065 +-msgid "Eject medium after sucessful read" ++msgid "Eject medium after successful read" + msgstr "Po úspěšném načtení vysunout disk" + + #: preferences.c:2091 +diff --git a/locale/de.po b/locale/de.po +index bbbfdcc..bb5baa6 100644 +--- a/locale/de.po ++++ b/locale/de.po +@@ -1959,7 +1959,7 @@ msgid "Media ejection" + msgstr "Datenträger auswerfen" + + #: preferences.c:2064 preferences.c:2065 +-msgid "Eject medium after sucessful read" ++msgid "Eject medium after successful read" + msgstr "Datenträger nach erfolgreichem Lesen auswerfen" + + #: preferences.c:2091 +diff --git a/locale/it.po b/locale/it.po +index a074339..000d5c3 100644 +--- a/locale/it.po ++++ b/locale/it.po +@@ -1749,7 +1749,7 @@ msgid "Media ejection" + msgstr "" + + #: preferences.c:2064 preferences.c:2065 +-msgid "Eject medium after sucessful read" ++msgid "Eject medium after successful read" + msgstr "" + + #: preferences.c:2091 +diff --git a/locale/pt_BR.po b/locale/pt_BR.po +index 04b33b5..00bcaee 100644 +--- a/locale/pt_BR.po ++++ b/locale/pt_BR.po +@@ -1839,7 +1839,7 @@ msgid "Media ejection" + msgstr "Ejeção da mídia" + + #: preferences.c:2064 preferences.c:2065 +-msgid "Eject medium after sucessful read" ++msgid "Eject medium after successful read" + msgstr "Ejetar mídia após uma leitura completa" + + #: preferences.c:2091 +diff --git a/locale/ru.po b/locale/ru.po +index 6cd3789..1c677d4 100644 +--- a/locale/ru.po ++++ b/locale/ru.po +@@ -1841,7 +1841,7 @@ msgid "Media ejection" + msgstr "Извлечь носитель" + + #: preferences.c:2064 preferences.c:2065 +-msgid "Eject medium after sucessful read" ++msgid "Eject medium after successful read" + msgstr "Извлечь носитель после успешного чтения" + + #: preferences.c:2091 +diff --git a/locale/sv.po b/locale/sv.po +index 9f70808..5cd4927 100644 +--- a/locale/sv.po ++++ b/locale/sv.po +@@ -1755,7 +1755,7 @@ msgid "Media ejection" + msgstr "" + + #: preferences.c:2064 preferences.c:2065 +-msgid "Eject medium after sucessful read" ++msgid "Eject medium after successful read" + msgstr "" + + #: preferences.c:2091 +diff --git a/preferences.c b/preferences.c +index f5ef889..5a24200 100644 +--- a/preferences.c ++++ b/preferences.c +@@ -2061,8 +2061,8 @@ void CreatePreferencesWindow(void) + frame = gtk_frame_new(_utf("Media ejection")); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); + +- lwoh = CreateLabelWithOnlineHelp(_("Eject medium after sucessful read"), +- _("Eject medium after sucessful read")); ++ lwoh = CreateLabelWithOnlineHelp(_("Eject medium after successful read"), ++ _("Eject medium after successful read")); + RegisterPreferencesHelpWindow(lwoh); + + for(i=0; i<2; i++) +diff --git a/regtest/rs01.bash b/regtest/rs01.bash +index 46bfac4..45f7611 100755 +--- a/regtest/rs01.bash ++++ b/regtest/rs01.bash +@@ -1327,7 +1327,7 @@ if try "reading medium in 3 passes; 3rd pass recovers some" read_multipass_parti + run_regtest read_multipass_partial_success "--read-medium=3 --spinup-delay=0 -r" $TMPISO $ISODIR/no.ecc + fi + +-# Do a second sucessful read attempt at an incomplete image; ++# Do a second successful read attempt at an incomplete image; + # see whether correct results are reported when ecc data is present + # since CRC caching is a bit complicated in this case. + +diff --git a/scsi-layer.c b/scsi-layer.c +index b70a4a4..515cc93 100644 +--- a/scsi-layer.c ++++ b/scsi-layer.c +@@ -2474,7 +2474,7 @@ int ReadSectors(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors) + if(Closure->readRaw && dh->rawBuffer) + recommended_attempts = dh->rawBuffer->recommendedAttempts; + +- if(status) /* current try was unsucessful */ ++ if(status) /* current try was unsuccessful */ + { int last_key, last_asc, last_ascq; + + if(Closure->stopActions) /* user break */ +diff --git a/smart-lec.c b/smart-lec.c +index 0355879..e33ad8f 100644 +--- a/smart-lec.c ++++ b/smart-lec.c +@@ -1609,7 +1609,7 @@ static int smart_lec_iteration(sh_context *shc, char *message) + shc->bestBonus = 0; + shc->bestMalus = 100000; + memcpy(shc->bestFrame, rb->recovered, rb->sampleSize); +- sprintf(shc->msg, "smart_lec: no further improvment"); ++ sprintf(shc->msg, "smart_lec: no further improvement"); + + update_pq_state(shc); + print_pq_state(shc); diff --git a/debian/patches/series b/debian/patches/series index 9cc762e..afe379c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ 26-fix-display-of-manual.pdf.patch 27-allow-opening-in-browser-again.patch 28-fudge-pdf-doc-ids.patch +29-fix-more-typos.patch From 84716913ad8079f43ff6e9ba26fb1df1cb0ff310 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 02:54:22 +1000 Subject: [PATCH 05/11] Fix FTBFS on Hurd and kFreeBSD. Make sure MMAP_FLAGS gets defined. --- debian/changelog | 1 + debian/patches/30-hurd-kfreebsd-ftbfs.patch | 46 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 48 insertions(+) create mode 100644 debian/patches/30-hurd-kfreebsd-ftbfs.patch diff --git a/debian/changelog b/debian/changelog index 9558816..1fcb36f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * Remove unnecessary calls to dpkg-parsechangelog from debian/rules. * debian/watch: Avoid repacking upstream tarballs unnecessarily. * Fix more typos in error messages and docs. + * Fix FTBFS on Hurd and kFreeBSD. -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 diff --git a/debian/patches/30-hurd-kfreebsd-ftbfs.patch b/debian/patches/30-hurd-kfreebsd-ftbfs.patch new file mode 100644 index 0000000..1c0c37d --- /dev/null +++ b/debian/patches/30-hurd-kfreebsd-ftbfs.patch @@ -0,0 +1,46 @@ +From: Carlos Maddela +Date: Sun, 6 Aug 2017 02:40:33 +1000 +Subject: Fix FTBFS on Hurd and kFreeBSD. + +Description: Fix FTBFS on Hurd and kFreeBSD. + Make sure MMAP_FLAGS gets defined. +Author: Carlos Maddela +Last-Update: 2017-08-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + rs03-create.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/rs03-create.c b/rs03-create.c +index b2c6033..b14e326 100644 +--- a/rs03-create.c ++++ b/rs03-create.c +@@ -39,16 +39,19 @@ + #ifdef HAVE_MMAP + #include + +-#ifdef SYS_LINUX +- #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) +-#endif ++#if defined(SYS_LINUX) + +-#ifdef SYS_FREEBSD +- #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) +-#endif ++ #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) ++ ++#elif defined(SYS_FREEBSD) ++ ++ #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) ++ ++#else ++ ++ /* SYS_NETBSD and others. */ ++ #define MMAP_FLAGS (MAP_SHARED) + +-#ifdef SYS_NETBSD +- #define MMAP_FLAGS (MAP_SHARED) + #endif + + #endif diff --git a/debian/patches/series b/debian/patches/series index afe379c..89700d5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ 27-allow-opening-in-browser-again.patch 28-fudge-pdf-doc-ids.patch 29-fix-more-typos.patch +30-hurd-kfreebsd-ftbfs.patch From 52204ec50256489efff19f2c2785335477977a49 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 03:05:45 +1000 Subject: [PATCH 06/11] 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 --- From a614f5d1f7b2c1890c40eefce88cb51b726bb110 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 17:14:14 +1000 Subject: [PATCH 07/11] Improve support for Hurd and kFreeBSD systems Improve support for Hurd and kFreeBSD systems, although Hurd still builds without SCSI. --- debian/changelog | 2 + debian/control | 2 + ...31-improve-hurd-and-kfreebsd-support.patch | 322 ++++++++++++++++++ debian/patches/series | 1 + debian/tests/control | 2 + debian/tests/unknown-system | 6 + 6 files changed, 335 insertions(+) create mode 100644 debian/patches/31-improve-hurd-and-kfreebsd-support.patch create mode 100644 debian/tests/control create mode 100755 debian/tests/unknown-system diff --git a/debian/changelog b/debian/changelog index 9d70d5d..6d112c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * 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. + * Improve support for Hurd and kFreeBSD systems, although Hurd still + builds without SCSI. -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 diff --git a/debian/control b/debian/control index 7fbe1ba..09b88bb 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.16.1.1), gettext, libbz2-dev, + libcam-dev [kfreebsd-any], libgtk2.0-dev, libpng-dev, pkg-config @@ -19,6 +20,7 @@ Standards-Version: 4.0.0 Vcs-Browser: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git Vcs-Git: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git Homepage: http://dvdisaster.net/ +Testsuite: autopkgtest Package: dvdisaster Architecture: any diff --git a/debian/patches/31-improve-hurd-and-kfreebsd-support.patch b/debian/patches/31-improve-hurd-and-kfreebsd-support.patch new file mode 100644 index 0000000..6b1b24d --- /dev/null +++ b/debian/patches/31-improve-hurd-and-kfreebsd-support.patch @@ -0,0 +1,322 @@ +From: Carlos Maddela +Date: Sun, 6 Aug 2017 10:37:18 +1000 +Subject: Add better support for HURD and kFreeBSD systems. + +Description: Add better support for HURD and kFreeBSD systems. + Hurd still compiles without SCSI layer, however. +Author: Carlos Maddela +Last-Update: 2017-08-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + cacheprobe.c | 16 +++++++++------- + closure.c | 6 ++++-- + rs03-create.c | 2 +- + scripts/bash-based-configure | 18 ++++++++++++++++++ + scsi-freebsd.c | 4 ++-- + scsi-layer.c | 10 ++++++---- + scsi-layer.h | 17 +++++++++-------- + scsi-unknown.c | 4 ++-- + show-html.c | 15 ++++++++++----- + 9 files changed, 61 insertions(+), 31 deletions(-) + +diff --git a/cacheprobe.c b/cacheprobe.c +index 60c55f9..f30f5d3 100644 +--- a/cacheprobe.c ++++ b/cacheprobe.c +@@ -22,7 +22,8 @@ + + #include "dvdisaster.h" + +-#ifdef SYS_LINUX ++#if defined(SYS_LINUX) ++ + int ProbeCacheLineSize() + { int cl_size = 0; + +@@ -36,9 +37,9 @@ int ProbeCacheLineSize() + + return cl_size; + } +-#endif + +-#ifdef SYS_FREEBSD ++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) ++ + #include + + int ProbeCacheLineSize() +@@ -52,9 +53,9 @@ int ProbeCacheLineSize() + + return cl_size; + } +-#endif + +-#ifdef SYS_NETBSD ++#elif defined(SYS_NETBSD) ++ + #include + + int ProbeCacheLineSize() +@@ -68,13 +69,14 @@ int ProbeCacheLineSize() + + return cl_size; + } +-#endif + +-#ifdef SYS_UNKNOWN ++#else /* SYS_UNKNOWN and others. */ ++ + int ProbeCacheLineSize() + { + return 64; + } ++ + #endif + + +diff --git a/closure.c b/closure.c +index 632c103..7c8b3bd 100644 +--- a/closure.c ++++ b/closure.c +@@ -50,7 +50,8 @@ static void get_base_dirs() + /*** Otherwise try the installation directory. + On Unices this is a hardcoded directory. */ + +-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_UNKNOWN) ++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \ ++ defined(SYS_NETBSD) || defined(SYS_HURD) || defined(SYS_UNKNOWN) + if(DirStat(BINDIR)) + Closure->binDir = g_strdup(BINDIR); + +@@ -425,7 +426,8 @@ void InitClosure() + + /* Generate a more comprehensive version string */ + +-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) ++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \ ++ defined(SYS_NETBSD) || defined(SYS_HURD) + #ifdef HAVE_64BIT + #define BITNESS_STRING " 64bit" + #else +diff --git a/rs03-create.c b/rs03-create.c +index b14e326..7a22bae 100644 +--- a/rs03-create.c ++++ b/rs03-create.c +@@ -43,7 +43,7 @@ + + #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) + +-#elif defined(SYS_FREEBSD) ++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) + + #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) + +diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure +index d62f5d7..9abcf96 100644 +--- a/scripts/bash-based-configure ++++ b/scripts/bash-based-configure +@@ -136,6 +136,15 @@ case "$cfg_uname" in + } + ;; + ++ GNU/kFreeBSD*) cfg_system=kfreebsd ++ CFG_SYS_OPTIONS="-DSYS_KFREEBSD" ++ CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/kFreeBSD\\\"" ++ CFG_EXE_SUFFIX="" ++ function add_linker_flags() ++ { lflags_return="-L$1 -Wl,-rpath,$1 $2" ++ } ++ ;; ++ + NetBSD*) cfg_system=netbsd + CFG_SYS_OPTIONS="-DSYS_NETBSD" + CFG_SYS_NAME="-DSYS_NAME=\\\"NetBSD\\\"" +@@ -146,6 +155,15 @@ case "$cfg_uname" in + } + ;; + ++ GNU*) cfg_system=hurd ++ CFG_SYS_OPTIONS="-DSYS_HURD" ++ CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/Hurd\\\"" ++ CFG_EXE_SUFFIX="" ++ function add_linker_flags() ++ { lflags_return="-L$1 -Wl,-rpath,$1 $2" ++ } ++ ;; ++ + *) cfg_system=unknown-system + CFG_SYS_OPTIONS="-DSYS_UNKNOWN" + CFG_SYS_NAME="-DSYS_NAME=\\\"Unknown\\\"" +diff --git a/scsi-freebsd.c b/scsi-freebsd.c +index 78d0be4..793f206 100644 +--- a/scsi-freebsd.c ++++ b/scsi-freebsd.c +@@ -25,7 +25,7 @@ + #include "scsi-layer.h" + #include "udf.h" + +-#ifdef SYS_FREEBSD ++#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) + + /* SCSI wrappers for FreeBSD are still work in progress. */ + +@@ -241,4 +241,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char + return -1; + } + +-#endif /* SYS_FREEBSD */ ++#endif /* defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) */ +diff --git a/scsi-layer.c b/scsi-layer.c +index 515cc93..609cb73 100644 +--- a/scsi-layer.c ++++ b/scsi-layer.c +@@ -2005,12 +2005,13 @@ static gint64 query_size(Image *image) + */ + + gint64 CurrentMediumSize(int get_blank_size) +-{ Image *image; ++{ ++#if defined(SYS_UNKNOWN) || defined(SYS_HURD) ++ return 0; ++#else ++ Image *image; + gint64 size; + +-#ifdef SYS_UNKNOWN +- return 0; +-#endif + + image = OpenImageFromDevice(Closure->device); + if(!image) return 0; +@@ -2051,6 +2052,7 @@ gint64 CurrentMediumSize(int get_blank_size) + CloseImage(image); + + return size; ++#endif + } + + /*** +diff --git a/scsi-layer.h b/scsi-layer.h +index cc7d9fc..0706a22 100644 +--- a/scsi-layer.h ++++ b/scsi-layer.h +@@ -28,7 +28,7 @@ + #include + #endif + +-#ifdef SYS_FREEBSD ++#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) + #include + #endif + +@@ -49,19 +49,21 @@ + * Linux already has one + */ + +-#ifdef SYS_LINUX ++#if defined(SYS_LINUX) ++ + #define MAX_CDB_SIZE CDROM_PACKET_SIZE + + /* Now globally defined for all OSes here */ + //typedef struct request_sense Sense; +-#endif + +-#ifdef SYS_FREEBSD ++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) ++ + #define MAX_CDB_SIZE SCSI_MAX_CDBLEN +-#endif + +-#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD) ++#else /* SYS_UNKNOWN and others. */ ++ + #define MAX_CDB_SIZE 16 /* longest possible SCSI command */ ++ + #endif + + /* +@@ -101,8 +103,7 @@ typedef struct _DeviceHandle + */ + #if defined(SYS_LINUX) || defined(SYS_NETBSD) + int fd; /* device file descriptor */ +-#endif +-#ifdef SYS_FREEBSD ++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) + struct cam_device *camdev; /* camlib device handle */ + union ccb *ccb; + #endif +diff --git a/scsi-unknown.c b/scsi-unknown.c +index e9183f6..ef54552 100644 +--- a/scsi-unknown.c ++++ b/scsi-unknown.c +@@ -25,7 +25,7 @@ + #include "scsi-layer.h" + #include "udf.h" + +-#ifdef SYS_UNKNOWN ++#if defined(SYS_UNKNOWN) || defined(SYS_HURD) + + /* Dummy routines so that we can compile on unknown architectures + for which we don't have SCSI support yet. */ +@@ -51,4 +51,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char + return -1; + } + +-#endif /* SYS_UNKNOWN */ ++#endif /* defined(SYS_UNKNOWN) || defined(SYS_HURD) */ +diff --git a/show-html.c b/show-html.c +index 608e8ec..20715f4 100644 +--- a/show-html.c ++++ b/show-html.c +@@ -21,7 +21,8 @@ + + #include "dvdisaster.h" + +-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) ++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \ ++ defined(SYS_NETBSD) || defined(SYS_HURD) + #include + #endif + +@@ -34,7 +35,8 @@ + *** Ask user to specify his browser + ***/ + +-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) ++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \ ++ defined(SYS_NETBSD) || defined(SYS_HURD) + + #define SEARCH_BUTTON 1 + +@@ -173,7 +175,8 @@ static void msg_destroy_cb(GtkWidget *widget, gpointer data) + bi->msg = NULL; + } + +-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) ++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \ ++ defined(SYS_NETBSD) || defined(SYS_HURD) + + /* + * The following list of browsers and html wrappers +@@ -273,7 +276,8 @@ static gboolean browser_timeout_func(gpointer data) + * Invoke the browser + */ + +-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) ++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \ ++ defined(SYS_NETBSD) || defined(SYS_HURD) + static void try_browser(browser_info *bi) + { pid_t pid; + +@@ -393,7 +397,8 @@ void ShowHTML(char *target) + g_timeout_add(1000, browser_timeout_func, (gpointer)bi); + #endif + +-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) ++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \ ++ defined(SYS_NETBSD) || defined(SYS_HURD) + /* Try the first browser */ + + browser_index = 0; diff --git a/debian/patches/series b/debian/patches/series index 89700d5..f387f93 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ 28-fudge-pdf-doc-ids.patch 29-fix-more-typos.patch 30-hurd-kfreebsd-ftbfs.patch +31-improve-hurd-and-kfreebsd-support.patch diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..e4a3ae0 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,2 @@ +Tests: unknown-system +Depends: dvdisaster diff --git a/debian/tests/unknown-system b/debian/tests/unknown-system new file mode 100755 index 0000000..470dcda --- /dev/null +++ b/debian/tests/unknown-system @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +# Make sure we haven't built for an unknown system. +! (dvdisaster --version | grep -qiw unknown) From 1a6b38f9a55a55e2ae9e07ebcee7089cb3c2b387 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 17:58:45 +1000 Subject: [PATCH 08/11] Mark bug, which we should have done in previous release, as closed. Closes: #838294 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6d112c7..3c767bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * Remove incorrect use of 'Origin: vendor' from DEP-3 patch headers. * Improve support for Hurd and kFreeBSD systems, although Hurd still builds without SCSI. + * Mark bug, which we should have done in previous release, as closed. + (Closes: #838294) -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 From 645178ef92784b9c1aca98af69aedbe6338c9c51 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Sun, 6 Aug 2017 18:01:31 +1000 Subject: [PATCH 09/11] Release version 0.79.5-2 to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c767bc..a766b50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dvdisaster (0.79.5-2) UNRELEASED; urgency=medium +dvdisaster (0.79.5-2) experimental; urgency=medium * Team upload. * Bump Standards Version to 4.0.0. @@ -12,7 +12,7 @@ dvdisaster (0.79.5-2) UNRELEASED; urgency=medium * Mark bug, which we should have done in previous release, as closed. (Closes: #838294) - -- Carlos Maddela Sat, 05 Aug 2017 20:03:21 +1000 + -- Carlos Maddela Sun, 06 Aug 2017 18:00:54 +1000 dvdisaster (0.79.5-1) unstable; urgency=medium From 7d3606100708fe3fa161065cbb8c02ecadd7fdc8 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Mon, 7 Aug 2017 11:04:51 +1000 Subject: [PATCH 10/11] Revert "Mark bug, which we should have done in previous release, as closed." This reverts commit 1a6b38f9a55a55e2ae9e07ebcee7089cb3c2b387. --- debian/changelog | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a766b50..be418ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,6 @@ dvdisaster (0.79.5-2) experimental; urgency=medium * Remove incorrect use of 'Origin: vendor' from DEP-3 patch headers. * Improve support for Hurd and kFreeBSD systems, although Hurd still builds without SCSI. - * Mark bug, which we should have done in previous release, as closed. - (Closes: #838294) -- Carlos Maddela Sun, 06 Aug 2017 18:00:54 +1000 From 1b266ccbdecd07c1cece0e425ff365e4091ef789 Mon Sep 17 00:00:00 2001 From: Carlos Maddela Date: Mon, 7 Aug 2017 14:26:50 +1000 Subject: [PATCH 11/11] Release fixed version of 0.79.5-2 to experimental. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index be418ac..7adc074 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ dvdisaster (0.79.5-2) experimental; urgency=medium * Improve support for Hurd and kFreeBSD systems, although Hurd still builds without SCSI. - -- Carlos Maddela Sun, 06 Aug 2017 18:00:54 +1000 + -- Carlos Maddela Mon, 07 Aug 2017 14:26:01 +1000 dvdisaster (0.79.5-1) unstable; urgency=medium