[med-svn] [Git][med-team/bart][master] 2 commits: really fix install

[Martin Uecker]

Martin Uecker pushed to branch master at Debian Med / bart


Commits:
0a4b3707 by Martin Uecker at 2018-04-28T21:32:54+02:00
really fix install

- - - - -
303ae9a2 by Martin Uecker at 2018-04-28T21:47:19+02:00
points vcs to salsa

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/0001-makefile-change-for-compatibility-with-debian.patch
- debian/patches/0001-remove-empty-directory.patch → debian/patches/0002-remove-empty-directory.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ bart (0.4.03-1) UNRELEASED; urgency=medium
   * Fix install.
   * Standards-Version: 4.1.4
   * Secure url for copyright format.
+  * Make vcs links point to salsa.
 
  -- Martin Uecker <martin.uecker at med.uni-goettingen.de>  Fri, 27 Apr 2018 21:34:11 +0200
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 10),
                libpng-dev,
                liblapacke-dev
 Standards-Version: 4.1.4
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/bart.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/bart.git
+Vcs-Browser: https://salsa.debian.org/med-team/bart.git
+Vcs-Git: https://salsa.debian.org/med-team/bart.git
 Homepage: https://mrirecon.github.io/bart/
 
 Package: bart


=====================================
debian/patches/0001-makefile-change-for-compatibility-with-debian.patch
=====================================
--- /dev/null
+++ b/debian/patches/0001-makefile-change-for-compatibility-with-debian.patch
@@ -0,0 +1,21 @@
+From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
+Date: Sat, 28 Apr 2018 21:28:14 +0200
+Subject: makefile change for compatibility with debian
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index bccc92c..1fe5931 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,7 @@ FFTWTHREADS?=1
+ ISMRMRD?=0
+ 
+ DESTDIR ?= /
+-PREFIX ?= usr/local/
++PREFIX ?= usr/
+ 
+ BUILDTYPE = Linux
+ UNAME = $(shell uname -s)


=====================================
debian/patches/0001-remove-empty-directory.patch → debian/patches/0002-remove-empty-directory.patch
=====================================
--- a/debian/patches/0001-remove-empty-directory.patch
+++ b/debian/patches/0002-remove-empty-directory.patch
@@ -7,7 +7,7 @@ Subject: remove empty directory
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index bccc92c..eeceb3d 100644
+index 1fe5931..33e573e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -495,7 +495,6 @@ install: bart $(root)/doc/commands.txt


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0001-remove-empty-directory.patch
+0001-makefile-change-for-compatibility-with-debian.patch
+0002-remove-empty-directory.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,6 @@ NOTEST_ARCHS=i386 mips mipsel hurd-i386 kfreebsd-i386 m68k sh4
 %:
 	dh $@
 
-override_dh_install:
-	PREFIX=$(shell pwd)/debian/$(NAME) make install
-
 override_dh_auto_test:
 ifeq (,$(filter $(NOTEST_ARCHS), $(DEB_BUILD_ARCH)))
 	make utest



View it on GitLab: https://salsa.debian.org/med-team/bart/compare/24215223daa103a2dbff11a4b9697185f370ceb2...303ae9a2aa77a0e9268b33c8fc087c4ae0a66deb

---
View it on GitLab: https://salsa.debian.org/med-team/bart/compare/24215223daa103a2dbff11a4b9697185f370ceb2...303ae9a2aa77a0e9268b33c8fc087c4ae0a66deb
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/20180428/7b4ec598/attachment-0001.html>