Bug#965878: Bug #965878: xbitmaps: Removal of obsolete debhelper compat 5 and 6 in bookworm
Dear maintainer(s),
As a follow-up to my previous message above, I've also worked towards
fixing a few other problems and updating the package so it follows the
current best practices.
I'm sending those patches as a separate email as those aren't directly
related to this bug, but are still relevant for "modernizing" this package.
Best regards,
Arnaud
From c8c3457d402be90152b69f8c45044947a8727975 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Thu, 26 May 2022 14:19:11 +0200
Subject: [PATCH 2/6] Import changelog entry from last NMU (1.1.1-2.1)
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d1ad693..ddd7802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ xbitmaps (1.1.1-3) UNRELEASED; urgency=low
-- Julien Cristau <jcristau@debian.org> Thu, 30 Aug 2012 20:55:41 +0200
+xbitmaps (1.1.1-2.1) unstable; urgency=medium
+
+ * Non maintainer upload by the Reproducible Builds team.
+ * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Holger Levsen <holger@debian.org> Fri, 18 Dec 2020 21:00:22 +0100
+
xbitmaps (1.1.1-2) unstable; urgency=low
* Remove David from Uploaders.
--
2.35.1
From 8314b42e1904c7490bbe92801b45ee834e70d3df Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Thu, 26 May 2022 14:04:03 +0200
Subject: [PATCH 3/6] Update Vcs-* control fields to point to current repo
locations
---
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 6bb68e8..b74abeb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends:
pkg-config,
xutils-dev (>= 1:7.5~),
Standards-Version: 3.8.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/data/xbitmaps.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/data/xbitmaps.git
+Vcs-Git: https://salsa.debian.org/xorg-team/data/xbitmaps.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/data/xbitmaps
Package: xbitmaps
Architecture: all
--
2.35.1
From fa01a69a9aa83209f1a6671d0b37e5a28bb90e77 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Thu, 26 May 2022 14:18:35 +0200
Subject: [PATCH 4/6] Update watch file to version 4 and fix typo
---
debian/watch | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/debian/watch b/debian/watch
index f0586a0..0d68a0f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-#git=git://anongit.freedesktop.org/xorg/data/bitmaps
-version=3
-https://xorg.freedesktop.orgreleases/individual/data/ xbitmaps-(.*)\.tar\.gz
+version=4
+https://xorg.freedesktop.org/releases/individual/data/ xbitmaps-(.*)\.tar\.gz
--
2.35.1
From e5499ceb1bacae9d03f1802c04eb9cb18fe1a2de Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Thu, 26 May 2022 14:04:34 +0200
Subject: [PATCH 5/6] Convert to format 3.0 (quilt) and current best practices
The files added to the original source tree (autogen.sh and .gitignore)
are converted to quilt patches. Missing fields (Homepage,
Rules-Requires-Root) are added to d/control and d/copyright is converted
to DEP-5 format.
Finally, Standards-Version is updated to the current version.
---
.gitignore | 78 ------------
autogen.sh | 13 --
debian/control | 4 +-
debian/copyright | 51 ++++----
...utogen.sh-script-and-.gitignore-file.patch | 117 ++++++++++++++++++
debian/patches/series | 1 +
debian/source/format | 1 +
7 files changed, 151 insertions(+), 114 deletions(-)
delete mode 100644 .gitignore
delete mode 100755 autogen.sh
create mode 100644 debian/patches/Add-autogen.sh-script-and-.gitignore-file.patch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e99968f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# X.Org module default exclusion patterns
-# The next section if for module specific patterns
-#
-# Do not edit the following section
-# GNU Build System (Autotools)
-aclocal.m4
-autom4te.cache/
-autoscan.log
-ChangeLog
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config-ml.in
-config.py
-config.status
-config.status.lineno
-config.sub
-configure
-configure.scan
-depcomp
-.deps/
-INSTALL
-install-sh
-.libs/
-libtool
-libtool.m4
-ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mdate-sh
-missing
-mkinstalldirs
-*.pc
-py-compile
-stamp-h?
-symlink-tree
-texinfo.tex
-ylwrap
-
-# Do not edit the following section
-# Edit Compile Debug Document Distribute
-*~
-*.[0-9]
-*.[0-9]x
-*.bak
-*.bin
-core
-*.dll
-*.exe
-*-ISO*.bdf
-*-JIS*.bdf
-*-KOI8*.bdf
-*.kld
-*.ko
-*.ko.cmd
-*.lai
-*.l[oa]
-*.[oa]
-*.obj
-*.patch
-*.so
-*.pcf.gz
-*.pdb
-*.tar.bz2
-*.tar.gz
-#
-# Add & Override patterns for bitmaps
-#
-# Edit the following section as needed
-# For example, !report.pc overrides *.pc. See 'man gitignore'
-#
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index e81f989..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
-
diff --git a/debian/control b/debian/control
index b74abeb..8b4fccc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,11 @@ Build-Depends:
debhelper-compat (= 13),
pkg-config,
xutils-dev (>= 1:7.5~),
-Standards-Version: 3.8.3
+Standards-Version: 4.6.1
+Homepage: https://www.x.org/
Vcs-Git: https://salsa.debian.org/xorg-team/data/xbitmaps.git
Vcs-Browser: https://salsa.debian.org/xorg-team/data/xbitmaps
+Rules-Requires-Root: no
Package: xbitmaps
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index f6a4f94..773c7d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,30 @@
-Copyright 1988, 1998 The Open Group
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: bitmaps
+Upstream-Contact: https://lists.x.org/mailman/listinfo/xorg
+Source: https://gitlab.freedesktop.org/xorg/data/bitmaps
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
+Files: *
+Copyright:
+ 1988-1998 The Open Group
+License: X11
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of The Open Group shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from The Open Group.
diff --git a/debian/patches/Add-autogen.sh-script-and-.gitignore-file.patch b/debian/patches/Add-autogen.sh-script-and-.gitignore-file.patch
new file mode 100644
index 0000000..774bd72
--- /dev/null
+++ b/debian/patches/Add-autogen.sh-script-and-.gitignore-file.patch
@@ -0,0 +1,117 @@
+From 90edfa30632d7fe847a318f134e6328f9408535a Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
+Date: Thu, 26 May 2022 14:53:24 +0200
+Subject: [PATCH] Add autogen.sh script and .gitignore file
+
+---
+ .gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ autogen.sh | 13 +++++++++
+ 2 files changed, 91 additions(+)
+ create mode 100644 .gitignore
+ create mode 100755 autogen.sh
+
+diff --git a/.gitignore b/.gitignore
+created file mode 100644
+index 0000000..e99968f
+--- /dev/null
++++ a/.gitignore
+@@ -0,0 +1,78 @@
++#
++# X.Org module default exclusion patterns
++# The next section if for module specific patterns
++#
++# Do not edit the following section
++# GNU Build System (Autotools)
++aclocal.m4
++autom4te.cache/
++autoscan.log
++ChangeLog
++compile
++config.guess
++config.h
++config.h.in
++config.log
++config-ml.in
++config.py
++config.status
++config.status.lineno
++config.sub
++configure
++configure.scan
++depcomp
++.deps/
++INSTALL
++install-sh
++.libs/
++libtool
++libtool.m4
++ltmain.sh
++lt~obsolete.m4
++ltoptions.m4
++ltsugar.m4
++ltversion.m4
++Makefile
++Makefile.in
++mdate-sh
++missing
++mkinstalldirs
++*.pc
++py-compile
++stamp-h?
++symlink-tree
++texinfo.tex
++ylwrap
++
++# Do not edit the following section
++# Edit Compile Debug Document Distribute
++*~
++*.[0-9]
++*.[0-9]x
++*.bak
++*.bin
++core
++*.dll
++*.exe
++*-ISO*.bdf
++*-JIS*.bdf
++*-KOI8*.bdf
++*.kld
++*.ko
++*.ko.cmd
++*.lai
++*.l[oa]
++*.[oa]
++*.obj
++*.patch
++*.so
++*.pcf.gz
++*.pdb
++*.tar.bz2
++*.tar.gz
++#
++# Add & Override patterns for bitmaps
++#
++# Edit the following section as needed
++# For example, !report.pc overrides *.pc. See 'man gitignore'
++#
+diff --git a/autogen.sh b/autogen.sh
+created file mode 100755
+index 0000000..e81f989
+--- /dev/null
++++ a/autogen.sh
+@@ -0,0 +1,13 @@
++#! /bin/sh
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++ORIGDIR=`pwd`
++cd $srcdir
++
++autoreconf -v --install || exit 1
++cd $ORIGDIR || exit $?
++
++$srcdir/configure --enable-maintainer-mode "$@"
++
+--
+2.35.1
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0067d40
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Add-autogen.sh-script-and-.gitignore-file.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
2.35.1
Reply to: