Control: tags -1 + patch

On Wed, 06 Jun 2018 at 12:29:54 +0200, Jakub Wilk wrote:
> --2018-06-06 10:24:50--  
> http://pubs.opengroup.org/onlinepubs/9699919799/download/susv4tc2.tar.bz2
...
> 2018-06-06 10:24:52 ERROR 404: Not Found.

I've prepared a patch to update this package to susv4-2018, aka
POSIX.1-2017, and fixed some minor issues I noticed while doing that
update. Please see attached.

I've also imported the history of the sus package from snapshot.debian.org
into a git repository at <https://salsa.debian.org/smcv/sus>. If you
find that useful, please copy that repository somewhere appropriate (I
would suggest https://salsa.debian.org/debian) or ask me to move it. My
proposed changes are available on the proposed/susv4-2018 branch in the
same repository.

On Sun, 02 Jul 2017 at 13:13:49 +0200, Andreas Beckmann wrote:
> during a test with piuparts I noticed your package left unowned files on
> the system after purge, which is a violation of policy 6.8 (or 10.8)
...
>   /usr/share/doc/susv4/susv4tc2/       not owned
>   /usr/share/doc/susv4/susv4tc2/Figures/       not owned

This is because the postrm wasn't updated when the rest of the package
was updated from TC1 to TC2, so it is still trying to delete
/usr/share/doc/susv4/susv4tc1. It's fixed in the attached patches.

    smcv
>From 57d7d008fd4761213ab6364e8380107a12bd66e1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 14 Jun 2018 09:04:27 +0100
Subject: [PATCH 1/4] Update susv4 to POSIX.1-2017 (SUSv4, 2018 edition)

- This fixes installability of the package since SUSv4 TC2 is no
  longer available for download (Closes: #900882)
- Delete the correct directory in postrm (Closes: #866872)
- Update doc-base metadata
- Update Lintian overrides
---
 debian/changelog               | 12 ++++++++++++
 debian/control                 |  7 ++++---
 debian/susv4.doc-base          |  8 ++++----
 debian/susv4.lintian-overrides |  4 ++--
 debian/susv4.postinst          |  8 ++++----
 debian/susv4.prerm             |  2 +-
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f58df3b..013d3c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sus (7.20161013+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Update susv4 to POSIX.1-2017 (SUSv4, 2018 edition)
+    - This fixes installability of the package since SUSv4 TC2 is no
+      longer available for download (Closes: #900882)
+    - Delete the correct directory in postrm (Closes: #866872)
+    - Update doc-base metadata
+    - Update Lintian overrides
+
+ -- Simon McVittie <s...@debian.org>  Thu, 14 Jun 2018 08:20:34 +0100
+
 sus (7.20161013) unstable; urgency=medium
 
   * New upstream release: contains SUSv4 TC2; update checksum
diff --git a/debian/control b/debian/control
index d810a5d..4cd1f96 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,10 @@ Description: Fetch and install SUSv3
 Package: susv4
 Architecture: all
 Depends: wget, bzip2, ${misc:Depends}
-Description: Fetch and install SUSv4 (POSIX.1-2008)
+Description: Fetch and install SUSv4 (POSIX.1-2017)
  The Single Unix Specifications are not permitted to be generally
  redistributed, so this is an installer that fetches them and installs
  them in a Debian appropriate way.  This installer will fetch and
- install POSIX:2008 (also known as Single Unix Specification v4) with
- POSIX:2013 Technical Corrigendum 1 and POSIX:2016 Technical Corrigendum 2.
+ install POSIX.1-2017 (variously also known as IEEE Std 1003.1-2017,
+ The Open Group Base Specifications Issue 7, 2018 Edition, or
+ Single Unix Specification v4, 2018 edition).
diff --git a/debian/susv4.doc-base b/debian/susv4.doc-base
index 2a4b809..c039ce9 100644
--- a/debian/susv4.doc-base
+++ b/debian/susv4.doc-base
@@ -1,9 +1,9 @@
 Document: susv4
-Title: Single Unix Specification Version 4
+Title: Single Unix Specification Version 4, 2018 edition
 Author: The Open Group
-Abstract: This is the POSIX:2008 standard with POSIX:2013 corrigendum 1
+Abstract: The POSIX.1-2017 standard for Unix-like operating systems.
 Section: Debian
 
 Format: HTML
-Index: /usr/share/doc/susv4/susv4tc1/index.html
-Files: /usr/share/doc/susv4/susv4tc1/*.html
+Index: /usr/share/doc/susv4/susv4-2018/index.html
+Files: /usr/share/doc/susv4/susv4-2018/*.html
diff --git a/debian/susv4.lintian-overrides b/debian/susv4.lintian-overrides
index 8e90836..1eda5d8 100644
--- a/debian/susv4.lintian-overrides
+++ b/debian/susv4.lintian-overrides
@@ -1,3 +1,3 @@
 susv4: postinst-has-useless-call-to-install-docs
-susv4: doc-base-file-references-missing-file susv4:8 /usr/share/doc/susv4/susv4tc1/index.html
-susv4: doc-base-file-references-missing-file susv4:9 /usr/share/doc/susv4/susv4tc1/*.html
+susv4: doc-base-file-references-missing-file susv4:8 /usr/share/doc/susv4/susv4-2018/index.html
+susv4: doc-base-file-references-missing-file susv4:9 /usr/share/doc/susv4/susv4-2018/*.html
diff --git a/debian/susv4.postinst b/debian/susv4.postinst
index 06aba67..9a66b87 100644
--- a/debian/susv4.postinst
+++ b/debian/susv4.postinst
@@ -5,14 +5,14 @@ set -e
 TEMPDIR=$(mktemp -d) || exit 1
 
 echo Fetching file...
-wget -P $TEMPDIR http://pubs.opengroup.org/onlinepubs/9699919799/download/susv4tc2.tar.bz2
+wget -P $TEMPDIR http://pubs.opengroup.org/onlinepubs/9699919799/download/susv4-2018.tar.bz2
 
 echo Verifying SHA512 checksum...
-SHA512SUM="cc86b2b4860b1069cb8712ef7b5a9702510f48d6585b5414ff561f85677974c156d8cc95cf29dfdab360c13ecb884e19e2112fe5c6bc49666417c9a744a816ad"
-[ x"$(sha512sum $TEMPDIR/susv4tc2.tar.bz2 | cut -f1 -d\ )" = x"$SHA512SUM" ] || (rm -rf $TEMPDIR; exit 1)
+SHA512SUM="c356d8b9b311201bef8900add7aab18b822af0e6e1a0c63b141c7c5f5e401bf25f39dcf9976577e934b7bfc939574c965ebefd63fef7a57ad6feb875e237fd7d"
+[ x"$(sha512sum $TEMPDIR/susv4-2018.tar.bz2 | cut -f1 -d\ )" = x"$SHA512SUM" ] || (rm -rf $TEMPDIR; exit 1)
 
 echo Untarring...
-bunzip2 -cd $TEMPDIR/susv4tc2.tar.bz2 | tar xf - -C /usr/share/doc/susv4 --no-same-permissions --no-same-owner
+bunzip2 -cd $TEMPDIR/susv4-2018.tar.bz2 | tar xf - -C /usr/share/doc/susv4 --no-same-permissions --no-same-owner
 
 rm -rf $TEMPDIR
 
diff --git a/debian/susv4.prerm b/debian/susv4.prerm
index 5eb02fc..b163a4e 100644
--- a/debian/susv4.prerm
+++ b/debian/susv4.prerm
@@ -8,4 +8,4 @@ set -e
 ## like other packages - The files should still exist when the debhelper
 ## bits runs.
 
-rm -rf /usr/share/doc/susv4/susv4tc1
+rm -rf /usr/share/doc/susv4/susv4-2018
-- 
2.17.1

>From c5b51e95784daa9acd15ed8eb6cc9b106672cecf Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 14 Jun 2018 09:06:24 +0100
Subject: [PATCH 2/4] d/control: Change Priority from deprecated 'extra' to
 'optional'

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 013d3c2..c2ad4d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ sus (7.20161013+nmu1) UNRELEASED; urgency=medium
     - Delete the correct directory in postrm (Closes: #866872)
     - Update doc-base metadata
     - Update Lintian overrides
+  * d/control: Change Priority from deprecated 'extra' to 'optional'
 
  -- Simon McVittie <s...@debian.org>  Thu, 14 Jun 2018 08:20:34 +0100
 
diff --git a/debian/control b/debian/control
index 4cd1f96..fbfe899 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: sus
 Section: contrib/doc
-Priority: extra
+Priority: optional
 Maintainer: David Weinehall <t...@debian.org>
 Build-Depends-Indep: debhelper (>= 10)
 Standards-Version: 3.9.8
-- 
2.17.1

>From 8d06b302150373026844231052dd11b96501482b Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 14 Jun 2018 09:13:29 +0100
Subject: [PATCH 3/4] d/*.postinst: Use `which install-docs > /dev/null`

This is the preferred way to probe for presence or absence of
install-docs, instead of hard-coding its absolute path (see #883742).
---
 debian/changelog      | 3 +++
 debian/susv2.postinst | 2 +-
 debian/susv3.postinst | 2 +-
 debian/susv4.postinst | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2ad4d8..2e3e523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ sus (7.20161013+nmu1) UNRELEASED; urgency=medium
     - Update doc-base metadata
     - Update Lintian overrides
   * d/control: Change Priority from deprecated 'extra' to 'optional'
+  * d/*.postinst: Use `which install-docs > /dev/null` to probe for
+    presence or absence of install-docs, instead of hard-coding its
+    absolute path (see #883742)
 
  -- Simon McVittie <s...@debian.org>  Thu, 14 Jun 2018 08:20:34 +0100
 
diff --git a/debian/susv2.postinst b/debian/susv2.postinst
index 2c0c42b..db2bb1e 100644
--- a/debian/susv2.postinst
+++ b/debian/susv2.postinst
@@ -19,7 +19,7 @@ rm -rf $TEMPDIR
 # Since the documents don't exist when the install-docs is first run
 # we need to re-run install-docs to ensure that the doc-base files
 # actually gets registered in the database
-if [ -x /usr/sbin/install-docs ]; then
+if which install-docs > /dev/null; then
 	install-docs --install /usr/share/doc-base/susv2
 fi
 
diff --git a/debian/susv3.postinst b/debian/susv3.postinst
index 26324a3..46d14e4 100644
--- a/debian/susv3.postinst
+++ b/debian/susv3.postinst
@@ -19,7 +19,7 @@ rm -rf $TEMPDIR
 # Since the documents don't exist when the install-docs is first run
 # we need to re-run install-docs to ensure that the doc-base files
 # actually gets registered in the database
-if [ -x /usr/sbin/install-docs ]; then
+if which install-docs > /dev/null; then
 	install-docs --install /usr/share/doc-base/susv3
 fi
 
diff --git a/debian/susv4.postinst b/debian/susv4.postinst
index 9a66b87..860bdc5 100644
--- a/debian/susv4.postinst
+++ b/debian/susv4.postinst
@@ -19,7 +19,7 @@ rm -rf $TEMPDIR
 # Since the documents don't exist when the install-docs is first run
 # we need to re-run install-docs to ensure that the doc-base files
 # actually gets registered in the database
-if [ -x /usr/sbin/install-docs ]; then
+if which install-docs > /dev/null; then
 	install-docs --install /usr/share/doc-base/susv4
 fi
 
-- 
2.17.1

>From d618192021f314c1b9dc5e7a6cb5d4860f08cf1c Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 14 Jun 2018 09:15:55 +0100
Subject: [PATCH 4/4] d/control: Move debhelper from Build-Depends-Indep to
 Build-Depends
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is needed for the clean target (Policy §7.7).
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2e3e523..8a158dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ sus (7.20161013+nmu1) UNRELEASED; urgency=medium
   * d/*.postinst: Use `which install-docs > /dev/null` to probe for
     presence or absence of install-docs, instead of hard-coding its
     absolute path (see #883742)
+  * d/control: Move debhelper from Build-Depends-Indep to Build-Depends,
+    because it is needed for the clean target (Policy §7.7)
 
  -- Simon McVittie <s...@debian.org>  Thu, 14 Jun 2018 08:20:34 +0100
 
diff --git a/debian/control b/debian/control
index fbfe899..03e9eee 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sus
 Section: contrib/doc
 Priority: optional
 Maintainer: David Weinehall <t...@debian.org>
-Build-Depends-Indep: debhelper (>= 10)
+Build-Depends: debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: susv2
-- 
2.17.1

Reply via email to