[med-svn] [Git][med-team/proalign][master] 7 commits: Drop unneeded get-orig-source target

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / proalign


Commits:
f7f9ab7b by Andreas Tille at 2018-10-23T15:29:21Z
Drop unneeded get-orig-source target

- - - - -
da661ace by Andreas Tille at 2018-10-23T15:53:09Z
Use jh_build

- - - - -
c6f16626 by Andreas Tille at 2018-10-23T15:53:30Z
debhelper 11

- - - - -
a753b9d6 by Andreas Tille at 2018-10-23T15:53:32Z
Point Vcs fields to salsa.debian.org

- - - - -
ae4c38af by Andreas Tille at 2018-10-23T15:53:32Z
Standards-Version: 4.2.1

- - - - -
22641f14 by Andreas Tille at 2018-10-23T16:08:28Z
Fix main-class in manifest

- - - - -
4018e506 by Andreas Tille at 2018-10-23T16:19:18Z
Add non-functional test template - needs sensibly usable data

- - - - -


9 changed files:

- debian/changelog
- debian/compat
- debian/control
- − debian/manifest.txt
- debian/proalign.install
- debian/rules
- debian/scripts/proalign
- + debian/tests/control_
- + debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+proalign (0.603-4) UNRELEASED; urgency=medium
+
+  * Drop unneeded get-orig-source target
+  * Use jh_build
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+
+ -- Andreas Tille <tille at debian.org>  Tue, 23 Oct 2018 17:28:44 +0200
+
 proalign (0.603-3) unstable; urgency=medium
 
   * Moved packaging from SVN to Git


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -4,11 +4,12 @@ Uploaders: Andreas Tille <tille at debian.org>,
            Thorsten Alteholz <debian at alteholz.de>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
+               javahelper,
                default-jdk
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/proalign.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/proalign.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/proalign
+Vcs-Git: https://salsa.debian.org/med-team/proalign.git
 Homepage: http://ueg.ulb.ac.be/ProAlign/
 
 Package: proalign


=====================================
debian/manifest.txt deleted
=====================================
@@ -1,3 +0,0 @@
-Manifest-version: 1.0
-Main-Class: proalign.ProAlign
-


=====================================
debian/proalign.install
=====================================
@@ -1,3 +1,3 @@
 debian/scripts/proalign usr/bin
-build/ProAlign.jar usr/share/proalign
+proalign.jar	usr/share/proalign
 


=====================================
debian/rules
=====================================
@@ -6,12 +6,4 @@
 	dh $@
 
 override_dh_auto_build:
-	mkdir -p build
-	javac -d ./build *.java
-	(cd build; jar cmvf ../debian/manifest.txt ProAlign.jar *)
-	#(cd build; jar cmvf ../debian/manifest.txt ProAlign.jar proalign/ProAlign.class proalign/OutFile.class)
-
-get-orig-source:
-	mkdir -p ../tarballs
-	uscan --verbose --force-download --destdir=../tarballs
-
+	jh_build --main=proalign.ProAlign proalign.jar .


=====================================
debian/scripts/proalign
=====================================
@@ -9,13 +9,11 @@ else
 fi
 
 if [ -x /usr/share/proalign ]; then
-        if [ -r /usr/share/proalign/ProAlign.jar  ]; then 
-                #cd /usr/share/proalign && $java -jar ProAlign.jar
-                $java -jar /usr/share/proalign/ProAlign.jar $PARA
+        if [ -r /usr/share/proalign/proalign.jar  ]; then 
+                $java -jar /usr/share/proalign/proalign.jar $PARA
         else 
-                echo "Could not find /usr/share/proalign/ProAlign.jar"
+                echo "Could not find /usr/share/proalign/proalign.jar"
         fi
 else 
         echo "Could not find /usr/share/proalign directory."
 fi
-


=====================================
debian/tests/control_
=====================================
@@ -0,0 +1,3 @@
+Tests: run-unit-test
+Depends: @
+Restrictions: allow-stderr


=====================================
debian/tests/run-unit-test
=====================================
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+echo "TODO: find sample data prim.fas and prim.tre"
+echo "see http://ueg.ulb.ac.be/ProAlign/main.html#command"
+exit 1
+
+set -e
+
+pkg=proalign
+
+if [ "$AUTOPKGTEST_TMP" = "" ] ; then
+  AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+  trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
+fi
+
+cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
+
+cd $AUTOPKGTEST_TMP
+
+proalign -nogui -seqfile=prim.fas -treefile=prim.tre -outfile=prim.pir -outformat=pir



View it on GitLab: https://salsa.debian.org/med-team/proalign/compare/2b0d11b606c7b5a2c3311777379c7c2500912242...4018e50636487ae29e96470a8e5e491c22a55bf4

-- 
View it on GitLab: https://salsa.debian.org/med-team/proalign/compare/2b0d11b606c7b5a2c3311777379c7c2500912242...4018e50636487ae29e96470a8e5e491c22a55bf4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181023/1b4a7c3a/attachment-0001.html>