Package: src:gdb
Version: 10.0.50.20200913-1~exp1
Tags: patch
Here's a minimal patch which uses plain debhelper, and getting rid off cdbs.
Tried to patch as less as possible as a first step.
diff -Nru gdb-10.0.50.20200913/debian/changelog gdb-10.0.50.20200913/debian/changelog
--- gdb-10.0.50.20200913/debian/changelog 2020-09-19 19:21:55.000000000 +0200
+++ gdb-10.0.50.20200913/debian/changelog 2020-10-29 10:40:12.000000000 +0100
@@ -1,3 +1,9 @@
+gdb (10.0.50.20200913-1~exp2) UNRELEASED; urgency=medium
+
+ * Convert to debhelper v11, not using the sequencer.
+
+ -- Matthias Klose <d...@debian.org> Thu, 29 Oct 2020 10:40:12 +0100
+
gdb (10.0.50.20200913-1~exp1) experimental; urgency=medium
* New upstream version 10.0.50.20200913
diff -Nru gdb-10.0.50.20200913/debian/compat gdb-10.0.50.20200913/debian/compat
--- gdb-10.0.50.20200913/debian/compat 2020-09-19 19:05:48.000000000 +0200
+++ gdb-10.0.50.20200913/debian/compat 2020-10-29 10:40:12.000000000 +0100
@@ -1 +1 @@
-9
+11
diff -Nru gdb-10.0.50.20200913/debian/control gdb-10.0.50.20200913/debian/control
--- gdb-10.0.50.20200913/debian/control 2020-09-19 19:21:55.000000000 +0200
+++ gdb-10.0.50.20200913/debian/control 2020-10-29 10:40:12.000000000 +0100
@@ -8,8 +8,7 @@
Rules-Requires-Root: binary-targets
Build-Depends:
# Packaging deps
- cdbs (>= 0.4.90),
- debhelper (>= 9),
+ debhelper (>= 11),
lsb-release,
bzip2,
# Other tool deps
diff -Nru gdb-10.0.50.20200913/debian/control.in gdb-10.0.50.20200913/debian/control.in
--- gdb-10.0.50.20200913/debian/control.in 2020-09-19 19:21:55.000000000 +0200
+++ gdb-10.0.50.20200913/debian/control.in 2020-10-29 10:40:12.000000000 +0100
@@ -8,8 +8,7 @@
Rules-Requires-Root: binary-targets
Build-Depends:
# Packaging deps
- cdbs (>= 0.4.90),
- debhelper (>= 9),
+ debhelper (>= 11),
lsb-release,
bzip2,
# Other tool deps
diff -Nru gdb-10.0.50.20200913/debian/gdb.install gdb-10.0.50.20200913/debian/gdb.install
--- gdb-10.0.50.20200913/debian/gdb.install 2020-09-19 19:05:48.000000000 +0200
+++ gdb-10.0.50.20200913/debian/gdb.install 2020-10-29 10:40:12.000000000 +0100
@@ -2,3 +2,6 @@
usr/bin/gcore
usr/share/gdb
usr/include/gdb/jit-reader.h
+# usr/share/man/man1/gdb.1
+# usr/share/man/man1/gdb-add-index.1
+# usr/share/man/man5/gdbinit.5
diff -Nru gdb-10.0.50.20200913/debian/gdbserver.install gdb-10.0.50.20200913/debian/gdbserver.install
--- gdb-10.0.50.20200913/debian/gdbserver.install 2020-09-19 19:05:48.000000000 +0200
+++ gdb-10.0.50.20200913/debian/gdbserver.install 2020-10-29 10:40:12.000000000 +0100
@@ -1 +1,3 @@
usr/bin/gdbserver
+# usr/share/man/man1/gdbserver.1
+
diff -Nru gdb-10.0.50.20200913/debian/rules gdb-10.0.50.20200913/debian/rules
--- gdb-10.0.50.20200913/debian/rules 2020-09-19 19:21:55.000000000 +0200
+++ gdb-10.0.50.20200913/debian/rules 2020-10-29 10:40:12.000000000 +0100
@@ -2,6 +2,8 @@
ALL_BUILDDIR := $(shell pwd)/build
+SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -SDate | date -f- +%s)
+
DEB_BUILDDIR := $(ALL_BUILDDIR)/objdir
DEB_DH_INSTALL_SOURCEDIR := $(shell pwd)/debian/tmp
DEB_DH_STRIP_ARGS_gdb = --dbgsym-migration='gdb-dbg (<< 7.12-1~)'
@@ -11,12 +13,6 @@
# -Werror.
DEB_WARNING_FLAGS :=
-# This implements the .deb package creation using debhelper.
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-# This implements building using a configure script and Makefile.
-include /usr/share/cdbs/1/class/python-autotools.mk
-
# The top-level configure script fails to pass these down properly ...
export CPPFLAGS
export LDFLAGS
@@ -106,6 +102,17 @@
INSTALL = $(install)
export INSTALL
+DEB_CONFIGURE_NORMAL_ARGS = \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --prefix=/usr \
+ --libexecdir="\$${prefix}/lib/gdb" \
+ --disable-maintainer-mode \
+ --disable-dependency-tracking \
+ --disable-silent-rules
+
+DEB_CONFIGURE_DEBUG_ARGS =
+
# We pass srcdir explicitly to avoid an extra '/.' at the end of it. That
# causes a harmless, but ugly, testsuite failure in maint.exp.
EXTRA_FLAGS := --disable-gdbtk --disable-shared \
@@ -184,11 +191,14 @@
BUILDDIRSOURCE := $(ALL_BUILDDIR)/gdb
BUILDDIRMIN := $(ALL_BUILDDIR)/gdb-minimal
-# This should probably be common-post-build-arch, but that runs during
-# install, under fakeroot, in CDBS 0.4.21.
-build/gdb$(TS):: check-stamp
+build-stamp:
+ mkdir -p $(DEB_BUILDDIR)
+ cd $(DEB_BUILDDIR) && CFLAGS="$(CFLAGS)" \
+ $(shell pwd)/configure $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_DEBUG_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
+ cd $(DEB_BUILDDIR) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
$(MAKE) -C $(DEB_BUILDDIR) info
$(MAKE) -C $(DEB_BUILDDIR)/gdb/doc refcard.dvi refcard.ps
+ touch $@
build/gdb-multiarch:: build-multiarch-stamp
build-multiarch-stamp:
@@ -213,7 +223,8 @@
endif
touch $@
-clean::
+clean:
+ dh_clean
rm -f check-stamp build-multiarch-stamp
rm -f debian/files
rm -rf $(ALL_BUILDDIR)
@@ -230,7 +241,17 @@
# updates the copy in the source directory.
find bfd -name bfd.info\* | xargs --no-run-if-empty touch
-binary-post-install/gdb$(TS) ::
+install:
+ dh_prep
+
+ : # gdb install
+ $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
+
+ dh_install
+
+ install -d debian/gdb$(TS)/usr/share/man/man1; \
+ install -m 644 debian/gcore.1 debian/gdb$(TS)/usr/share/man/man1/.
+
if [ -x debian/tmp/usr/bin/run ]; then \
mv debian/tmp/usr/bin/run \
debian/gdb$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run; \
@@ -239,6 +260,7 @@
mv debian/tmp/usr/share/man/man1/run.1 \
debian/gdb$(TS)/usr/share/man/man1/$(DEB_TARGET_ALIAS)-run.1; \
fi
+
ifeq ($(run_tests),yes)
install -d debian/gdb$(TS)/usr/share/doc/gdb
install -m 644 $(DEB_BUILDDIR)/gdb/testsuite/gdb.sum \
@@ -257,18 +279,16 @@
rm -f debian/gdb$(TS)/usr/bin/$(TP)gdbtui
install -m 755 debian/gdbtui debian/gdb$(TS)/usr/bin/$(TP)gdbtui
-binary-post-install/gdb-multiarch ::
+ : # gdb-multiarch install
install -d debian/gdb-multiarch/usr/bin
install -s -m 755 $(BUILDDIRMULTIARCH)/gdb/gdb debian/gdb-multiarch/usr/bin/gdb-multiarch
- rm -rf debian/gdb-multiarch/usr/share/doc/gdb-multiarch
- ln -s gdb debian/gdb-multiarch/usr/share/doc/gdb-multiarch
-binary-post-install/gdbserver ::
+ : # gdbserver install
install -d debian/gdbserver/usr/lib
# This file is only built on some arches (x86 ones, so far)
-install debian/tmp/usr/lib/libinproctrace.so debian/gdbserver/usr/lib/
-binary-post-install/gdb-minimal ::
+ : # gdb-minimal install
install -d debian/gdb-minimal/usr/bin
$(INSTALL) -m 755 -o root -g root \
$(BUILDDIRMIN)/gdb/gdb debian/gdb-minimal/usr/bin/gdb
@@ -281,7 +301,7 @@
install -d debian/gdb-minimal/etc/gdb/gdbinit.d
install -m 644 debian/gdbinit debian/gdb-minimal/etc/gdb/
-binary-post-install/gdb-source ::
+ : # gdb-source install
install -d debian/gdb-source/usr/src
mkdir -p $(BUILDDIRSOURCE)
tar --exclude build --exclude .git -cf - . \
@@ -291,7 +311,7 @@
&& tar -cjf $(shell pwd)/debian/gdb-source/usr/src/gdb.tar.bz2 \
--format=gnu \
--mode=755 \
- --mtime="@$${SOURCE_DATE_EPOCH}" --clamp-mtime \
+ --mtime="@$(SOURCE_DATE_EPOCH)" --clamp-mtime \
--numeric-owner --owner=0 --group=0 \
--sort=name \
$(notdir $(BUILDDIRSOURCE))
@@ -324,5 +344,58 @@
DEB_INSTALL_DOCS_gdb-minimal = $(DEB_INSTALL_DOCS_gdb$(TS))
DEB_INSTALL_CHANGELOGS_gdb-minimal = -XChangeLog
+build: build-arch build-indep
+
+build-indep: build-stamp
+
+build-arch: build-stamp build-multiarch-stamp build-minimal-stamp
+
+binary: binary-indep binary-arch
+
+binary-indep: build install
+ dh_installdocs -i
+ dh_installchangelogs -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: build install
+ dh_installdocs -pgdb$(TS) \
+ gdb/NEWS gdb/README gdb/doc/refcard.tex \
+ $(DEB_BUILDDIR)/gdb/doc/refcard.dvi \
+ $(DEB_BUILDDIR)/gdb/doc/refcard.ps \
+ gdb/contrib/
+ dh_installchangelogs -pgdb$(TS) gdb/ChangeLog
+
+ dh_installdocs -pgdb-minimal \
+ gdb/NEWS gdb/README gdb/doc/refcard.tex \
+ $(DEB_BUILDDIR)/gdb/doc/refcard.dvi \
+ $(DEB_BUILDDIR)/gdb/doc/refcard.ps \
+ gdb/contrib/
+ dh_installchangelogs -pgdb-minimal -XChangeLog
+
+ dh_installdocs -pgdbserver gdbserver/README
+ dh_installchangelogs -pgdbserver gdbserver/ChangeLog
+
+ install -d debian/gdb-multiarch/usr/share/doc
+ ln -s gdb debian/gdb-multiarch/usr/share/doc/gdb-multiarch
+
+ dh_strip -pgdb$(TS) --dbgsym-migration='gdb-dbg (<< 7.12-1~)'
+ dh_strip -a -Ngdb$(TS)
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
+
.PHONY: FORCE
FORCE:
