[med-svn] [Git][med-team/pftools][master] 6 commits: d/rules: Build without regex support

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / pftools


Commits:
4f159936 by Nilesh Patra at 2022-01-25T00:29:04+05:30
d/rules: Build without regex support

- - - - -
cb5fc692 by Nilesh Patra at 2022-01-25T00:29:14+05:30
d/control: Remove B-D on libpcre2-dev

- - - - -
979c7d4a by Nilesh Patra at 2022-01-25T00:50:25+05:30
d/rules: Remove test.sh command manual run

- - - - -
c02ccf69 by Nilesh Patra at 2022-01-25T01:40:03+05:30
d/rules: Install examples at right location

- - - - -
f1c9e71c by Nilesh Patra at 2022-01-25T01:48:54+05:30
Tweak autopkgtest to get it working

- - - - -
98eac230 by Nilesh Patra at 2022-01-25T01:50:04+05:30
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,23 @@
-pftools (3.2.8-1) UNRELEASED; urgency=medium
+pftools (3.2.8-1) unstable; urgency=medium
 
+  * Team Upload.
   [ Steffen Moeller ]
   * Fix watchfile to detect new versions on github (routine-update)
 
   [ Andreas Tille ]
   * New upstream version
   * Standards-Version: 4.6.0 (routine-update)
+  * Drop patch applied upstream
+
+  [ Nilesh Patra ]
+  * d/rules:
+    + Build without regex support
+    + Remove test.sh command manual run
+    + Install examples at right location
+  * d/control: Remove B-D on libpcre2-dev (Closes: #1000002)
+  * Tweak autopkgtest to get it working
 
- -- Andreas Tille <tille at debian.org>  Thu, 23 Sep 2021 14:12:55 +0200
+ -- Nilesh Patra <nilesh at debian.org>  Tue, 25 Jan 2022 01:49:00 +0530
 
 pftools (3.2.6-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,7 +8,6 @@ Build-Depends: debhelper-compat (= 13),
                cmake,
                libfile-slurp-perl,
                libbz2-dev,
-               libpcre3-dev,
                libreadline-dev,
                zlib1g-dev
 Standards-Version: 4.6.0


=====================================
debian/rules
=====================================
@@ -9,7 +9,7 @@ include /usr/share/dpkg/default.mk
 
 override_dh_auto_configure:
 	if [ ! -e src/C/config.h.cmake ] ; then cp -a debian/missing-sources/config.h.cmake src/C/ ; fi
-	dh_auto_configure
+	dh_auto_configure -- -DUSE_PCRE=OFF
 
 override_dh_auto_install:
 	dh_auto_install
@@ -17,6 +17,11 @@ override_dh_auto_install:
 	mv debian/$(DEB_SOURCE)/usr/bin/gtop debian/$(DEB_SOURCE)/usr/bin/pfgtop
 	mv debian/$(DEB_SOURCE)/usr/bin/htop debian/$(DEB_SOURCE)/usr/bin/pfhtop
 
+override_dh_installexamples:
+	dh_installexamples
+	cp -a debian/pftools/usr/share/examples/* debian/pftools/usr/share/doc/pftools/examples/
+	rm -rf debian/pftools/usr/share/data/ debian/pftools/usr/share/examples/
+
 override_dh_installman:
 	dh_installman
 	mv debian/$(DEB_SOURCE)/usr/share/man/man1/gtop.1 debian/$(DEB_SOURCE)/usr/share/man/man1/pfgtop.1
@@ -27,14 +32,6 @@ override_dh_installman:
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_test --no-parallel
-	export PATH=$(CURDIR)/src/Fortran/:$(PATH) ; \
-	echo $${PATH} ; \
-	cd data ; \
-	. ./test.sh | \
-	    sed -e '/^MA/s/\(N_SCORE=[68].5\)0*/\1/' \
-	        -e '/^DT  */d' > test.build ; \
-	grep -v '^DT  *' test.out > test.compare ; \
-	diff -u test.compare test.build || true
 endif
 
 override_dh_auto_clean:


=====================================
debian/tests/run-unit-test
=====================================
@@ -12,9 +12,5 @@ cd $AUTOPKGTEST_TMP
 
 cp -a /usr/share/doc/${pkg}/examples/* .
 
-. ./test.sh | \
-    sed -e '/^MA/s/\(N_SCORE=[68].5\)0*/\1/' \
-        -e '/^DT  */d' \
-        -e 's:CC   /GENERATED_BY="/usr/bin/pfmake:CC   /GENERATED_BY="./pfmake:' > test.runtime
-zcat test.out | grep -v '^DT  *'  > test.compare
-diff -u test.compare test.runtime
+sed -i -e 's|CMPDIR=/usr/share/data/cmp|CMPDIR=/usr/share/doc/pftools/examples/Matrices|g' test_V3.sh
+. ./test_V3.sh CMPDIR=/usr/share/doc/pftools/examples



View it on GitLab: https://salsa.debian.org/med-team/pftools/-/compare/dbbdfacd26cad62a03536d1a445167b6e79efaac...98eac2308923a27ba42a122b5d07ae779958a8d8

-- 
View it on GitLab: https://salsa.debian.org/med-team/pftools/-/compare/dbbdfacd26cad62a03536d1a445167b6e79efaac...98eac2308923a27ba42a122b5d07ae779958a8d8
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/20220124/0d2dc10e/attachment-0001.htm>