[scilab] 16/16: Update the package to more recent standards

Julien Puydt julien.puydt at laposte.net
Wed Nov 15 16:00:24 UTC 2017 

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

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit d04bafc8dcc90778d342af57089a1a6bc976e04e
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Nov 15 08:29:57 2017 +0100

    Update the package to more recent standards
---
 debian/changelog                         |  7 +++++++
 debian/compat                            |  2 +-
 debian/control                           | 12 +++++-------
 debian/rules                             | 13 ++++++++-----
 debian/scilab-cli.install                |  4 ++--
 debian/scilab-data.lintian-overrides     | 15 ++-------------
 debian/scilab-doc.lintian-overrides      |  3 ---
 debian/scilab-full-bin.lintian-overrides |  4 ----
 debian/scilab-test.lintian-overrides     |  5 -----
 debian/watch                             |  4 ++--
 10 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03a67af..e75e52d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 scilab (5.5.2-7) UNRELEASED; urgency=medium
 
   * Adopting the package, using git now.
+  * Updating the package:
+    - Use https for uris
+    - Bump dh compat to 10
+    - Bump d/watch's version to 4
+    - Bump std-ver to 4.1.1
+    - Update lintian overrides
+    - Move bash completions and metainfo files to correct locations
 
  -- Julien Puydt <julien.puydt at laposte.net>  Tue, 14 Nov 2017 16:46:25 +0100
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 8aeebdb..d120f67 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Julien Puydt <julien.puydt at laposte.net>
-Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran,
+Build-Depends: cdbs, debhelper (>= 10), gfortran,
  default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), fakeroot,
  tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, libcurl4-openssl-dev,
  gettext, libreadline-dev, pkg-config, procps, dpkg-dev (>= 1.16.0),
@@ -33,8 +33,8 @@ Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran,
  libecj-java,
 # Unitary testing
  ant-optional, junit4, libcobertura-java
-Standards-Version: 3.9.5
-Homepage: http://www.scilab.org
+Standards-Version: 4.1.1
+Homepage: https://www.scilab.org
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/scilab
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/scilab
 
