From a00082fe1ae68be500e78ea36d8c7a29d68dc09c Mon Sep 17 00:00:00 2001
From: Marcello Mamino <vacaboja@gmail.com>
Date: Wed, 5 Oct 2016 20:17:01 +0200
Subject: [PATCH] Added make_tgz, moved stuff around

---
 Makefile                                 |  8 ++++----
 icons/install-icons.sh                   |  6 ------
 {packaging => icons}/tg-timer-lt.desktop |  0
 {packaging => icons}/tg-timer.desktop    |  0
 {packaging => icons}/tg-timer.rc         |  0
 packaging/make_deb.sh                    |  2 +-
 packaging/make_tgz.sh                    | 10 ++++++++++
 7 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100755 icons/install-icons.sh
 rename {packaging => icons}/tg-timer-lt.desktop (100%)
 rename {packaging => icons}/tg-timer.desktop (100%)
 rename {packaging => icons}/tg-timer.rc (100%)
 create mode 100755 packaging/make_tgz.sh

diff --git a/Makefile b/Makefile
index 182db02..ff49a32 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@ test: $(BUILDDIR)/tg-dbg$(EXT)
 	$(BUILDDIR)/tg-dbg test
 .PHONY: test
 
-$(BUILDDIR)/tg-timer.res: packaging/tg-timer.rc icons/tg-timer.ico
-	windres packaging/tg-timer.rc -O coff -o $(BUILDDIR)/tg-timer.res
+$(BUILDDIR)/tg-timer.res: icons/tg-timer.rc icons/tg-timer.ico
+	windres icons/tg-timer.rc -O coff -o $(BUILDDIR)/tg-timer.res
 
 $(BUILDDIR)/tg$(EXT): $(ALLFILES)
 	$(call COMPILE,tg,)
@@ -69,8 +69,8 @@ $(ICONSIZES): %: icons/%/tg-timer.png
 install: all $(ICONSIZES)
 	install -D -m 0755 -s $(BUILDDIR)/tg$(EXT) $(PREFIX)/bin/tg-timer$(EXT)
 	install -D -m 0755 -s $(BUILDDIR)/tg-lt$(EXT) $(PREFIX)/bin/tg-timer-lt$(EXT)
-	install -D -m 0644 packaging/tg-timer.desktop $(PREFIX)/share/applications/tg-timer.desktop
-	install -D -m 0644 packaging/tg-timer-lt.desktop $(PREFIX)/share/applications/tg-timer-lt.desktop
+	install -D -m 0644 icons/tg-timer.desktop $(PREFIX)/share/applications/tg-timer.desktop
+	install -D -m 0644 icons/tg-timer-lt.desktop $(PREFIX)/share/applications/tg-timer-lt.desktop
 	install -D -m 0644 docs/tg-timer.1.gz $(PREFIX)/share/man/man1/tg-timer.1.gz
 	ln -s tg-timer.1.gz $(PREFIX)/share/man/man1/tg-timer-lt.1.gz
 .PHONY: install
diff --git a/icons/install-icons.sh b/icons/install-icons.sh
deleted file mode 100755
index 5532e25..0000000
--- a/icons/install-icons.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-for A in `cat sizes`;
-do
-	xdg-icon-resource install --size $A $[A]x$[A]/tg-timer.png
-done
diff --git a/packaging/tg-timer-lt.desktop b/icons/tg-timer-lt.desktop
similarity index 100%
rename from packaging/tg-timer-lt.desktop
rename to icons/tg-timer-lt.desktop
diff --git a/packaging/tg-timer.desktop b/icons/tg-timer.desktop
similarity index 100%
rename from packaging/tg-timer.desktop
rename to icons/tg-timer.desktop
diff --git a/packaging/tg-timer.rc b/icons/tg-timer.rc
similarity index 100%
rename from packaging/tg-timer.rc
rename to icons/tg-timer.rc
diff --git a/packaging/make_deb.sh b/packaging/make_deb.sh
index 49f9eaf..6125b02 100755
--- a/packaging/make_deb.sh
+++ b/packaging/make_deb.sh
@@ -7,8 +7,8 @@ cd $DIR/..
 
 VERSION=`cat version`
 
-tar czf build/tg-timer_$VERSION.orig.tar.gz * --exclude=".*" --exclude="build/*" --xform="s|\\(.*\\)|tg-timer-$VERSION/\1|"
 cd build
+cp tg-timer_$VERSION.tar.gz tg-timer_$VERSION.orig.tar.gz
 tar xzf tg-timer_$VERSION.orig.tar.gz
 cp -r $ABSDIR/debian tg-timer-$VERSION
 cd tg-timer-$VERSION
diff --git a/packaging/make_tgz.sh b/packaging/make_tgz.sh
new file mode 100755
index 0000000..b307b63
--- /dev/null
+++ b/packaging/make_tgz.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+DIR=`dirname "${BASH_SOURCE[0]}"`
+ABSDIR=`cd "$DIR"; pwd`
+
+cd $DIR/..
+
+VERSION=`cat version`
+
+tar czf build/tg-timer_$VERSION.tar.gz * --exclude=".*" --exclude="build/*" --exclude="packaging" --xform="s|\\(.*\\)|tg-timer-$VERSION/\1|"