Merging debian version 13.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 55 insertions, 31 deletions

diff --git a/debian/base-files.links b/debian/base-files.links
index 3166652..3dd0249 100644
--- a/debian/base-files.links
+++ b/debian/base-files.links
@@ -1,4 +1,4 @@
-usr/share/doc/base-files/README    usr/share/doc/base-files/FAQ 
+usr/share/doc/base-files/README    usr/share/doc/base-files/FAQ
 usr/share/common-licenses/GFDL-1.3 usr/share/common-licenses/GFDL
 usr/share/common-licenses/LGPL-3   usr/share/common-licenses/LGPL
 usr/share/common-licenses/GPL-3    usr/share/common-licenses/GPL
diff --git a/debian/changelog b/debian/changelog
index 5418a6c..44bd6e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+base-files (13.1) unstable; urgency=medium
+
+  * Rename postinst.in to postinst. Use dh_installdeb token feature instead.
+  * Add /usr/local/libexec. Closes: #994220.
+  * Machine-readable copyright file. Closes: #1020828.
+  * Add a debian/gbp.conf file.
+
+ -- Santiago Vila <sanvila@debian.org>  Wed, 17 Apr 2024 12:45:00 +0200
+
 base-files (13-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/clean b/debian/clean
index ccba3ce..e69de29 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +0,0 @@
-debian/postinst
diff --git a/debian/copyright b/debian/copyright
index 3f5ed9b..a971207 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,37 @@
-This is the Debian prepackaged version of the Debian Base System
-Miscellaneous files. These files were written by Ian Murdock
-<imurdock@debian.org> and Bruce Perens <bruce@pixar.com>.
-
-This package was first put together by Bruce Perens <Bruce@Pixar.com>,
-from his own sources.
-
-The GNU Public Licenses in /usr/share/common-licenses were taken from
-ftp.gnu.org and are copyrighted by the Free Software Foundation, Inc.
-
-The Artistic License in /usr/share/common-licenses is the one coming
-from Perl and its SPDX name is "Artistic License 1.0 (Perl)".
-
-
-Copyright (C) 1995-2011 Software in the Public Interest.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This is the Debian prepackaged version of the Debian Base System
+ Miscellaneous files. These files were written by Ian Murdock
+ <imurdock@debian.org> and Bruce Perens <bruce@pixar.com>.
+ .
+ This package was first put together by Bruce Perens <Bruce@Pixar.com>,
+ from his own sources.
+
+Files: *
+Copyright: (C) 1995-2011 Software in the Public Interest
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+Comment:
+ The Artistic License in /usr/share/common-licenses is the one coming
+ from Perl and its SPDX name is "Artistic License 1.0 (Perl)".
+
+Files: licenses/GFDL-*
+       licenses/GPL-*
+       licenses/LGPL-*
+Copyright: 1989-2008 Free Software Foundation, Inc.
+License: verbatim
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+Comment:
+ The GNU licenses in /usr/share/common-licenses were taken from ftp.gnu.org.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..6f74a48
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+upstream-branch = master
+debian-branch = master
+debian-tag = %(version)s
diff --git a/debian/postinst.in b/debian/postinst
index bf2bd4e..d7bf2bc 100644
--- a/debian/postinst.in
+++ b/debian/postinst
@@ -90,6 +90,7 @@ if [ "$1" = "configure" ] && [ "$2" = "" ]; then
   install_local_dir /usr/local/bin
   install_local_dir /usr/local/games
   install_local_dir /usr/local/lib
+  install_local_dir /usr/local/libexec
   install_local_dir /usr/local/include
   install_local_dir /usr/local/sbin
   install_local_dir /usr/local/src
diff --git a/debian/rules b/debian/rules
index 5f8cc31..6b62db0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,6 @@ DESTDIR = debian/base-files
 
 override_dh_auto_build:
 	sh debian/check-md5sum-etc profile
-	sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in > debian/postinst
 
 override_dh_auto_install:
 	install -p -m 644 etc/*      $(DESTDIR)/etc
@@ -55,3 +54,6 @@ override_dh_fixperms:
 	cd debian/base-files && chmod 1777 `cat ../1777-dirs`
 	cd debian/base-files && chmod 2775 `cat ../2775-dirs`
 	cd debian/base-files && chmod 700 root
+
+override_dh_installdeb:
+	dh_installdeb -DVENDORFILE=$(VENDORFILE)