Package: xfsdump
Version: 3.1.11-0.2
Followup-For: Bug #1073083
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debain/compat: 7 -> 13 and also switches to use debhelper templates.
This patch is now rebased onto the latest Debian changes.
Thanks for considering the patch.
-- System Information:
Debian Release: trixie/sid
APT prefers noble-updates
APT policy: (500, 'noble-updates'), (500, 'noble-security'), (500, 'noble'),
(100, 'noble-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.8.0-36-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru xfsdump-3.1.11/debian/compat xfsdump-3.1.11/debian/compat
--- xfsdump-3.1.11/debian/compat 2024-06-12 12:17:14.000000000 -0600
+++ xfsdump-3.1.11/debian/compat 1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-7
diff -Nru xfsdump-3.1.11/debian/control xfsdump-3.1.11/debian/control
--- xfsdump-3.1.11/debian/control 2024-06-12 12:17:14.000000000 -0600
+++ xfsdump-3.1.11/debian/control 2024-06-11 19:56:03.000000000 -0600
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Nathan Scott <nath...@debian.org>
Uploaders: Anibal Monsalve Salazar <ani...@debian.org>
-Build-Depends: xfslibs-dev (>= 3.0.0), uuid-dev, libattr1-dev (>= 2.4.14),
libncurses-dev, autoconf, debhelper (>= 5), gettext, libtool, autotools-dev
+Build-Depends: xfslibs-dev (>= 3.0.0), uuid-dev, libattr1-dev (>= 2.4.14),
libncurses-dev, autoconf, debhelper-compat (= 13), gettext, libtool
Standards-Version: 3.8.1
Package: xfsdump
diff -Nru xfsdump-3.1.11/debian/Makefile xfsdump-3.1.11/debian/Makefile
--- xfsdump-3.1.11/debian/Makefile 2024-06-12 12:17:14.000000000 -0600
+++ xfsdump-3.1.11/debian/Makefile 2024-06-11 19:56:03.000000000 -0600
@@ -5,7 +5,7 @@
TOPDIR = ..
include $(TOPDIR)/include/builddefs
-LSRCFILES = changelog compat control copyright rules shlibs.local watch
+LSRCFILES = changelog control copyright rules shlibs.local watch
LDIRDIRT = xfsdump
LDIRT = files *.log *.substvars *.debhelper
diff -Nru xfsdump-3.1.11/debian/rules xfsdump-3.1.11/debian/rules
--- xfsdump-3.1.11/debian/rules 2024-06-12 12:17:14.000000000 -0600
+++ xfsdump-3.1.11/debian/rules 2024-06-11 19:56:03.000000000 -0600
@@ -1,68 +1,35 @@
#!/usr/bin/make -f
export DH_VERBOSE=1
-
-package=xfsdump
+export AUTOHEADER=true
dirme = debian/$(package)
-pkgme = DIST_ROOT=`pwd`/$(dirme); export DIST_ROOT;
-stdenv = @GZIP=-q; export GZIP;
+pkgme = DIST_ROOT=$(CURDIR)/$(dirme); export DIST_ROOT;
options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
INSTALL_USER=root INSTALL_GROUP=root ;
-checkdir = test -f debian/rules
-
-build: build-arch build-indep
-build-arch: built
-built: config
- @echo "== dpkg-buildpackage: build" 1>&2
- $(MAKE) default
- touch built
+%:
+ dh $@
-build-indep:
-
-config: .census
-.census:
+override_dh_auto_configure:
@echo "== dpkg-buildpackage: configure" 1>&2
- $(checkdir)
- dh_autotools-dev_updateconfig
+ dh_update_autotools_config
$(options) $(MAKE) include/config.h
LOCAL_CONFIGURE_OPTIONS='--exec-prefix=/nondefault --sbindir=/usr/sbin'
- touch .census
+ touch .gitcensus
+
+override_dh_auto_build:
+ @echo "== dpkg-buildpackage: build" 1>&2
+ dh_auto_build -- V=1 default
-clean:
+override_dh_clean:
@echo "== dpkg-buildpackage: clean" 1>&2
- $(checkdir)
- -rm -f built .census
- $(MAKE) distclean
- -rm -rf $(dirme)
-rm -f debian/*substvars debian/files* debian/*.debhelper
- dh_autotools-dev_restoreconfig
+ rm -f .gitcensus
dh_clean
-binary-indep:
-
-binary-arch: checkroot built
- @echo "== dpkg-buildpackage: binary-arch" 1>&2
- $(checkdir)
- -rm -rf $(dirme)
+override_dh_auto_install:
+ @echo "== dpkg-buildpackage: install" 1>&2
+ dh_testdir
$(pkgme) $(MAKE) -C . install
$(pkgme) $(MAKE) dist
- dh_installdocs
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-checkroot:
- test 0 -eq `id -u`
-
-.PHONY: binary binary-arch binary-indep clean checkroot