@@ -185,7 +185,6 @@ Description: Scientific software package for numerical computations (all binary
 Package: scilab-minimal-bin-dbg
 Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
 Section: debug
-Priority: extra
 Pre-Depends: ${dpkg:Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-minimal-bin (>= ${source:Version})
 Suggests: scilab (>= ${source:Version})
@@ -209,7 +208,6 @@ Description: Scientific software package (scilab-cli debugging symbols)
 Package: scilab-full-bin-dbg
 Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
 Section: debug
-Priority: extra
 Pre-Depends: ${dpkg:Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-full-bin (>= ${source:Version})
 Suggests: scilab (>= ${source:Version})
@@ -226,7 +224,7 @@ Package: scilab-doc
 Section: doc
 Depends: ${misc:Depends}
 Architecture: all
-Description: Scientific software package (english documentations)
+Description: Scientific software package (English documentations)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich
  data structures (including polynomials, rationals, linear systems, lists,
@@ -247,7 +245,7 @@ Package: scilab-doc-fr
 Section: doc
 Architecture: all
 Depends: scilab-doc, ${misc:Depends}
-Description: Scientific software package (french documentation)
+Description: Scientific software package (French documentation)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich
  data structures (including polynomials, rationals, linear systems, lists,
diff --git a/debian/rules b/debian/rules
index ea518e6..411c59a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@ include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 # Detect the arch (with the naming of Sun)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -72,6 +74,7 @@ install/scilab-data::
 	fi
 # Remove extra license files to make lintian happier
 # See debian/copyright for them
+	rm $(DEB_DESTDIR)usr/share/scilab/license.txt
 	rm $(DEB_DESTDIR)usr/share/scilab/modules/*/license.txt
 	rm $(DEB_DESTDIR)usr/share/scilab/contrib/toolbox_skeleton/license.txt
 	rm $(DEB_DESTDIR)usr/share/scilab/modules/tclsci/tcl/sciGUI/license.txt
@@ -81,7 +84,7 @@ install/scilab-data::
 	rm $(DEB_DESTDIR)usr/share/scilab/COPYING
 
 # Remove dead code
-	rm -rf $(DEB_DESTDIR)usr/share/scilab/modules/helptools/bin $(DEB_DESTDIR)usr/share/scilab/modules/tclsci/demos/tk/timer $(DEB_DESTDIR)usr/share/scilab/modules/intersci/examples/sedprov
+	rm -rf $(DEB_DESTDIR)usr/share/scilab/modules/helptools/bin $(DEB_DESTDIR)usr/share/scilab/modules/tclsci/demos/tk/timer $(DEB_DESTDIR)usr/share/scilab/modules/intersci/examples/sedprov $(DEB_DESTDIR)usr/share/scilab/modules/macros
 
 # Generate the manpages
 	help2man ./bin/scilab > debian/scilab.1
@@ -102,15 +105,13 @@ install/scilab-data::
 			mv $$dir/tests $$target_test; \
 		fi; \
 		# Move the help in the right package; \
-		if test -d $$dir/demos -o -d $$dir/help/en_US/; then \
+		if test -d $$dir/help/en_US; then \
 			mkdir -p $$target/help; \
+			mv $$dir/help/en_US $$target/help; \
 		fi; \
 		if test -d $$dir/demos; then \
 			mv $$dir/demos $$target; \
 		fi; \
-		if test -d $$dir/help/en_US; then \
-			mv $$dir/help/en_US $$target/help/; \
-		fi; \
 		if test -d $$dir/help/fr_FR; then \
 			mkdir -p $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/$$moduleName/help; \
 			mv $$dir/help/fr_FR $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/$$moduleName/help/; \
@@ -123,6 +124,8 @@ install/scilab-data::
 			mkdir -p $(CURDIR)/debian/scilab-doc-ja/usr/share/scilab/modules/$$moduleName/help; \
 			mv $$dir/help/ja_JP $(CURDIR)/debian/scilab-doc-ja/usr/share/scilab/modules/$$moduleName/help/; \
 		fi; \
+		# remove if empty; \
+		rmdir --ignore-fail-on-non-empty $$dir/help; \
 	done
 
 install/scilab-doc::
diff --git a/debian/scilab-cli.install b/debian/scilab-cli.install
index 661267a..a6c512b 100644
--- a/debian/scilab-cli.install
+++ b/debian/scilab-cli.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/bin/scilab-cli
-debian/bash_completion.d/scilab etc/bash_completion.d/
+debian/bash_completion.d/scilab usr/share/bash_completions/
 desktop/scilab-cli.desktop		usr/share/applications
 desktop/scilab.xml usr/share/mime/packages/
-desktop/scilab.appdata.xml usr/share/appdata/
+desktop/scilab.appdata.xml usr/share/metainfo/
diff --git a/debian/scilab-data.lintian-overrides b/debian/scilab-data.lintian-overrides
index 7a04080..7a09df9 100644
--- a/debian/scilab-data.lintian-overrides
+++ b/debian/scilab-data.lintian-overrides
@@ -1,22 +1,11 @@
 # Call Scilab from application... Visual project
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/core/examples/call_scilab/c/visual_studio/CallSciVC.sln
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/core/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/core/examples/call_scilab/fortran/example.sln
 scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.sln
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj
 scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.sln
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj
 scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.sln
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj
 scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.sln
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.sln
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
-scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/fortran/example.sln
 scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.sln
 scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln
+scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.sln
+scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/fortran/example.sln
 # It is a skeleton to create Scilab/xcos extensions
 scilab-data: extra-license-file usr/share/scilab/contrib/xcos_toolbox_skeleton/license.txt
-
-scilab-data: classpath-contains-relative-path usr/share/scilab/modules/javasci/jar/org.scilab.modules.javasci.jar: ../../jvm/jar/org.scilab.modules.jvm.jar
-
diff --git a/debian/scilab-doc.lintian-overrides b/debian/scilab-doc.lintian-overrides
deleted file mode 100644
index 67aef23..0000000
--- a/debian/scilab-doc.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Actual documentation files
-scilab-doc: extra-license-file usr/share/scilab/modules/umfpack/help/en_US/umf_license.xml
-scilab-doc: extra-license-file usr/share/scilab/modules/umfpack/help/en_US/taucs_license.xml
diff --git a/debian/scilab-full-bin.lintian-overrides b/debian/scilab-full-bin.lintian-overrides
index d132880..d19c30c 100644
--- a/debian/scilab-full-bin.lintian-overrides
+++ b/debian/scilab-full-bin.lintian-overrides
@@ -1,8 +1,4 @@
 # the actual binary which should not be called directly
 scilab-full-bin: binary-without-manpage usr/bin/scilab-bin
-# rpath is used to point to Scilab libraries
-scilab-full-bin: binary-or-shlib-defines-rpath usr/lib/jni/libjavasci2.so.* /usr/lib/scilab
-# shlibdeps disabled on libscilab-java 
-scilab-full-bin: missing-dependency-on-libc needed by usr/lib/jni/libjavasci2.so.*
 # Don't really care about this warning
 scilab-full-bin: classpath-contains-relative-path usr/share/java/org.scilab.modules.javasci.jar: ../../jvm/jar/org.scilab.modules.jvm.jar
diff --git a/debian/scilab-test.lintian-overrides b/debian/scilab-test.lintian-overrides
index 1489dd9..16af555 100644
--- a/debian/scilab-test.lintian-overrides
+++ b/debian/scilab-test.lintian-overrides
@@ -1,7 +1,2 @@
 # It is for testing purposes only
 scilab-test: duplicate-font-file usr/share/scilab/modules/graphics/tests/unit_tests/DejaVuSansMono.ttf also in ttf-dejavu-core
-
-# Here on purpose
-scilab-test: windows-devel-file-in-package usr/share/scilab/modules/graph/tests/java/graph-JAVA-tests.vcproj
-scilab-test: windows-devel-file-in-package usr/share/scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcproj
-scilab-test: windows-devel-file-in-package usr/share/scilab/modules/xcos/tests/java/xcos-JAVA-tests.vcproj
diff --git a/debian/watch b/debian/watch
index 1734601..e4135be 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
-http://www.scilab.org/en/development/sources/stable \
+version=4
+https://www.scilab.org/en/development/sources/stable \
  .*/scilab-([\d\.]+)-src.*.tar.gz debian debian/orig-tar.sh

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

More information about the debian-science-commits mailing list