Control: tags 1005981 + patch

Dear maintainer,

I've prepared an NMU for redet (versioned as 8.26-1.5) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards,

Eriberto

diff -Nru redet-8.26/debian/changelog redet-8.26/debian/changelog
--- redet-8.26/debian/changelog 2022-04-16 02:32:24.000000000 -0300
+++ redet-8.26/debian/changelog 2022-04-16 02:26:50.000000000 -0300
@@ -1,3 +1,12 @@
+redet (8.26-1.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Migrated to DebSrc 3.0. Consequently:
+      - Migrated the current patch from dpatch to quilt.
+      - Closes: #1005981
+
+ -- Joao Eriberto Mota Filho <eribe...@debian.org>  Sat, 16 Apr 2022 02:26:50 
-0300
+
 redet (8.26-1.4) unstable; urgency=medium
 
   * Non maintainer upload by the Reproducible Builds team.
diff -Nru redet-8.26/debian/control redet-8.26/debian/control
--- redet-8.26/debian/control   2022-04-16 02:32:24.000000000 -0300
+++ redet-8.26/debian/control   2022-04-16 02:23:26.000000000 -0300
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Bartosz Fenski <fe...@debian.org>
-Build-Depends: debhelper (>= 10), dpatch
+Build-Depends: debhelper (>= 10), quilt (>= 0.40)
 Standards-Version: 3.9.8
 Homepage: http://www.billposer.org/Software/redet.html
 
diff -Nru redet-8.26/debian/patches/00list redet-8.26/debian/patches/00list
--- redet-8.26/debian/patches/00list    2022-04-16 02:32:24.000000000 -0300
+++ redet-8.26/debian/patches/00list    1969-12-31 21:00:00.000000000 -0300
@@ -1 +0,0 @@
-01_path
diff -Nru redet-8.26/debian/patches/01_path.dpatch 
redet-8.26/debian/patches/01_path.dpatch
--- redet-8.26/debian/patches/01_path.dpatch    2022-04-16 02:32:24.000000000 
-0300
+++ redet-8.26/debian/patches/01_path.dpatch    1969-12-31 21:00:00.000000000 
-0300
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-## redet.dpatch
-## Bartosz Fenski <fe...@debian.org>
-
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -R -p1 < $0;;
-       *)
-               echo >&2 "`basename $0`: script expects -patch|-unpatch as 
argument"
-               exit 1;;
-esac
- 
-exit 0
-
-@DPATCH@
-diff -ru redet-6.13.orig/redet.tcl redet-6.13/redet.tcl
---- redet-6.13.orig/redet.tcl  2005-07-28 10:53:55.000000000 +0200
-+++ redet-6.13/redet.tcl       2005-07-28 11:46:40.000000000 +0200
-@@ -51,7 +51,7 @@
- set HistoryFile  ".redethist";
- set JournalFile  ".redetlog";
- set ColorFile    ".redetcolors";
--set NonBinPath [file join /usr local share Redet];
-+set NonBinPath [file join /usr share doc redet-doc];
- 
- #Portability
- #Figure out what system we are running on
diff -Nru redet-8.26/debian/patches/01_path.patch 
redet-8.26/debian/patches/01_path.patch
--- redet-8.26/debian/patches/01_path.patch     1969-12-31 21:00:00.000000000 
-0300
+++ redet-8.26/debian/patches/01_path.patch     2022-04-16 02:26:15.000000000 
-0300
@@ -0,0 +1,15 @@
+Author: Bartosz Fenski <fe...@debian.org>
+Description: fix the path and name of docs.
+Index: redet-8.26/redet.tcl
+===================================================================
+--- redet-8.26.orig/redet.tcl
++++ redet-8.26/redet.tcl
+@@ -155,7 +155,7 @@ set InitFile     ".redetrc";
+ set HistoryFile  ".redethist";
+ set JournalFile  ".redetlog";
+ set ColorFile    ".redetcolors";
+-set NonBinPath [file join /usr local share Redet];
++set NonBinPath [file join /usr share doc redet-doc];
+ 
+ #Flags showing whether windows are editable
+ set INDEditableP 0;
diff -Nru redet-8.26/debian/patches/series redet-8.26/debian/patches/series
--- redet-8.26/debian/patches/series    1969-12-31 21:00:00.000000000 -0300
+++ redet-8.26/debian/patches/series    2022-04-16 02:23:25.000000000 -0300
@@ -0,0 +1 @@
+01_path.patch
diff -Nru redet-8.26/debian/rules redet-8.26/debian/rules
--- redet-8.26/debian/rules     2022-04-16 02:32:24.000000000 -0300
+++ redet-8.26/debian/rules     2022-04-16 02:23:26.000000000 -0300
@@ -8,7 +8,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 
@@ -27,7 +27,7 @@
 
 build-arch:
 build-indep: build-indep-stamp
-build-indep-stamp: patch-stamp configure-stamp 
+build-indep-stamp: $(QUILT_STAMPFN) configure-stamp 
 
        touch build-indep-stamp
 
diff -Nru redet-8.26/debian/source/format redet-8.26/debian/source/format
--- redet-8.26/debian/source/format     1969-12-31 21:00:00.000000000 -0300
+++ redet-8.26/debian/source/format     2022-04-16 02:26:50.000000000 -0300
@@ -0,0 +1 @@
+3.0 (quilt)

Reply via email to