[med-svn] [Git][med-team/libarb][master] Get libCORE "somehow" build in pbuilder

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libarb


Commits:
9587ddb7 by Andreas Tille at 2019-06-06T09:03:41Z
Get libCORE "somehow" build in pbuilder

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -5,6 +5,7 @@ Uploaders: Andreas Tille <tille at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 12~),
+               libglib2.0-dev,
                valgrind
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/libarb


=====================================
debian/rules
=====================================
@@ -7,9 +7,6 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 include /usr/share/dpkg/default.mk
-pkgcom=$(DEB_SOURCE)-common
-pkgdoc=$(DEB_SOURCE)-doc
-common=debian/$(pkgcom)
 
 ARBHOME=$(CURDIR)
 
@@ -21,7 +18,6 @@ else
 endif
 
 LD_LIBRARY_PATH := $(ARBHOME)/lib:$(LD_LIBRARY_PATH)
-PATH := $(ARBHOME)/bin:$(PATH)
 LC_ALL := C
 
 export ARBHOME LD_LIBRARY_PATH PATH LC_ALL
@@ -40,55 +36,24 @@ config.makefile: config.makefile.template
              config.makefile.template > config.makefile
 
 override_dh_auto_build:
-	$(MAKE) all
+	ln -s TEMPLATES INCLUDE
+	for header in UNIT_TESTER/*.h ; do ln -s ../$${header} INCLUDE/`basename $${header}` ; done
+	ln -s /usr/include/valgrind/valgrind.h INCLUDE/valgrind.h
+	mkdir lib
+	dh_auto_build --sourcedirectory=CORE
 
 override_dh_auto_configure: config.makefile
 
 override_dh_auto_clean: config.makefile
 	# config.makefile is required to run make clean, hence the dependency
 	# on ..._auto_configure.
-	$(MAKE) clean
+	$(MAKE) clean || true
 	rm config.makefile
 	# ARB does not have "distclean" or "realclean". Remove some leftovers:
 	rm -f UNIT_TESTER/Makefile.setup.local
 	find -name \*.log -a ! -name phyml-manual.log -print0 | xargs -0 rm -f
 	rm -f TEMPLATES/arb_build.h
 
-override_dh_install:
-	# ARB has no "install" target. It has "tarfile_quick", though, which
-	# creates a tarball for distribution. We build this and unpack it
-	# into debian/tmp so that dh_install can pick up the files.
-	make tarfile_quick
-	rm -rf debian/tmp
-	mkdir debian/tmp
-	tar -C debian/tmp -xzf arb.tgz
-	rm -rf debian/tmp-dev
-	mkdir debian/tmp-dev
-	tar -C debian/tmp-dev -xzf arb-dev.tgz
-	rm arb.tgz arb-dev.tgz
-
-	# remove some files we don't need in the package:
-	rm -rf debian/tmp/lib/addlibs # external libs are packages
-	rm  -f debian/tmp/lib/arb_tcp_org.dat # managed in etc
-	rm  -f debian/tmp/lib/GPL.txt # included in copyright
-	rm  -f debian/tmp/lib/Makefile # spurious in upstream
-	rm  -f debian/tmp/arb_install.sh # no installer needed
-	rm  -f debian/tmp/arb_INSTALL.txt
-	rm  -f debian/tmp/arb_OS_X_MacPorts.txt
-	rm  -f debian/tmp/arb_OS_X.txt
-	rm  -f debian/tmp/arb_UBUNTU.txt
-
-	dh_install --list-missing
-
-	# the check is needed to make sure it will not fail when doing binary-arch only builds
-	if [ -e debian/$(pkgcom)/usr/lib/arb/SH/arb_create_debian_conffile ] ; then \
-	    # Move SH/README :to docs \
-	    cp -a SH/README debian/$(pkgcom)/usr/share/doc/arb/README_SH ; \
-	    # Fix permission of scripts \
-	    chmod a+x debian/$(pkgcom)/usr/lib/arb/SH/arb_create_debian_conffile ; \
-	    chmod a+x debian/$(pkgcom)/usr/lib/arb/lib/macro.head ; \
-	fi
-
 override_dh_strip:
 	# Fix rpath issue (once libarb is installed)
 	if [ -e debian/libarb/usr/lib/arb/lib/ARB.so ] ; then \
@@ -105,15 +70,4 @@ override_dh_shlibdeps:
 
 override_dh_fixperms:
 	dh_fixperms
-	-chmod 0644 debian/arb-common/etc/arb/submit/*
-	-chmod 0644 debian/libarb-dev/usr/include/arb/xml.hxx
-	-chmod 0755 debian/arb-common/usr/lib/arb/lib/macro.head
-
-override_dh_link:
-	dh_link
-	rm -f debian/arb-common/etc/arb/inputMasks/format.readme
-	dh_link -parb-common /usr/lib/arb/lib/help/input_mask_format.hlp /etc/arb/inputMasks/format.readme
-
-# To update po files as recommended in po-debconf(7)
-debian/po/templates.pot: debian/arb-common.templates
-	@debconf-updatepo
+	chmod 0644 debian/libarb-dev/usr/include/arb/xml.hxx



View it on GitLab: https://salsa.debian.org/med-team/libarb/commit/9587ddb733bc4fb136aef5d5c452c75316195d12

-- 
View it on GitLab: https://salsa.debian.org/med-team/libarb/commit/9587ddb733bc4fb136aef5d5c452c75316195d12
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/20190606/101e65c7/attachment-0001.html>