From 10b695ddd6ade518b1da80fdcea4608969e2baad Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sun, 6 Jan 2019 11:30:32 +0100
Subject: Fix dist compilation.

---
 RELEASE-CHECKLIST | 19 +++++++++++++++++++
 configure.ac      |  2 +-
 icons/Makefile.am | 20 +++++++++++---------
 src/Makefile.am   | 12 ++++++++----
 testdist.sh       | 22 ++++++++++++++++++++++
 version.h         |  2 +-
 6 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 RELEASE-CHECKLIST
 create mode 100755 testdist.sh

diff --git a/RELEASE-CHECKLIST b/RELEASE-CHECKLIST
new file mode 100644
index 0000000..ad32444
--- /dev/null
+++ b/RELEASE-CHECKLIST
@@ -0,0 +1,19 @@
+Check list for releasing:
+
+ [ ]  Ask translators for translations (a few days in advance if possible)
+
+ [ ]  Bump version in version.h
+
+ [ ]  Update ChangeLog
+
+ [ ]  Test dist with testdist.sh script.
+
+ [ ]  Tag git
+
+ [ ]  Sign tar-ball (only deva can do that)
+
+ [ ]  Copy dist files to server.
+
+ [ ]  Write release announcement (mail and news entry).
+
+ [ ]  Spread the word (see: http://www.drumgizmo.org/wiki/doku.php?id=dev:newlist)
diff --git a/configure.ac b/configure.ac
index ad99046..4bcf972 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Filename: configure.in
 
-AC_INIT([drumgizmo], m4_esyscmd([cat version.h | cut -d'"' -f2 | xargs echo -n]))dnl"
+AC_INIT([dgedit], m4_esyscmd([cat version.h | cut -d'"' -f2 | xargs echo -n]))dnl"
 
 AC_CONFIG_SRCDIR([src/dgedit.cc])
 AM_INIT_AUTOMAKE
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 3c1ed16..d84b070 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,14 +1,16 @@
 EXTRA_DIST = \
-	master.png \
-	file.png \
-	instrument.png \
+	add_channel.png \
 	add_instrument.png \
-	edit_instrument.png \
-	remove_instrument.png \
 	channel.png \
-	add_channel.png \
+	dgedit.svg \
+	edit_instrument.png \
+	file.png \
+	instrument.png \
+	logo.png \
+	master.png \
 	remove_channel.png \
-	task_waiting.png \
-	task_running.png \
+	remove_instrument.png \
 	task_done.png \
-	task_error.png
+	task_error.png \
+	task_running.png \
+	task_waiting.png
diff --git a/src/Makefile.am b/src/Makefile.am
index 26bb475..6b0bdfd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,7 @@ dgedit_SOURCES = \
 	volumefader.cc \
 	zoomslider.cc
 
-EXTRA_DIST = \
+HDRS = \
 	aboutdialog.h \
 	audioextractor.h \
 	canvas.h \
@@ -77,7 +77,11 @@ EXTRA_DIST = \
 	sleep.h \
 	settings.h \
 	volumefader.h \
-	zoomslider.h \
+	zoomslider.h
+
+EXTRA_DIST = \
+	$(dgedit_TRANSLATIONS) \
+	$(HDRS) \
 	dgedit.qrc
 
 dgedit_MOC = $(shell ../tools/MocList cc )
@@ -104,8 +108,8 @@ qrc_%.cc: %.qrc
 %.res: %.rc
 	rc $<
 
-%.ts: $(dgedit_SOURCES) $(EXTRA_DIST)
-	QT_SELECT=qt5 lupdate $(dgedit_SOURCES) $(EXTRA_DIST) -ts $@
+%.ts: $(dgedit_SOURCES) $(HDRS)
+	QT_SELECT=qt5 lupdate $(dgedit_SOURCES) $(HDRS) -ts $@
 
 %.qm: %.ts
 	QT_SELECT=qt5 lrelease $<
diff --git a/testdist.sh b/testdist.sh
new file mode 100755
index 0000000..c562849
--- /dev/null
+++ b/testdist.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ $# -lt 1 ]
+then
+		echo "Missing version argument."
+		exit 1
+fi
+
+VER=$1
+
+make dist && (
+		mkdir -p tst
+		cd tst
+		rm -Rf dgedit-$VER
+		tar xvzf ../dgedit-$VER.tar.gz
+		cd dgedit-$VER
+		./configure --prefix=/usr
+		make
+		DESTDIR=$PWD/tst/install make install
+		(cd plugin; make install)
+		make check
+)
diff --git a/version.h b/version.h
index b2a00aa..e0804ba 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "0.9.5"
+#define VERSION "0.10.0"
-- 
cgit v1.2.3