Re: RFH:quilt and gbp pq
Hello!
The package has a bunch of git commits that modify files outside the
allowed debian/ directory:
± git diff --stat upstream
.gitignore | 2 ++
Disp.c | 2 +-
Makefile | 46
+++++++++++++++++++++++------------------
XFireworks.c | 1 +
debian/README.Debian | 6 ++++++
debian/changelog | 152
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/control | 16 +++++++++++++++
debian/copyright | 26 +++++++++++++++++++++++
debian/dirs | 3 +++
debian/docs | 3 +++
debian/menu | 2 ++
debian/patches/Fix-FBTFS-for-mkconf | 35
+++++++++++++++++++++++++++++++
debian/patches/Fix-FBTFS-for-time_t-transition | 45
++++++++++++++++++++++++++++++++++++++++
debian/patches/cross-build-dh_auto_build | 44
+++++++++++++++++++++++++++++++++++++++
debian/patches/debian-changes-1.3-7 | 97
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/hardening | 76
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 5 +++++
debian/postinst | 47
++++++++++++++++++++++++++++++++++++++++++
debian/postrm | 38
++++++++++++++++++++++++++++++++++
debian/preinst | 48
+++++++++++++++++++++++++++++++++++++++++++
debian/rules | 82
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/source/format | 1 +
etc.c | 4 +++-
mkconf.c | 3 ++-
xfireworks.1 | 4 ++--
25 files changed, 763 insertions(+), 25 deletions(-)
Perhaps you ran "quilt push" at some point in time and committed it?
± git log etc.c
commit 57999c372ae2c0c5646dbf5be05fff58f83d0d1f (tag: debian/1.3-14)
Author: Yukiharu YABUKI <yabuki@netfort.gr.jp>
Date: Wed May 8 01:03:46 2024 +0900
Fix FTBFS for time_t transition
commit b1b5d0481445d26703ce3b530099840d8439c680 (tag: upstream/1.3,
origin/upstream, upstream)
Author: Yukiharu YABUKI <yyabuki@debian.org>
Date: Mon Oct 28 16:27:50 2013 +0900
Imported Upstream version 1.3
Fix proposed in https://salsa.debian.org/debian/xfireworks/-/merge_requests/2
If you merge the above, I can also finalize !1 to have CI on your
package so that regressions / easily testable mistakes in the future
will be automatically detected.
Btw, the commands I use to switch to patches applies and back to
normal Debian branch are usually:
gbp pq import --force --time-machine=10
gbp pq export --drop --commit
The default gbp pq commands without these extra arguments easily cause
extra branches to be left behind or patches not getting rebases
properly.
Reply to: