[hamradio-commits] [uronode] 01/01: Packaging bugfix

[Dave Hibberd]

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

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

commit 37b01fe6d088404cf416de8337876de1d6a1b80e
Author: Dave Hibberd <dave.hibberd at gmail.com>
Date:   Fri Oct 16 20:04:57 2015 +0100

    Packaging bugfix
---
 debian/changelog                          |  6 ++++++
 debian/patches/folder-update              | 14 +++++++-------
 debian/patches/makefile-install-locations | 27 +++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff55b63..63550e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+uronode (2.3.1-3) UNRELEASED; urgency=medium
+
+  * Fix hardcoding temporary install directories into program binaries 
+
+ -- Dave Hibberd <d at vehibberd.com>  Fri, 16 Oct 2015 20:02:02 +0100
+
 uronode (2.3.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/folder-update b/debian/patches/folder-update
index 2ed3d63..bc3435e 100644
--- a/debian/patches/folder-update
+++ b/debian/patches/folder-update
@@ -1,6 +1,6 @@
 Description: Update the folders in which Uronode is installed
 Author: Dave Hibberd <d at vehibberd.com>
-Last-Update: 2015-09-07
+Last-Update: 2015-10-16
 
 --- a/configure
 +++ b/configure
@@ -21,12 +21,12 @@ Last-Update: 2015-09-07
 -LIB_DIR=/usr/local/lib
 -MAN_DIR=/usr/local/share/man
 -VAR_DIR=/usr/local/var/ax25
-+ETC_DIR=debian/uronode/etc/ax25
-+SBIN_DIR=debian/uronode/usr/sbin
-+BIN_DIR=debian/uronode/usr/bin
-+LIB_DIR=debian/uronode/usr/lib
-+MAN_DIR=debian/uronode/usr/share/man
-+VAR_DIR=debian/uronode/var/lib/ax25
++ETC_DIR=/etc/ax25
++SBIN_DIR=/usr/sbin
++BIN_DIR=/usr/bin
++LIB_DIR=/usr/lib
++MAN_DIR=/usr/share/man
++VAR_DIR=/var/lib/ax25
  
  echo "Welcome to the configuration utility for URONode. This configure script"
  echo "will very simply and easily guide you into installling URONode with as"
diff --git a/debian/patches/makefile-install-locations b/debian/patches/makefile-install-locations
new file mode 100644
index 0000000..2c4f92f
--- /dev/null
+++ b/debian/patches/makefile-install-locations
@@ -0,0 +1,27 @@
+Description: Install files to temporary directory for packaging
+Author: Dave Hibberd <d at vehibberd.com>
+Last-Update: 2015-10-16
+
+--- a/Makefile.include.in
++++ b/Makefile.include.in
+@@ -2,12 +2,12 @@
+ ARCH		= @ARCH@
+ 
+ # Paths
+-ETC_DIR		= @ETC_DIR@
+-SBIN_DIR	= @SBIN_DIR@
+-BIN_DIR		= @BIN_DIR@
+-LIB_DIR		= @LIB_DIR@
+-MAN_DIR		= @MAN_DIR@
+-VAR_DIR		= @VAR_DIR@
++ETC_DIR		= debian/uronode at ETC_DIR@
++SBIN_DIR	= debian/uronode at SBIN_DIR@
++BIN_DIR		= debian/uronode at BIN_DIR@
++LIB_DIR		= debian/uronode at LIB_DIR@
++MAN_DIR		= debian/uronode at MAN_DIR@
++VAR_DIR		= debian/uronode at VAR_DIR@
+ 
+ # Is Zlib available?
+-ZLIB		= @ZLIB@
+\ No newline at end of file
++ZLIB		= @ZLIB@
diff --git a/debian/patches/series b/debian/patches/series
index 065f5bd..c25fbd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-cflags
 folder-update
 no-install-gz-manpages
 install-dir-creation
+makefile-install-locations
\ No newline at end of file

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