[med-svn] [Git][med-team/pll-modules][master] Revert commits where *-examples are compiled

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / pll-modules


Commits:
4ef8aa6e by Shayan Doust at 2020-06-08T12:22:05+01:00
Revert commits where *-examples are compiled

- - - - -


5 changed files:

- debian/control
- + debian/libpll-modules-examples.examples
- − debian/libpll-modules-examples.install
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -39,11 +39,10 @@ Description: high level modules for the low level phylogenetic likelihood librar
  This package contains the shared library.
 
 Package: libpll-modules-examples
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Architecture: all
+Depends: ${misc:Depends}
 Enhances: libpll-modules-dev
-Description: example binaries for libpll-modules-dev
+Description: example source for libpll-modules-dev
  This package provides high level modules for the low level phylogenetic
  likelihood library.
  .


=====================================
debian/libpll-modules-examples.examples
=====================================
@@ -0,0 +1 @@
+examples/*


=====================================
debian/libpll-modules-examples.install deleted
=====================================
@@ -1,3 +0,0 @@
-examples/consensus/consensus usr/bin
-examples/rf-distance/rf-distance usr/bin
-examples/weight-consensus/weight-consensus usr/bin


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
-modify_examples_makefiles.patch
 2to3.patch
 modify_test_makefile.patch


=====================================
debian/rules
=====================================
@@ -16,14 +16,6 @@ INSTALLATION_PREFIX = "/usr"
 override_dh_auto_configure:
 	 dh_auto_configure -- --prefix $(INSTALLATION_PREFIX) CPPFLAGS="-I/usr/include/libpll" LDFLAGS="-L/usr/include/libpll"
 
-override_dh_auto_build:
-	dh_auto_build
-	# header files and compiled libraries needed within debian/tmp/ for example binaries so install these first
-	dh_auto_install
-	cd examples/consensus && $(MAKE)
-	cd examples/rf-distance && $(MAKE)
-	cd examples/weight-consensus && $(MAKE)
-
 override_dh_missing:
 	find debian/tmp -name "*.la" -delete
 	dh_missing
@@ -31,6 +23,6 @@ override_dh_missing:
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	## header files are needed in one place so do dh_auto_install right now
-	#dh_auto_install
+	dh_auto_install
 	cd test && $(MAKE) && python3 runtest.py
 endif



View it on GitLab: https://salsa.debian.org/med-team/pll-modules/-/commit/4ef8aa6e8c9634b37777e36861b27c696b34021a

-- 
View it on GitLab: https://salsa.debian.org/med-team/pll-modules/-/commit/4ef8aa6e8c9634b37777e36861b27c696b34021a
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/20200608/8d1d894d/attachment-0001.html>