[sympow] 01/01: Imported Debian patch 1.023-6

Jerome Benoit calculus-guest at moszumanska.debian.org
Mon May 2 17:49:59 UTC 2016


This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository sympow.

commit 507077a43221701800b2ba70663aaa1d61beaca4
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon May 2 17:33:38 2016 +0000

    Imported Debian patch 1.023-6
---
 debian/adhoc/contrib/sympow-new_data-job-generate | 14 +++++++++++++-
 debian/changelog                                  | 16 ++++++++++++++++
 debian/control                                    |  6 +++---
 debian/copyright                                  |  4 ++--
 debian/rules                                      | 11 ++++++++++-
 debian/sympow-data.docs                           |  1 -
 debian/sympow-data.examples                       |  1 +
 debian/sympow-data.links                          |  1 +
 debian/sympow.links                               |  3 ---
 debian/sympow.maintscript                         |  1 +
 debian/tests/control                              |  2 ++
 debian/tests/launch-contrib                       | 13 +++++++++++++
 debian/tests/launch-examples                      | 12 ++++++++++++
 13 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/debian/adhoc/contrib/sympow-new_data-job-generate b/debian/adhoc/contrib/sympow-new_data-job-generate
index fd38b87..62d3d07 100755
--- a/debian/adhoc/contrib/sympow-new_data-job-generate
+++ b/debian/adhoc/contrib/sympow-new_data-job-generate
@@ -9,8 +9,20 @@
 ##   GENERATEDSCRIPTNAME:
 ##     name of the generated script (default: `sympow-new_data.job').
 ##
+## possible launch usage:
+## $ ./GENERATEDSCRIPTNAME
+## $ at -f ./GENERATEDSCRIPTNAME now
+## $ at -f ./GENERATEDSCRIPTNAME teatime
+## $ at -f ./GENERATEDSCRIPTNAME midnight
+##
+## comments:
+## 1] the TOP_JOBDIR environment variable in the header of the generated
+##    job script might be modified according to your need and taste;
+## 2] as batch job scheduler, besides at, slurm-wln might be used (modulo
+##    meta command in the header), or any other decent job scheduler.
+##
 ## Written for Debian on behalf of the Debian Science Team
-## by Jerome Benoit <calculus at rezozer.net>, 2014/10/24.
+## by Jerome Benoit <calculus at rezozer.net>, 2016/05/02.
 ##
 TOP_BUILDDIR=$PWD
 
