[hamradio-commits] [xnec2c] 06/07: Updates to move the glade file to a sane location

[Dave Hibberd]

This is an automated email from the git hooks/post-receive script.

hibby-guest pushed a commit to branch master
in repository xnec2c.

commit 11d6c0177398fd0e3170291117c3d75a5f56c136
Author: hibby <d at vehibberd.com>
Date:   Sat Jan 20 15:15:03 2018 +0000

    Updates to move the glade file to a sane location
---
 debian/changelog                   |  5 ++++-
 debian/patches/desktop-entry.patch |  5 ++---
 debian/patches/glade.patch         | 15 +++++++++++++++
 debian/patches/makefile.patch      |  4 ++++
 debian/patches/series              |  1 +
 debian/xnec2c.install              |  5 ++++-
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d057bb..e0b8277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 xnec2c (1:3.6.1~beta-1) UNRELEASED; urgency=medium
 
   * New Upstream Release
-    - Refreshed Patches
+    - Refreshed & Removed Patches
   * Updated to Debian Standards 4.1.3
   * Updated to dh11
+  * Patched to install properly
+    - makefile.patch to ensure files go to the right place
+    - glade.patch ensures glade file installs in shared location
 
  -- Dave Hibberd <d at vehibberd.com>  Sat, 20 Jan 2018 13:36:54 +0000
 
diff --git a/debian/patches/desktop-entry.patch b/debian/patches/desktop-entry.patch
index 2604054..d8190a9 100644
--- a/debian/patches/desktop-entry.patch
+++ b/debian/patches/desktop-entry.patch
@@ -4,15 +4,14 @@ Last-Update: 2018-01-20
 
 --- a/files/xnec2c.desktop
 +++ b/files/xnec2c.desktop
-@@ -1,10 +1,10 @@
+@@ -1,6 +1,5 @@
  [Desktop Entry]
  Version=1.0
 -Encoding=UTF-8
  Name=xnec2c
  Comment=Antenna analysis
  Exec=xnec2c -j4
--Icon=xnec2c
-+Icon=/usr/share/xnec2c/xnec2c.png
+@@ -8,3 +7,4 @@
  Terminal=false
  Type=Application
  Categories=HamRadio;Science;Utility
diff --git a/debian/patches/glade.patch b/debian/patches/glade.patch
new file mode 100644
index 0000000..af01bb1
--- /dev/null
+++ b/debian/patches/glade.patch
@@ -0,0 +1,15 @@
+Description: Install glade file to a shared location
+Author: Dave Hibberd <d at vehibberd.com>
+Last-Update: 2018-01-20
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -175,7 +175,7 @@
+   gtk_init (&argc, &argv);
+ 
+   /* Create home folder paths for glade file and NEC2 files */
+-  Strlcpy( xnec2c_glade, getenv("HOME"), sizeof(xnec2c_glade) );
++  Strlcpy( xnec2c_glade, "/usr/share", sizeof(xnec2c_glade) );
+   Strlcat( xnec2c_glade, "/xnec2c/xnec2c.glade", sizeof(xnec2c_glade) );
+   Strlcpy( xnec2c_files, getenv("HOME"), sizeof(xnec2c_files) );
+   Strlcat( xnec2c_files, "/xnec2c/nec2_files/", sizeof(xnec2c_files) );
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 29ce27e..ffa7303 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -1,3 +1,7 @@
+Description: Remove manual install of files
+Author: Dave Hibberd <d at vehibberd.com>
+Last-Update: 2018-01-20
+
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -44,26 +44,3 @@
diff --git a/debian/patches/series b/debian/patches/series
index edd58e4..14383d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+glade.patch
 makefile.patch
 desktop-entry.patch
diff --git a/debian/xnec2c.install b/debian/xnec2c.install
index 76926fa..6765954 100644
--- a/debian/xnec2c.install
+++ b/debian/xnec2c.install
@@ -1,2 +1,5 @@
 files/xnec2c.desktop usr/share/applications/
-files/xnec2c.png usr/share/xnec2c/
+files/xnec2c.png usr/share/pixmaps/
+doc/* usr/share/doc/xnec2c/
+examples/* usr/share/doc/xnec2c/examples/
+xnec2c/xnec2c.glade usr/share/xnec2c/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xnec2c.git