[med-svn] [Git][med-team/bart-view][master] 3 commits: add missing PKG_CONFIG in Makefile

[Martin Uecker (@uecker-guest)]

Martin Uecker pushed to branch master at Debian Med / bart-view


Commits:
b42edac8 by Martin Uecker at 2022-10-24T20:44:02+02:00
add  missing PKG_CONFIG in Makefile

- - - - -
a1e13ba3 by Martin Uecker at 2022-10-25T13:20:13+02:00
overwrite dh_auto_install

- - - - -
e856db3f by Martin Uecker at 2022-10-25T13:20:13+02:00
build depend on libbart-dev 0.8.00

- - - - -


6 changed files:

- debian/control
- debian/patches/0001-create-parent-directories.patch
- debian/patches/0002-don-t-build-cfl2png.patch
- debian/patches/0003-enable-cross-build.patch
- debian/patches/0005-Enabling-hardening-options-to-fix-blhc.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Martin Uecker <uecker at tugraz.at>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libbart-dev,
+               libbart-dev (>= 0.8.00),
                libgtk-3-dev
 Standards-Version: 4.6.1.0
 Vcs-Browser: https://salsa.debian.org/med-team/bart-view


=====================================
debian/patches/0001-create-parent-directories.patch
=====================================
@@ -7,7 +7,7 @@ Subject: create parent directories
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 54e52a7..8de9a6b 100644
+index 54e52a7..a2b8df3 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -74,7 +74,7 @@ cfl2png:	src/cfl2png.c src/view.[ch] src/draw.[ch] src/viewer.inc
@@ -15,7 +15,7 @@ index 54e52a7..8de9a6b 100644
  
  install:
 -	install view $(DESTDIR)/usr/lib/bart/commands/
-+	install -D view $(DESTDIR)/usr/lib/bart/commands/
++	install -D view $(DESTDIR)/usr/lib/bart/commands/view
  
  
  clean:


=====================================
debian/patches/0002-don-t-build-cfl2png.patch
=====================================
@@ -7,7 +7,7 @@ Subject: don't build cfl2png
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 8de9a6b..693f1b7 100644
+index a2b8df3..508e8e3 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -62,7 +62,9 @@ endif


=====================================
debian/patches/0003-enable-cross-build.patch
=====================================
@@ -3,14 +3,23 @@ Date: Mon, 24 Oct 2022 19:40:15 +0200
 Subject: enable cross build
 
 ---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 693f1b7..4ca188e 100644
+index 508e8e3..cc409a1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -70,7 +70,7 @@ src/viewer.inc: src/viewer.ui
+@@ -2,6 +2,8 @@
+ 
+ -include Makefile.local
+ 
++PKG_CONFIG ?= pkg-config
++
+ CUDA?=0
+ CUDA_BASE ?= /usr/local/cuda
+ CUDA_LIB ?= lib
+@@ -70,7 +72,7 @@ src/viewer.inc: src/viewer.ui
  	@echo "STRINGIFY(`cat src/viewer.ui`)" > src/viewer.inc
  
  view:	src/main.c src/view.[ch] src/draw.[ch] src/viewer.inc


=====================================
debian/patches/0005-Enabling-hardening-options-to-fix-blhc.patch
=====================================
@@ -7,10 +7,10 @@ Subject: Enabling hardening options to fix blhc
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 4ca188e..b6dc487 100644
+index cc409a1..a56a25e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -70,10 +70,10 @@ src/viewer.inc: src/viewer.ui
+@@ -72,10 +72,10 @@ src/viewer.inc: src/viewer.ui
  	@echo "STRINGIFY(`cat src/viewer.ui`)" > src/viewer.inc
  
  view:	src/main.c src/view.[ch] src/draw.[ch] src/viewer.inc
@@ -22,4 +22,4 @@ index 4ca188e..b6dc487 100644
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a  $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
  
  install:
- 	install -D view $(DESTDIR)/usr/lib/bart/commands/
+ 	install -D view $(DESTDIR)/usr/lib/bart/commands/view


=====================================
debian/rules
=====================================
@@ -4,3 +4,5 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
+
+



View it on GitLab: https://salsa.debian.org/med-team/bart-view/-/compare/e3d359d6899ef05725888f03817ef6ccc0e2b6de...e856db3f2e3e466a8c91f03f445c699dc1819f1b

-- 
View it on GitLab: https://salsa.debian.org/med-team/bart-view/-/compare/e3d359d6899ef05725888f03817ef6ccc0e2b6de...e856db3f2e3e466a8c91f03f445c699dc1819f1b
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/20221025/294fca13/attachment-0001.htm>