diff --git a/debian/changelog b/debian/changelog
index d9c55fe..9a46f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sympow (1.023-6) unstable; urgency=medium
+
+  * Debianization:
+    - debian/copyright, refresh;
+    - debian/control:
+      - Standards Version, bump to 3.9.8 (no change);
+      - Vcs-*, secure;
+    - debian/rules:
+      - dpkg-buildflags, add hardening=+all;
+      - docs installation, harden;
+    - debian/adhoc/contrib, revisit;
+    - debian/tests/*, introduce;
+    - reproducible build, attempt.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 02 May 2016 17:32:01 +0000
+
 sympow (1.023-5) unstable; urgency=medium
 
   * Debianization:
diff --git a/debian/control b/debian/control
index f95513d..0ab376e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Build-Depends:
  debhelper (>= 9), autoconf, help2man
 Build-Depends-Indep:
  pari-gp (>= 2.7.2)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://magma.maths.usyd.edu.au/~watkins/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/sympow.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/sympow.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/sympow.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/sympow.git
 
 Package: sympow
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 522c930..df7e864 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,12 +9,12 @@ Comment:
 
 Files: *
 Copyright:
- 2005-2014 Mark Watkins <watkins at maths.usyd.edu.au>
+ 2005-2016 Mark Watkins <watkins at maths.usyd.edu.au>
 License: MW-adhoc
 
 Files: debian/*
 Copyright:
- 2014 Jerome Benoit <calculus at rezozer.net>
+ 2014-2016 Jerome Benoit <calculus at rezozer.net>
  2008 Tim Abbott <tabbott at mit.edu>
 License: GPL-2+
 Comment:
diff --git a/debian/rules b/debian/rules
index e5d0e39..cb81185 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 default:
 
 %:
@@ -14,7 +16,14 @@ override_dh_auto_build-indep:
 override_dh_auto_install-indep:
 	$(MAKE) install-indep DESTDIR=$(CURDIR)/debian/tmp
 
+override_dh_installdocs:
+	dh_installdocs -psympow --link-doc=sympow-data
+	dh_installdocs --remaining-packages
+
+override_dh_compress-indep:
+	dh_compress -Xexamples -Xcontrib
+
 override_dh_installchangelogs:
 	sed -e '/^\s*$$/d' README | csplit --prefix AdHocChangeLog - %ChangeLog%
-	echo '\n\n -- changelog extracted as-is from README (Debian)' >> AdHocChangeLog00
+	echo -e '\n\n -- changelog extracted as-is from README (Debian)' >> AdHocChangeLog00
 	dh_installchangelogs AdHocChangeLog00
diff --git a/debian/sympow-data.docs b/debian/sympow-data.docs
index 1c6b540..e845566 100644
--- a/debian/sympow-data.docs
+++ b/debian/sympow-data.docs
@@ -1,2 +1 @@
 README
-debian/adhoc/contrib/
diff --git a/debian/sympow-data.examples b/debian/sympow-data.examples
index 96501e0..5ad0a63 100644
--- a/debian/sympow-data.examples
+++ b/debian/sympow-data.examples
@@ -1 +1,2 @@
 debian/adhoc/examples/samples.sh
+debian/adhoc/contrib
diff --git a/debian/sympow-data.links b/debian/sympow-data.links
new file mode 100644
index 0000000..2aa3117
--- /dev/null
+++ b/debian/sympow-data.links
@@ -0,0 +1 @@
+usr/share/doc/sympow-data/examples/contrib usr/share/doc/sympow-data/contrib
diff --git a/debian/sympow.links b/debian/sympow.links
deleted file mode 100644
index b2430f5..0000000
--- a/debian/sympow.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/doc/sympow-data/README.gz usr/share/doc/sympow/README.gz
-usr/share/doc/sympow-data/examples usr/share/doc/sympow/examples
-usr/share/doc/sympow-data/contrib usr/share/doc/sympow/contrib
diff --git a/debian/sympow.maintscript b/debian/sympow.maintscript
new file mode 100644
index 0000000..74fdc82
--- /dev/null
+++ b/debian/sympow.maintscript
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/sympow /usr/share/doc/sympow-data 1.023-5~
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..55a684c
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: launch-examples launch-contrib
+Restrictions: allow-stderr
diff --git a/debian/tests/launch-contrib b/debian/tests/launch-contrib
new file mode 100755
index 0000000..2436040
--- /dev/null
+++ b/debian/tests/launch-contrib
@@ -0,0 +1,13 @@
+#!/bin/sh
+# autopkgtest check: contrib material: generate the sample job and launch it
+set -ue
+cd $ADTTMP
+
+cp -pr /usr/share/doc/sympow/examples/contrib .
+cd contrib
+
+./sympow-new_data-job-generate precomputed_data-listof_parameter.data
+
+./sympow-new_data.job
+
+exit 0
diff --git a/debian/tests/launch-examples b/debian/tests/launch-examples
new file mode 100755
index 0000000..bc9298e
--- /dev/null
+++ b/debian/tests/launch-examples
@@ -0,0 +1,12 @@
+#!/bin/sh
+# autopkgtest check: launch script examples
+set -ue
+cd $ADTTMP
+
+mkdir examples
+cp -p /usr/share/doc/sympow/examples/*.sh examples
+cd examples
+
+./samples.sh
+
+exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sympow.git



More information about the debian-science-commits mailing list