From e27f555e7bd689cc055b8dea897ad50914f11f87 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 6 Nov 2018 21:51:30 +1100
Subject: [PATCH] Upstream update with make install

---
 debian/changelog              |  5 +++++
 debian/debhelper-build-stamp  |  1 -
 debian/files                  |  3 ---
 debian/magicka.substvars      |  3 ---
 debian/patches/makefile.patch | 11 +++++++++++
 debian/rules                  | 31 ++-----------------------------
 6 files changed, 18 insertions(+), 36 deletions(-)
 delete mode 100644 debian/debhelper-build-stamp
 delete mode 100644 debian/files
 delete mode 100644 debian/magicka.substvars

diff --git a/debian/changelog b/debian/changelog
index 7a6d5cd..0e5322d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+magicka (0.12-4) UNRELEASED; urgency=low
+
+  * Upstream update
+
+ -- Deon George <deon@leenooks.net>  Tue,  6 Nov 2018 21:30:00 +1100
 magicka (0.12-3) UNRELEASED; urgency=low
 
   * Added utils
diff --git a/debian/debhelper-build-stamp b/debian/debhelper-build-stamp
deleted file mode 100644
index c86d4e7..0000000
--- a/debian/debhelper-build-stamp
+++ /dev/null
@@ -1 +0,0 @@
-magicka
diff --git a/debian/files b/debian/files
deleted file mode 100644
index ed73762..0000000
--- a/debian/files
+++ /dev/null
@@ -1,3 +0,0 @@
-magicka-dbgsym_0.12-1_amd64.deb debug extra
-magicka_0.12-1_amd64.buildinfo bbs -
-magicka_0.12-1_amd64.deb bbs optional
diff --git a/debian/magicka.substvars b/debian/magicka.substvars
deleted file mode 100644
index 679a30c..0000000
--- a/debian/magicka.substvars
+++ /dev/null
@@ -1,3 +0,0 @@
-shlibs:Depends=libc6 (>= 2.14), libmicrohttpd12 (>= 0.9.50), libmosquitto1 (>= 1.0), libsqlite3-0 (>= 3.5.9), libssh-4 (>= 0.6.1), libssl1.0.2 (>= 1.0.2d)
-misc:Depends=
-misc:Pre-Depends=
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 8eb98a1..41a91e8 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -6,3 +6,14 @@
  all: all_src all_base64
  
  all_src:
+--- a/GNUmakefile.debian
++++ b/GNUmakefile.debian
+@@ -143,7 +143,7 @@
+ 	install -m644 dist/menus/mail.mnu ${DESTDIR}${datarootdir}/magicka/menus/mail.mnu
+ 
+ 	echo "You should now create a user to run magicka"
+-	echo "and assuming that user is magicka:
++	echo "and assuming that user is magicka:"
+ 	echo " "
+ 	echo "   chown -R magicka:magicka ${datarootdir}/magicka/scripts/data"
+ 	echo "   chown -R magicka:magicka ${localstatedir}/magicka"
diff --git a/debian/rules b/debian/rules
index 545f502..eaff680 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,34 +38,7 @@ override_dh_autoreconf:
 	echo "NOOP"
 
 override_dh_auto_build:
-	echo "NOOP"
+	DESTDIR=$$(pwd)/debian/magicka/ make -f GNUmakefile.debian -j1 www
 
 override_dh_auto_install:
-	make -j1 www
-	mkdir -p $$(pwd)/debian/magicka/usr/bin
-	mkdir -p $$(pwd)/debian/magicka/usr/share/doc/magicka
-	mkdir -p $$(pwd)/debian/magicka/opt/magicka
-	cp -p magicka $$(pwd)/debian/magicka/usr/bin/
-	cp -pR docs/* $$(pwd)/debian/magicka/usr/share/doc/magicka/
-	cp -pR dist/* $$(pwd)/debian/magicka/opt/magicka/
-	cp -pR setup.sh $$(pwd)/debian/magicka/opt/magicka/
-	#cp -p utils/dosbox/ccenter $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/dosbox_shim/shim $$(pwd)/debian/magicka/usr/bin/
-	#cp -p utils/fileapprove/fileapprove $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/filecenter/filecenter $$(pwd)/debian/magicka/usr/bin/
-	#cp -p utils/filepost/filepost $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/magichat/magichat $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/magiedit/magiedit $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/magiftpd/magiftpd $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/magimail/bin/* $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/magimail/doc/* $$(pwd)/debian/magicka/usr/share/doc/magicka/
-	cp -p utils/massupload/massupload.pl $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/mgpost/mgpost $$(pwd)/debian/magicka/usr/bin/
-	#cp -p utils/mnetftn $$(pwd)/debian/magicka/usr/bin/
-	#cp -p utils/mnetftpd $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/newfilescan/newfilescan.pl $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/nodelistp/nodelistp.pl $$(pwd)/debian/magicka/usr/bin/
-	#cp -p utils/qwknet $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/reset_pass/reset_pass $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/sql_update/*.pl $$(pwd)/debian/magicka/usr/bin/
-	cp -p utils/ticproc/ticproc $$(pwd)/debian/magicka/usr/bin/
+	DESTDIR=$$(pwd)/debian/magicka/ make -f GNUmakefile.debian -j1 install