Update ardour sources

source/ardour-v5/debian/changelog

@@ -1,3 +1,9 @@
+ardour-official-v5 (1:5.12.0-1kxstudio1v5) stable; urgency=medium
+
+  * Update
+
+ -- falkTX <falktx@gmail.com>  Sun, 17 Dec 2017 17:31:46 +0100
+
 ardour-official-v5 (1:5.11.4-1kxstudio1v5) stable; urgency=medium
 
   * Update

source/ardour-v5/debian/extra/ardour

@@ -45,7 +45,7 @@ export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 if [ "T" = "$DEBUG" ]; then
 	export ARDOUR_INSIDE_GDB=1
-	exec gdb $INSTALL_DIR/bin/ardour-5.11.4
+	exec gdb $INSTALL_DIR/bin/ardour-5.12.0
 else
-	exec  $INSTALL_DIR/bin/ardour-5.11.4 -a "$@"
+	exec  $INSTALL_DIR/bin/ardour-5.12.0 -a "$@"
 fi

source/ardour-v5/debian/rules

@@ -1,20 +1,35 @@
 #!/usr/bin/make -f
 
 VERSION=$(shell ls | grep \.run | head -n 1 | awk 'sub("-","\n")' | tail -n 1 | awk 'sub("-x86","\n")' | head -n 1)
+GCC5=$(shell cat debian/changelog | head -n 1 | grep -q v5 && echo true)
 
 ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
-ARDOUR_FILE=Ardour-$(VERSION)-x86_64-gcc5.run
+ARDOUR_FILE=Ardour-$(VERSION)-x86_64.run
 else
-ARDOUR_FILE=Ardour-$(VERSION)-x86-gcc5.run
+ARDOUR_FILE=Ardour-$(VERSION)-x86.run
 endif
 
+# ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
+# ARDOUR_FILE=Ardour-$(VERSION)-x86_64-gcc5.run
+# else
+# ARDOUR_FILE=Ardour-$(VERSION)-x86-gcc5.run
+# endif
+
 override_dh_auto_install:
 	chmod +x $(ARDOUR_FILE)
 	./$(ARDOUR_FILE) --target ./tmp --noexec
 	chmod -x $(ARDOUR_FILE)
 
+ifeq ($(GCC5),true)
+	cd tmp && \
+	tar -xf *-gcc5-$(VERSION).tar
+else
 	cd tmp && \
-	tar -xf *.tar
+	tar -xf *-gcc4-$(VERSION).tar
+endif
+
+# 	cd tmp && \
+# 	tar -xf *.tar
 
 	rm    tmp/Ardour_*-*/bin/ardour5
 	rm    tmp/Ardour_*-*/bin/*.uninstall.sh

source/ardour/debian/changelog

@@ -1,3 +1,9 @@
+ardour-official (1:5.12.0-1kxstudio1) stable; urgency=medium
+
+  * Update
+
+ -- falkTX <falktx@gmail.com>  Sun, 17 Dec 2017 17:04:18 +0100
+
 ardour-official (1:5.11.4-1kxstudio1) stable; urgency=medium
 
   * Update

source/ardour/debian/extra/ardour

@@ -45,7 +45,7 @@ export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 if [ "T" = "$DEBUG" ]; then
 	export ARDOUR_INSIDE_GDB=1
-	exec gdb $INSTALL_DIR/bin/ardour-5.11.4
+	exec gdb $INSTALL_DIR/bin/ardour-5.12.0
 else
-	exec  $INSTALL_DIR/bin/ardour-5.11.4 -a "$@"
+	exec  $INSTALL_DIR/bin/ardour-5.12.0 -a "$@"
 fi

source/ardour/debian/rules

@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 VERSION=$(shell ls | grep \.run | head -n 1 | awk 'sub("-","\n")' | tail -n 1 | awk 'sub("-x86","\n")' | head -n 1)
+GCC5=$(shell cat debian/changelog | head -n 1 | grep -q v5 && echo true)
 
 ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
 ARDOUR_FILE=Ardour-$(VERSION)-x86_64.run
@@ -13,8 +14,13 @@ override_dh_auto_install:
 	./$(ARDOUR_FILE) --target ./tmp --noexec
 	chmod -x $(ARDOUR_FILE)
 
+ifeq ($(GCC5),true)
 	cd tmp && \
-	tar -xf *.tar
+	tar -xf *-gcc5-$(VERSION).tar
+else
+	cd tmp && \
+	tar -xf *-gcc4-$(VERSION).tar
+endif
 
 	rm    tmp/Ardour_*-*/bin/ardour5
 	rm    tmp/Ardour_*-*/bin/*.uninstall.sh