[qflow] 01/01: There were some problems with paths. Fixed

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository qflow.

commit 90b85599f7bb0adf893767ee472f7f92f877d4b4
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Apr 16 20:43:07 2015 +0200

    There were some problems with paths. Fixed
---
 debian/changelog                        |  2 +-
 debian/patches/01_fix_install_dir.patch | 99 ++++++++++++++++++++++++++-------
 debian/qflow.install                    |  4 +-
 debian/rules                            |  2 +-
 4 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60251b5..6cec3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qflow (1.0.93-1) UNRELEASED; urgency=low
+qflow (1.0.93-2) UNRELEASED; urgency=low
 
   * Initial release (Closes: #761368)
 
diff --git a/debian/patches/01_fix_install_dir.patch b/debian/patches/01_fix_install_dir.patch
index 547fddd..d8ddda5 100644
--- a/debian/patches/01_fix_install_dir.patch
+++ b/debian/patches/01_fix_install_dir.patch
@@ -1,21 +1,80 @@
-Index: qflow/configure.in
+Index: qflow/src/Makefile.in
 ===================================================================
---- qflow.orig/configure.in	2015-04-16 19:26:09.744184566 +0200
-+++ qflow/configure.in	2015-04-16 19:25:33.432184257 +0200
-@@ -178,14 +178,14 @@
- [  --with-libdir=DIR			path to qflow runtime files], [
-    QFLOW_LIB_DIR=$withval
- ], [
--   QFLOW_LIB_DIR=${ac_default_prefix}/share/qflow
-+   QFLOW_LIB_DIR=${prefix}/share/qflow
- ])
- 
- AC_ARG_WITH(bindir,
- [  --with-bindir=DIR			path to qflow launch script], [
-    QFLOW_BIN_DIR=$withval
- ], [
--   QFLOW_BIN_DIR=${ac_default_prefix}/bin
-+   QFLOW_BIN_DIR=${prefix}/bin
- ])
- 
- dnl AC_SUBST(QFLOW_QROUTER_PATH)
+--- qflow.orig/src/Makefile.in	2015-04-16 20:52:02.000983436 +0200
++++ qflow/src/Makefile.in	2015-04-16 20:52:01.992983436 +0200
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+ 
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = /usr/lib/qflow
+ QFLOW_GRAYWOLF_PATH = @QFLOW_GRAYWOLF_PATH@
+ QFLOW_QROUTER_PATH = @QFLOW_QROUTER_PATH@
+ QFLOW_ABC_PATH = @QFLOW_ABC_PATH@
+Index: qflow/tech/Makefile.in
+===================================================================
+--- qflow.orig/tech/Makefile.in	2015-04-16 20:52:02.000983436 +0200
++++ qflow/tech/Makefile.in	2015-04-16 20:52:01.996983436 +0200
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+ 
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = /usr/share/qflow
+ 
+ TECH_DIRS = osu035 osu050
+ 
+Index: qflow/tech/osu035/Makefile.in
+===================================================================
+--- qflow.orig/tech/osu035/Makefile.in	2015-04-16 20:52:02.000983436 +0200
++++ qflow/tech/osu035/Makefile.in	2015-04-16 20:52:01.996983436 +0200
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+ 
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = /usr/share/qflow
+ 
+ TECH_FILES = osu035.genlib osu035.super osu035.par osu035_stdcells.lef
+ TECH_FILES += osu035.sh osu035_stdcells.sp osu035.magicrc osu035.prm
+Index: qflow/tech/osu050/Makefile.in
+===================================================================
+--- qflow.orig/tech/osu050/Makefile.in	2015-04-16 20:52:02.000983436 +0200
++++ qflow/tech/osu050/Makefile.in	2015-04-16 20:52:01.996983436 +0200
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+ 
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = /usr/share/qflow
+ 
+ TECH_FILES = osu050.genlib osu050.super osu050.par osu050_stdcells.lef
+ TECH_FILES += osu050.sh osu050_stdcells.sp osu050.magicrc osu050.prm
+Index: qflow/scripts/Makefile.in
+===================================================================
+--- qflow.orig/scripts/Makefile.in	2015-04-16 20:51:55.352983379 +0200
++++ qflow/scripts/Makefile.in	2015-04-16 20:53:41.636984283 +0200
+@@ -11,8 +11,8 @@
+ 
+ VERSION = @VERSION@
+ 
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
+-QFLOW_BIN_DIR = @QFLOW_BIN_DIR@
++QFLOW_LIB_DIR = /usr/lib/qflow
++QFLOW_BIN_DIR = /usr/bin
+ 
+ DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
+ 
+@@ -39,9 +39,9 @@
+ 		$(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
+ 
+ checkdirs.sh:  checkdirs.sh.in
+-		sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
+-		-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+-		-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
++		sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#/usr/share/qflow/tech#' \
++		-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#/usr/lib/qflow/scripts#' \
++		-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#/usr/lib/qflow/bin#' \
+ 		checkdirs.sh.in > checkdirs.sh
+ 
+ qflow.sh:  qflow.sh.in
diff --git a/debian/qflow.install b/debian/qflow.install
index 360a17c..e29fd64 100644
--- a/debian/qflow.install
+++ b/debian/qflow.install
@@ -1,3 +1,3 @@
 usr/bin
-usr/share/qflow/bin usr/lib/qflow/
-usr/share/qflow/scripts usr/lib/qflow/
+usr/lib/qflow/bin
+usr/lib/qflow/scripts
diff --git a/debian/rules b/debian/rules
index 85ce4e2..955dd78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf
+	dh $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git