diff -Nru drawtiming-0.7.1/debian/changelog drawtiming-0.7.1/debian/changelog --- drawtiming-0.7.1/debian/changelog 2020-03-22 15:38:32.000000000 +0000 +++ drawtiming-0.7.1/debian/changelog 2023-04-29 02:03:03.000000000 +0000 @@ -1,8 +1,50 @@ -drawtiming (0.7.1-7build1) focal; urgency=medium +drawtiming (0.7.1-10) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * d/watch: add pgpsigurlmangle rule + * Replace binary upstream sign key with an ASCII armoured one + * d/gbp.conf: re-enable priistine-tar + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 29 Apr 2023 04:03:03 +0200 + +drawtiming (0.7.1-9) unstable; urgency=medium + + [ Aymeric Agon-Rambosson ] + * Team upload. + * d/control: + - Bump Standards-Version to 4.6.2 (no changes required). + - Bump compat level to 13 (remove d/compat). + - Add Rules-Requires-Root field. + * d/rules: + - Drop override of dh_auto_configure (not needed). + - Add hardening options. + * Drop patches InitializeMagick.diff and test_workaround.diff (not + needed anymore, since we use imagemagick). + * Update d/watch to standard 4. + * Remove trailing whitespaces from d/changelog. + * d/copyright: replace http with https. + * Add autopkgtest that runs upstream sample test. - -- Matthias Klose Sun, 22 Mar 2020 16:38:32 +0100 + [ أحمد المحمودي (Ahmed El-Mahmoudy) ] + * d/patches/*.diff: Add tags for upstream bug & forwarded patches URLs + * d/patches/manpage-fix.diff: fix another typo + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 01 Apr 2023 02:07:54 +0200 + +drawtiming (0.7.1-8) unstable; urgency=medium + + [ Aymeric Agon-Rambosson ] + * Add repair-build-c++-17.patch (Closes: #984038). + * d/control: + - Add bison to Build-Depends (needed by upstream Makefile). + - Replace graphicsmagick with imagemagick to avoid segfault during + tests. + - Replace gsfonts with fonts-urw-base35 (transition), and add + fonts-urw-base35 as explicit runtime dependency to prevent segfault. + [ أحمد المحمودي (Ahmed El-Mahmoudy) ] + * Add gitlab-ci.yml + * d/gbp.conf: switch to bullseye branch + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 04 Mar 2023 03:07:13 +0100 drawtiming (0.7.1-7) unstable; urgency=medium @@ -105,7 +147,7 @@ * Updated to use debhelper 7. * Updated and simplified debian/rules * Updated and simplified package description - * Updated and simplified dependencies (closes: #488428) + * Updated and simplified dependencies (closes: #488428) -- Wesley J. Landaker Mon, 06 Apr 2009 23:36:41 -0600 @@ -125,7 +167,7 @@ drawtiming (0.6.2-3) unstable; urgency=low * Updated to latest config.{guess,sub} - * Updated to use latest libmagick++ + * Updated to use latest libmagick++ -- Wesley J. Landaker Thu, 10 Apr 2008 21:29:29 -0600 @@ -186,4 +228,3 @@ * Initial Release (closes: #304218) -- Wesley J. Landaker Wed, 6 Apr 2005 09:51:05 -0600 - diff -Nru drawtiming-0.7.1/debian/compat drawtiming-0.7.1/debian/compat --- drawtiming-0.7.1/debian/compat 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru drawtiming-0.7.1/debian/control drawtiming-0.7.1/debian/control --- drawtiming-0.7.1/debian/control 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/control 2023-04-29 02:03:03.000000000 +0000 @@ -3,15 +3,21 @@ Priority: optional Maintainer: Debian Electronics Team Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) -Build-Depends: debhelper (>= 10), graphicsmagick-libmagick-dev-compat, pkg-config, gsfonts -Standards-Version: 4.1.5 +Build-Depends: + debhelper-compat (= 13), + libmagick++-6.q16-dev, + fonts-urw-base35, + pkg-config, + bison +Standards-Version: 4.6.2 Homepage: http://drawtiming.sourceforge.net/ Vcs-Git: https://salsa.debian.org/electronics-team/drawtiming.git Vcs-Browser: https://salsa.debian.org/electronics-team/drawtiming +Rules-Requires-Root: no Package: drawtiming Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, fonts-urw-base35 Description: tool for documenting hardware designs through timing diagrams Drawtiming is a command-line tool for documenting hardware designs through timing diagrams. In inputs textual signal descriptions and outputs image diff -Nru drawtiming-0.7.1/debian/copyright drawtiming-0.7.1/debian/copyright --- drawtiming-0.7.1/debian/copyright 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/copyright 2023-04-29 02:03:03.000000000 +0000 @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: drawtiming Upstream-Contact: Edward Counce -Source: http://drawtiming.sourceforge.net +Source: https://drawtiming.sourceforge.net/ Files: * Copyright: 2004-2007 Edward Counce diff -Nru drawtiming-0.7.1/debian/gbp.conf drawtiming-0.7.1/debian/gbp.conf --- drawtiming-0.7.1/debian/gbp.conf 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/gbp.conf 2023-04-29 02:03:03.000000000 +0000 @@ -1,3 +1,2 @@ [DEFAULT] -pristine-tar = False debian-branch = pkg-debian diff -Nru drawtiming-0.7.1/debian/gitlab-ci.yml drawtiming-0.7.1/debian/gitlab-ci.yml --- drawtiming-0.7.1/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ drawtiming-0.7.1/debian/gitlab-ci.yml 2023-04-29 02:03:03.000000000 +0000 @@ -0,0 +1,6 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +variables: + RELEASE: 'unstable' diff -Nru drawtiming-0.7.1/debian/patches/InitializeMagick.diff drawtiming-0.7.1/debian/patches/InitializeMagick.diff --- drawtiming-0.7.1/debian/patches/InitializeMagick.diff 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/patches/InitializeMagick.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Description: Properly initialize GraphicsMagick - Quoting from GraphicsMagick's NEWS file " - 1.3.8 (January 21, 2010) - ======================== - [...] - Behavior Changes: - InitializeMagick() MUST be invoked prior to using any Magick API function. - Failure to do so will likely lead to an immediate application crash. This is - due to initialization and runtime changes intended to improve thread safety - and efficiency. Previously it was only strongly recommended to invoke - InitializeMagick(). - " -Author: Galland (https://launchpad.net/~victor-lopez) -Bug-Ubuntu: https://bugs.launchpad.net/bugs/636021 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599915 -Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=3136111&group_id=118983&atid=682742 -Forwarded: yes - ---- a/src/main.cc -+++ b/src/main.cc -@@ -97,6 +97,9 @@ - double scale = 1; - int flags = 0; - -+#ifndef LITE -+ InitializeMagick(NULL); -+#endif /* ! LITE */ - int k, c; - while ((c = getopt_long (argc, argv, "ac:f:hl:o:p:vVw:x:", opts, &k)) != -1) - switch (c) { diff -Nru drawtiming-0.7.1/debian/patches/manpage-fix.diff drawtiming-0.7.1/debian/patches/manpage-fix.diff --- drawtiming-0.7.1/debian/patches/manpage-fix.diff 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/patches/manpage-fix.diff 2023-04-29 02:03:03.000000000 +0000 @@ -1,8 +1,11 @@ Description: Fix typos and hyphenation Author: أحمد المحمودي (Ahmed El-Mahmoudy) -Forwarded: yes ---- a/doc/drawtiming.1 -+++ b/doc/drawtiming.1 +Bug: https://sourceforge.net/p/drawtiming/patches/9/ +Forwarded: https://sourceforge.net/p/drawtiming/patches/_discuss/thread/41710982/5e5e/attachment/manpage-fix.dff +Index: drawtiming/doc/drawtiming.1 +=================================================================== +--- drawtiming.orig/doc/drawtiming.1 2023-03-28 03:59:43.231523691 +0200 ++++ drawtiming/doc/drawtiming.1 2023-03-28 04:00:26.274940414 +0200 @@ -56,7 +56,7 @@ .It Fl -pagesize Ar WidthxHeight Scale the diagram to fit given image size. @@ -42,6 +45,15 @@ with the annotation .Em tD . .El +@@ -156,7 +156,7 @@ + FIRE => COUNT="N+1". + .Ed + .Pp +-This input file descibes the changes in five signals over a period of ++This input file describes the changes in five signals over a period of + seven clock cycles. The end of each clock cycle is indicated with a + period. For example, the following line indicates a single signal, + named @@ -173,7 +173,7 @@ value if their initial value is not given. .Pp diff -Nru drawtiming-0.7.1/debian/patches/missing-includes.diff drawtiming-0.7.1/debian/patches/missing-includes.diff --- drawtiming-0.7.1/debian/patches/missing-includes.diff 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/patches/missing-includes.diff 2023-04-29 02:03:03.000000000 +0000 @@ -1,6 +1,7 @@ Description: Add missing string.h include. Author: Wesley J. Landaker -Forwarded: yes +Bug: https://sourceforge.net/p/drawtiming/patches/10/ +Forwarded: https://sourceforge.net/p/drawtiming/patches/_discuss/thread/573b786c/5ca9/attachment/missing-include.diff --- a/src/timing.cc +++ b/src/timing.cc @@ -23,6 +23,7 @@ diff -Nru drawtiming-0.7.1/debian/patches/repair-build-c++-17.patch drawtiming-0.7.1/debian/patches/repair-build-c++-17.patch --- drawtiming-0.7.1/debian/patches/repair-build-c++-17.patch 1970-01-01 00:00:00.000000000 +0000 +++ drawtiming-0.7.1/debian/patches/repair-build-c++-17.patch 2023-04-29 02:03:03.000000000 +0000 @@ -0,0 +1,209 @@ +Description: Fix compile failures for newer g++ release +Author: Thomas Sailer +Bug: https://sourceforge.net/p/drawtiming/patches/12/ +Bug-Debian: https://bugs.debian.org/984038 +Forwarded: https://sourceforge.net/p/drawtiming/patches/12/drawtiming-gcc.patch +--- a/src/parser.yy ++++ b/src/parser.yy +@@ -42,13 +42,13 @@ statements: + statement { $$ = $1; deps.push_back ($1); } + | statements ',' statement { $$ = $3; deps.push_back ($3); } + | statements ';' statement { $$ = $3; deps.clear (); deps.push_back ($3); } +-| statements CAUSE statement { $$ = $3; data.add_dependencies ($3, deps); ++| statements CAUSE statement { $$ = $3; data_.add_dependencies ($3, deps); + deps.clear (); deps.push_back ($3); } +-| statements DELAY statement { $$ = $3; data.add_delay ($3, $1, $2); } ++| statements DELAY statement { $$ = $3; data_.add_delay ($3, $1, $2); } + + statement: +-SYMBOL '=' SYMBOL { $$ = $1; data.set_value ($1, n, timing::sigvalue ($3)); } +-| SYMBOL '=' STRING { $$ = $1; data.set_value ($1, n, timing::sigvalue ($3, timing::STATE)); } ++SYMBOL '=' SYMBOL { $$ = $1; data_.set_value ($1, n, timing::sigvalue ($3)); } ++| SYMBOL '=' STRING { $$ = $1; data_.set_value ($1, n, timing::sigvalue ($3, timing::STATE)); } + | SYMBOL { $$ = $1; }; + + %% +--- a/src/globals.h ++++ b/src/globals.h +@@ -22,7 +22,7 @@ + #define YYSTYPE std::string + + extern unsigned n; +-extern timing::data data; ++extern timing::data data_; + extern timing::signal_sequence deps; + + #endif +--- a/src/timing.cc ++++ b/src/timing.cc +@@ -113,16 +113,16 @@ sigdata &sigdata::operator= (const sigda + + // ------------------------------------------------------------ + +-data::data (void) : maxlen (0) { ++timing::data::data (void) : maxlen (0) { + } + +-data::data (const data &d) { ++timing::data::data (const timing::data &d) { + *this = d; + } + + // ------------------------------------------------------------ + +-data &data::operator= (const data &d) { ++timing::data &timing::data::operator= (const timing::data &d) { + maxlen = d.maxlen; + signals = d.signals; + sequence = d.sequence; +@@ -132,7 +132,7 @@ data &data::operator= (const data &d) { + + // ------------------------------------------------------------ + +-sigdata &data::find_signal (const signame &name) { ++sigdata &timing::data::find_signal (const signame &name) { + signal_database::iterator i = signals.find (name); + if (i == signals.end ()) { + i = signals.insert (signal_database::value_type (name, sigdata ())).first; +@@ -143,7 +143,7 @@ sigdata &data::find_signal (const signam + + // ------------------------------------------------------------ + +-const sigdata &data::find_signal (const signame &name) const { ++const sigdata &timing::data::find_signal (const signame &name) const { + signal_database::const_iterator i = signals.find (name); + if (i == signals.end ()) + throw not_found (name); +@@ -152,7 +152,7 @@ const sigdata &data::find_signal (const + + // ------------------------------------------------------------ + +-void data::add_dependency (const signame &name, const signame &dep) { ++void timing::data::add_dependency (const signame &name, const signame &dep) { + // find the signal + sigdata &sig = find_signal (name); + sigdata &trigger = find_signal (dep); +@@ -168,14 +168,14 @@ void data::add_dependency (const signame + + // ------------------------------------------------------------ + +-void data::add_dependencies (const signame &name, const signal_sequence &deps) { ++void timing::data::add_dependencies (const signame &name, const signal_sequence &deps) { + for (signal_sequence::const_iterator j = deps.begin (); j != deps.end (); ++ j) + add_dependency (name, *j); + } + + // ------------------------------------------------------------ + +-void data::add_delay (const signame &name, const signame &dep, const string &text) { ++void timing::data::add_delay (const signame &name, const signame &dep, const string &text) { + // a delay always indicates a dependency + // (but would require a way to select which is rendered) + // add_dependency (name, dep); +@@ -206,7 +206,7 @@ void data::add_delay (const signame &nam + + // ------------------------------------------------------------ + +-void data::set_value (const signame &name, unsigned n, const sigvalue &value) { ++void timing::data::set_value (const signame &name, unsigned n, const sigvalue &value) { + // find the signal + sigdata &sig = find_signal (name); + +@@ -228,7 +228,7 @@ void data::set_value (const signame &nam + + // ------------------------------------------------------------ + +-void data::pad (unsigned n) { ++void timing::data::pad (unsigned n) { + // pad all sequences to length n + if (n > maxlen) + maxlen = n; +@@ -250,7 +250,7 @@ ostream &operator<< (ostream &f, const s + + // ------------------------------------------------------------ + +-ostream &operator<< (ostream &f, const data &data) { ++ostream &operator<< (ostream &f, const timing::data &data) { + f << "signals: " << endl; + for (signal_sequence::const_iterator i = data.sequence.begin (); + i != data.sequence.end (); ++ i) +@@ -288,7 +288,7 @@ ostream &operator<< (ostream &f, const d + // ------------------------------------------------------------ + // calculate the required label width + +-static int label_width (const data &d) { ++static int label_width (const timing::data &d) { + int labelWidth = 0; + + #ifndef LITE +@@ -319,7 +319,7 @@ static int label_width (const data &d) { + // ------------------------------------------------------------ + // calculate the basic height and width required before scaling + +-static void base_size (const data &d, int &w, int &h) { ++static void base_size (const timing::data &d, int &w, int &h) { + + vCellHsep = vCellHt / 8; + vCellH=vCellHt-vCellHsep; +@@ -596,7 +596,7 @@ static void draw_delay (gc &gc, int x0, + + // ------------------------------------------------------------ + +-static void render_common (gc& gc, const data &d, ++static void render_common (gc& gc, const timing::data &d, + double hscale, double vscale) { + + gc.push (); +@@ -650,7 +650,7 @@ static void render_common (gc& gc, const + + // ------------------------------------------------------------ + +-void timing::render (gc &gc, const data &d, double scale) { ++void timing::render (gc &gc, const timing::data &d, double scale) { + int base_width, base_height; + base_size (d, base_width, base_height); + +@@ -662,7 +662,7 @@ void timing::render (gc &gc, const data + + // ------------------------------------------------------------ + +-void timing::render (gc &gc, const data &d, int w, int h, bool fixAspect) { ++void timing::render (gc &gc, const timing::data &d, int w, int h, bool fixAspect) { + int base_width, base_height; + base_size (d, base_width, base_height); + +--- a/src/main.cc ++++ b/src/main.cc +@@ -44,7 +44,7 @@ static void banner (void); + static void freesoft (void); + + unsigned n; +-timing::data data; ++timing::data data_; + timing::signal_sequence deps; + string outfile; + int verbose = 0; +@@ -87,9 +87,9 @@ static void render_it (timing::gc& gc, i + int width, int height, double scale) + { + if (flags & FLAG_PAGESIZE) +- render (gc, data, width, height, (flags & FLAG_ASPECT)); ++ render (gc, data_, width, height, (flags & FLAG_ASPECT)); + else +- render (gc, data, scale); ++ render (gc, data_, scale); + } + + int main (int argc, char *argv[]) { +@@ -193,9 +193,9 @@ int main (int argc, char *argv[]) { + } + } + +- data.pad (n); ++ data_.pad (n); + if (verbose) +- cout << data; ++ cout << data_; + + if (outfile.empty ()) + return 0; diff -Nru drawtiming-0.7.1/debian/patches/series drawtiming-0.7.1/debian/patches/series --- drawtiming-0.7.1/debian/patches/series 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/patches/series 2023-04-29 02:03:03.000000000 +0000 @@ -1,5 +1,4 @@ -InitializeMagick.diff manpage-fix.diff missing-includes.diff switch_LDFLAGS_LDADD.diff -test_workaround.diff +repair-build-c++-17.patch diff -Nru drawtiming-0.7.1/debian/patches/switch_LDFLAGS_LDADD.diff drawtiming-0.7.1/debian/patches/switch_LDFLAGS_LDADD.diff --- drawtiming-0.7.1/debian/patches/switch_LDFLAGS_LDADD.diff 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/patches/switch_LDFLAGS_LDADD.diff 2023-04-29 02:03:03.000000000 +0000 @@ -2,7 +2,8 @@ This change is to move the objects before the libs. to fix an FTBFS when --as-needed is passed to gcc. Author: أحمد المحمودي (Ahmed El-Mahmoudy) -Forwarded: yes +Bug: https://sourceforge.net/p/drawtiming/patches/11/ +Forwarded: https://sourceforge.net/p/drawtiming/patches/_discuss/thread/c4f498bf/3acf/attachment/switch_LDFLAGS_LDADD.diff --- drawtiming-0.7.1.orig/src/Makefile.am +++ drawtiming-0.7.1/src/Makefile.am @@ -3,7 +3,7 @@ diff -Nru drawtiming-0.7.1/debian/patches/test_workaround.diff drawtiming-0.7.1/debian/patches/test_workaround.diff --- drawtiming-0.7.1/debian/patches/test_workaround.diff 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/patches/test_workaround.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Workaround around a regression in GraphicsMagick that causes a - test to fail. -Author: أحمد المحمودي (Ahmed El-Mahmoudy) -Bug-Debian: https://bugs.debian.org/759956 ---- a/samples/memory.txt -+++ b/samples/memory.txt -@@ -1,7 +1,7 @@ - CS1 = 1, OE = 1, ADDR = X, DATA = Z. - --CS1 = 0, OE = 0, ADDR = "". --OE -tOE> DATA = ""; -+CS1 = 0, OE = 0, ADDR = " ". -+OE -tOE> DATA = " "; - CS1 -tCS1> DATA; - ADDR -tACC> DATA. - diff -Nru drawtiming-0.7.1/debian/rules drawtiming-0.7.1/debian/rules --- drawtiming-0.7.1/debian/rules 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/rules 2023-04-29 02:03:03.000000000 +0000 @@ -1,11 +1,10 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ -override_dh_auto_configure: - dh_auto_configure -- LDFLAGS="$(LDFLAGS) -Wl,--as-needed" - override_dh_installexamples: dh_installexamples sed -e 's/\.\.\/src\///;s/\$$srcdir/\/usr\/share\/doc\/drawtiming\/examples/' \ diff -Nru drawtiming-0.7.1/debian/tests/control drawtiming-0.7.1/debian/tests/control --- drawtiming-0.7.1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ drawtiming-0.7.1/debian/tests/control 2023-04-29 02:03:03.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: runsamples +Restrictions: allow-stderr diff -Nru drawtiming-0.7.1/debian/tests/runsamples drawtiming-0.7.1/debian/tests/runsamples --- drawtiming-0.7.1/debian/tests/runsamples 1970-01-01 00:00:00.000000000 +0000 +++ drawtiming-0.7.1/debian/tests/runsamples 2023-04-29 02:03:03.000000000 +0000 @@ -0,0 +1,29 @@ +#!/bin/sh + +# Inspired from upstream runsamples.sh + +echo "Running sample test" + +drawtiming -o $AUTOPKGTEST_TMP/sample.gif samples/sample.txt || exit 1 + +echo "PASSED sample test" +echo "Running statement test" + +drawtiming -o $AUTOPKGTEST_TMP/statement1.gif samples/statement1.txt || exit 1 + +echo "PASSED statement test" +echo "Running memory test" + +drawtiming -x 1.5 -o $AUTOPKGTEST_TMP/memory.gif samples/memory.txt || exit 1 + +echo "PASSED memory test" +echo "Running sample test with pagesize" + +drawtiming -p 640x480 -o $AUTOPKGTEST_TMP/sample640x480.gif samples/sample.txt || exit 1 + +echo "PASSED sample test with pagesize" +echo "Running Guenter test" + +drawtiming -o $AUTOPKGTEST_TMP/guenter.gif samples/guenter.txt || exit 1 + +echo "PASSED Guenter test" diff -Nru drawtiming-0.7.1/debian/upstream/signing-key.asc drawtiming-0.7.1/debian/upstream/signing-key.asc --- drawtiming-0.7.1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ drawtiming-0.7.1/debian/upstream/signing-key.asc 2023-04-29 02:03:03.000000000 +0000 @@ -0,0 +1,25 @@ +-----BEGIN PGP ARMORED FILE----- +Comment: Use "gpg --dearmor" for unpacking + +mQGiBEFR5e8RBAC6mEsZCAz2G5nsK0+Aon3+nEycmPZQ3NZx2XAofeB1NDdmdvWP +gHselRKPyr/wGNAGudXZ+br3ThYGKTpKljkDoxSSYy7Qn6wkOAgb6xHLt2snL0Jd +dGCMVksOEKuTn1uCjdG1qMcdW84CnWl5hbfbOKO9+HMNly6InIsqGPsgbwCgk+ya +6u/iXCcJ/ZpPI+Nj6MJgwlMD/1whuQ5Ew/6fdjjrJRi71rg8JQTh4bNn4VzzxvgA +zodUpYMzM5qizvUqZRBdE1GX3LaJd0P8htD1dESH4bObWmjxx6X8ogMeNubm23Xw +BOEyrxhP76UjkPPBV+Np5ZT6ReZQ/N5EMhvmJ0tgmHtI/cDE3RRyzRPVQunb4HHj +9Qt0A/9dnk066uqQi+WVl9+/Ge/cZJ+dzz6GlpXhdAupHv++/Rm4gWmvJ2E4HCr6 +0zO1TdO6O+CiQYkvDwuNYFXNzY8cV5MxJtHu/6pyKojxnms61/Vnskqv1BZxaGie +PzrtwOgwAzDE9nyNEKONVMlCKJwV/vnJySU7R4LJaDVAuyQ5trRERWR3YXJkIENv +dW5jZSAoU291cmNlRm9yZ2UgcHJvamVjdHMpIDxlY291bmNlQHVzZXJzLnNvdXJj +ZWZvcmdlLm5ldD6IXgQTEQIAHgUCQVHl7wIbAwYLCQgHAwIDFQIDAxYCAQIeAQIX +gAAKCRBA3c37O/UpiGy1AJ9iMrOIGSI2GA+zw5L9ddHvi70z6gCgjNv6M011IQaO +B1kCuWUU0V+jdhO5AQ0EQVHl8RAEAIdraGGB+Wxs2f9i99yC4UIy7siDQMHCtbt8 +JqcIn+SYixjk7eSTP8l/zi80xunh27OwFn4/QxC1gh6/pcb6Yaz1Z+pyCn/3AAOM +5ywr1jBjrONkgp/vEYdn13VIxSX0klOWQTm7dpvs1fXAxVru+DjbQ4NbpIjYvASh +kedE4gobAAMFA/9cLjAJLJpgS27nxc/C98Wk3IhJCmIFJDnIsBjpvYHFdojhsXH9 +QW2Tefo3z2n8Sh1QgnqJyhCZxBLkIqcpkAPTBlGTsL4JeRnuWBT/dpS7IgzNuHf7 +n0lhC1taCAeMxb2aGfP8a3oah2uMuUBqi/dhIZnZb082WAL/iRa0aYd2sIhJBBgR +AgAJBQJBUeXxAhsMAAoJEEDdzfs79SmIs3wAniGuF+wh1Q0PeP2sfLPysidU0rFv +AJ9q42EO56nUswgV5Jv8kxBnjHQFZQ== +=qF2t +-----END PGP ARMORED FILE----- Binary files /tmp/tmpcjidxbs9/Zsp3rxgRT6/drawtiming-0.7.1/debian/upstream-signing-key.pgp and /tmp/tmpcjidxbs9/s6QZ_haBCZ/drawtiming-0.7.1/debian/upstream-signing-key.pgp differ diff -Nru drawtiming-0.7.1/debian/watch drawtiming-0.7.1/debian/watch --- drawtiming-0.7.1/debian/watch 2018-07-15 11:07:27.000000000 +0000 +++ drawtiming-0.7.1/debian/watch 2023-04-29 02:03:03.000000000 +0000 @@ -1,4 +1,3 @@ -version=3 +version=4 -opts=pgpsigurlmangle=s/$/.asc/ \ - http://sf.net/drawtiming/drawtiming-(.*)\.tar\.gz +opts=pgpsigurlmangle=s/$/.asc/ http://sf.net/drawtiming/drawtiming-(\d\S+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))