Hi again,
I did some improvements in packaging and, now, I reuploaded the
package to 12-day/delay queue.
I attached a diff to show my last changes. To see the full packaging,
please go to Salsa[1].
[1] https://salsa.debian.org/debian/shc
The current changelog is:
shc (4.0.3-0.1) unstable; urgency=medium
* Non-maintainer upload. (Closes: #942544)
* New upstream version 4.0.3
* Using new DH level format. Consequently:
- debian/compat: removed.
- debian/control: changed from 'debhelper' to 'debhelper-compat' in
Build-Depends field and bumped level to 12.
* debian/control:
- Added ash, ksh, rc, tcsh, zsh to Build-Depends field to allow 'make
test' command work fine.
- Added 'Rules-Requires-Root: no' to debian/control source stanza.
- Bumped Standards-Version to 4.4.1.
- Updated upstream address in Homepage field.
- Updated VCS fields to use Salsa.
* debian/copyright:
- Added a comment in header to quote the original upstream homepage.
- Added rights for all upstreams.
- Added Upstream-Contact field.
- Fixed rights for packagers.
* debian/rules:
- Enabled DEB_BUILD_MAINT_OPTIONS variable to provide a full hardening to
final binary.
- Removed all trash.
* debian/patches/010_fix-rc-path.patch: created to fix 'rc' path to allow the
build system run tests.
* debian/salsa-ci.yml: created to provide CI tests via Salsa.
* debian/tests/*: created to provide some trivial CI tests.
* debian/upstream/signing-key.asc: removed because the upstream didn't sign
the tarballs since 3.9.6 version. Currently, it can result in a rejection
when uploading the package.
* debian/watch: remade to look at releases instead of tags.
Regards,
Eriberto
diff -Naur old/shc-4.0.3/debian/changelog shc/debian/changelog
--- old/shc-4.0.3/debian/changelog 2019-10-17 13:47:33.000000000 -0300
+++ shc/debian/changelog 2019-10-20 01:12:14.873168202 -0300
@@ -7,6 +7,8 @@
- debian/control: changed from 'debhelper' to 'debhelper-compat' in
Build-Depends field and bumped level to 12.
* debian/control:
+ - Added ash, ksh, rc, tcsh, zsh to Build-Depends field to allow 'make
+ test' command work fine.
- Added 'Rules-Requires-Root: no' to debian/control source stanza.
- Bumped Standards-Version to 4.4.1.
- Updated upstream address in Homepage field.
@@ -17,11 +19,12 @@
- Added Upstream-Contact field.
- Fixed rights for packagers.
* debian/rules:
- - Created override_dh_auto_test target to avoid a FTBFS because the
- upstream test procedure fail.
- Enabled DEB_BUILD_MAINT_OPTIONS variable to provide a full hardening to
final binary.
- Removed all trash.
+ * debian/patches/010_fix-rc-path.patch: created to fix 'rc' path to allow the
+ build system run tests.
+ * debian/salsa-ci.yml: created to provide CI tests via Salsa.
* debian/tests/*: created to provide some trivial CI tests.
* debian/upstream/signing-key.asc: removed because the upstream didn't sign
the tarballs since 3.9.6 version. Currently, it can result in a rejection
diff -Naur old/shc-4.0.3/debian/control shc/debian/control
--- old/shc-4.0.3/debian/control 2019-10-17 13:47:33.000000000 -0300
+++ shc/debian/control 2019-10-20 00:59:27.797168013 -0300
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Tong Sun <suntong...@users.sourceforge.net>
-Build-Depends: debhelper-compat (= 12)
+Build-Depends: debhelper-compat (= 12), ash, ksh, rc, tcsh, zsh
Standards-Version: 4.4.1
Rules-Requires-Root: no
Homepage: https://neurobin.org/projects/softwares/unix/shc/
diff -Naur old/shc-4.0.3/debian/patches/010_fix-rc-path.patch shc/debian/patches/010_fix-rc-path.patch
--- old/shc-4.0.3/debian/patches/010_fix-rc-path.patch 1969-12-31 21:00:00.000000000 -0300
+++ shc/debian/patches/010_fix-rc-path.patch 2019-10-20 01:02:25.917168057 -0300
@@ -0,0 +1,13 @@
+Description: fix rc path to allow build system run tests
+Author: Joao Eriberto Mota Filho <eribe...@debian.org>
+Last-Update: 2019-10-20
+--- shc-4.0.3.orig/test/ttest.sh
++++ shc-4.0.3/test/ttest.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+
+-shells=('/bin/sh' '/bin/dash' '/bin/bash' '/bin/ash' '/bin/ksh' '/bin/zsh' '/usr/bin/tcsh' '/bin/csh' '/usr/bin/rc')
++shells=('/bin/sh' '/bin/dash' '/bin/bash' '/bin/ash' '/bin/ksh' '/bin/zsh' '/usr/bin/tcsh' '/bin/csh' '/bin/rc')
+ ## Install: sudo apt install dash bash ash ksh zsh tcsh csh rc
+
+ check_opts=('' '-r' '-v' '-D' '-S')
diff -Naur old/shc-4.0.3/debian/patches/series shc/debian/patches/series
--- old/shc-4.0.3/debian/patches/series 1969-12-31 21:00:00.000000000 -0300
+++ shc/debian/patches/series 2019-10-20 01:01:41.125168046 -0300
@@ -0,0 +1 @@
+010_fix-rc-path.patch
diff -Naur old/shc-4.0.3/debian/rules shc/debian/rules
--- old/shc-4.0.3/debian/rules 2019-10-17 13:47:33.000000000 -0300
+++ shc/debian/rules 2019-10-20 00:06:26.029167228 -0300
@@ -5,5 +5,3 @@
%:
dh $@
-
-override_dh_auto_test:
diff -Naur old/shc-4.0.3/debian/salsa-ci.yml shc/debian/salsa-ci.yml
--- old/shc-4.0.3/debian/salsa-ci.yml 1969-12-31 21:00:00.000000000 -0300
+++ shc/debian/salsa-ci.yml 2019-10-20 00:25:35.693167511 -0300
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Naur old/shc-4.0.3/debian/tests/control shc/debian/tests/control
--- old/shc-4.0.3/debian/tests/control 2019-10-17 13:47:33.000000000 -0300
+++ shc/debian/tests/control 2019-10-20 00:59:37.509168015 -0300
@@ -7,4 +7,8 @@
Test-Command: shc -h
Restrictions: allow-stderr
+Test-Command: dh_auto_test
+Depends: @, debhelper, ash, ksh, rc, tcsh, zsh
+Restrictions: allow-stderr
+
Tests: fire.sh
