From e0dca729d6d29ae8861d9616d5fa18b6871809e6 Mon Sep 17 00:00:00 2001
From: Thomas Hallgren <th-github@altocumulus.org>
Date: Fri, 30 Nov 2018 00:15:37 +0100
Subject: [PATCH 1/2] WebSetup.hs: don't output messages that lie about what's
 being installed

---
 WebSetup.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WebSetup.hs b/WebSetup.hs
index f6f76107d..fd55439b4 100644
--- a/WebSetup.hs
+++ b/WebSetup.hs
@@ -104,9 +104,10 @@ setupWeb dest (pkg,lbi) = do
     copy_pgf (pgf,subdir,_) =
       do let src = gfo_dir </> pgf
          let dst = grammars_dir </> pgf
-         putStrLn $ "Installing "++dst
          ex <- doesFileExist src
-         if ex then copyFile src dst else return ()
+         if ex then do putStrLn $ "Installing "++dst
+                       copyFile src dst
+               else putStrLn $ "Not installing "++dst
 
     gf_logo = "gf0.png"
 

From d0bc36835893d048b48366e48884bec78c305509 Mon Sep 17 00:00:00 2001
From: Thomas Hallgren <th-github@altocumulus.org>
Date: Fri, 30 Nov 2018 00:17:45 +0100
Subject: [PATCH 2/2] Update `make deb` for the GF 3.10 release

This includes adding commands in debian/rules to build and include
the RGL and the example grammars in the debian package.
---
 Makefile         | 2 +-
 debian/changelog | 6 ++++++
 debian/rules     | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 debian/rules

diff --git a/Makefile b/Makefile
index 80ecff061..93a8dc20b 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ html::
 # number to the top of debian/changelog.
 # (Tested on Ubuntu 15.04. You need to install dpkg-dev & debhelper.)
 deb:
-	dpkg-buildpackage -b
+	dpkg-buildpackage -b -uc
 
 # Make an OS X Installer package
 pkg:
diff --git a/debian/changelog b/debian/changelog
index b3cb6db35..d163c4a03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gf (3.10-1) xenial bionic cosmic; urgency=low
+
+  * GF 3.10
+
+ -- Thomas Hallgren <hallgren@chalmers.se>  Fri, 30 Nov 2018 20:00:00 +0100
+
 gf (3.9-1) vivid xenial zesty; urgency=low
 
   * GF 3.9
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 14cad5c19..3afb7ab72
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,8 @@ override_dh_auto_build:
 	cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr/lib
 	echo LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs
 	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal build
+	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal copy --destdir=$(CURDIR)/debian/gf # create www directory
+	PATH=$(CURDIR)/dist/build/gf:$$PATH && export GF_LIB_PATH="$$(dirname $$(find "$(CURDIR)/debian/gf" -name www))/lib" && echo "GF_LIB_PATH=$$GF_LIB_PATH" && mkdir -p "$$GF_LIB_PATH" && ( cd ../gf-rgl && make build && make copy ) && LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal build
 	make html
 
 override_dh_auto_clean: