[qflow] 03/03: Refreshed some patches

Ruben Undheim rubund-guest at moszumanska.debian.org
Thu Jul 23 08:37:30 UTC 2015 

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

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

commit 37cabb843abc2c0c6b25d105191f5de9e8e96929
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Jul 23 10:32:57 2015 +0200

    Refreshed some patches
---
 debian/patches/01_fix_install_dir.patch   | 52 ++++++++---------
 debian/patches/03_fix_path_of_tclsh.patch | 92 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 26 insertions(+), 119 deletions(-)

diff --git a/debian/patches/01_fix_install_dir.patch b/debian/patches/01_fix_install_dir.patch
index 91aeadd..2e8867f 100644
--- a/debian/patches/01_fix_install_dir.patch
+++ b/debian/patches/01_fix_install_dir.patch
@@ -1,8 +1,8 @@
 Index: qflow/src/Makefile.in
 ===================================================================
---- qflow.orig/src/Makefile.in
-+++ qflow/src/Makefile.in
-@@ -9,7 +9,7 @@ LIBS = @LIBS@
+--- qflow.orig/src/Makefile.in	2015-07-23 10:26:49.048148689 +0200
++++ qflow/src/Makefile.in	2015-07-23 10:26:49.040148506 +0200
+@@ -9,7 +9,7 @@
  LDFLAGS = @LDFLAGS@
  INSTALL = @INSTALL@
  
@@ -13,22 +13,22 @@ Index: qflow/src/Makefile.in
  QFLOW_ABC_PATH = @QFLOW_ABC_PATH@
 Index: qflow/tech/Makefile.in
 ===================================================================
---- qflow.orig/tech/Makefile.in
-+++ qflow/tech/Makefile.in
-@@ -9,7 +9,7 @@ LIBS = @LIBS@
+--- qflow.orig/tech/Makefile.in	2015-07-23 10:26:49.048148689 +0200
++++ qflow/tech/Makefile.in	2015-07-23 10:26:49.040148506 +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
+ TECH_DIRS = osu050 osu035 osu018
  
 Index: qflow/tech/osu035/Makefile.in
 ===================================================================
---- qflow.orig/tech/osu035/Makefile.in
-+++ qflow/tech/osu035/Makefile.in
-@@ -9,7 +9,7 @@ LIBS = @LIBS@
+--- qflow.orig/tech/osu035/Makefile.in	2015-07-23 10:26:49.048148689 +0200
++++ qflow/tech/osu035/Makefile.in	2015-07-23 10:26:49.044148597 +0200
+@@ -9,7 +9,7 @@
  LDFLAGS = @LDFLAGS@
  INSTALL = @INSTALL@
  
@@ -39,9 +39,9 @@ Index: qflow/tech/osu035/Makefile.in
  TECH_FILES += osu035_stdcells.sp osu035.magicrc osu035.prm
 Index: qflow/tech/osu050/Makefile.in
 ===================================================================
---- qflow.orig/tech/osu050/Makefile.in
-+++ qflow/tech/osu050/Makefile.in
-@@ -9,7 +9,7 @@ LIBS = @LIBS@
+--- qflow.orig/tech/osu050/Makefile.in	2015-07-23 10:26:49.048148689 +0200
++++ qflow/tech/osu050/Makefile.in	2015-07-23 10:26:49.044148597 +0200
+@@ -9,7 +9,7 @@
  LDFLAGS = @LDFLAGS@
  INSTALL = @INSTALL@
  
@@ -52,9 +52,9 @@ Index: qflow/tech/osu050/Makefile.in
  TECH_FILES += osu050_stdcells.sp osu050.magicrc osu050.prm
 Index: qflow/scripts/Makefile.in
 ===================================================================
---- qflow.orig/scripts/Makefile.in
-+++ qflow/scripts/Makefile.in
-@@ -11,8 +11,8 @@ INSTALL = @INSTALL@
+--- qflow.orig/scripts/Makefile.in	2015-07-23 10:26:49.048148689 +0200
++++ qflow/scripts/Makefile.in	2015-07-23 10:27:44.417418177 +0200
+@@ -11,8 +11,8 @@
  
  VERSION = @VERSION@
  
@@ -62,19 +62,19 @@ Index: qflow/scripts/Makefile.in
 -QFLOW_BIN_DIR = @QFLOW_BIN_DIR@
 +QFLOW_LIB_DIR = /usr/lib/qflow
 +QFLOW_BIN_DIR = /usr/bin
+ TCLSH_PATH = @TCLSH_PATH@
  
  DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
- 
-@@ -38,9 +38,9 @@ launcher:  $(MAIN_SCRIPT).in
- 		$(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
+@@ -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
+-	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/patches/03_fix_path_of_tclsh.patch b/debian/patches/03_fix_path_of_tclsh.patch
deleted file mode 100644
index e3b686c..0000000
--- a/debian/patches/03_fix_path_of_tclsh.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-Last-Update: 2015-05-12
-Index: qflow/scripts/addspacers.tcl
-===================================================================
---- qflow.orig/scripts/addspacers.tcl
-+++ qflow/scripts/addspacers.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #---------------------------------------------------------------------------
- # addspacers.tcl ---
- #
-Index: qflow/scripts/blif2sim.tcl
-===================================================================
---- qflow.orig/scripts/blif2sim.tcl
-+++ qflow/scripts/blif2sim.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #
- # Usage:
- #	blif2sim.tcl <blif_filename> <dir> [<sim_filename>]
-Index: qflow/scripts/decongest.tcl
-===================================================================
---- qflow.orig/scripts/decongest.tcl
-+++ qflow/scripts/decongest.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #
- # Usage:
- #	decongest.tcl <rootname> <leffile> <fillcell> [<scale> <offset>]
-Index: qflow/scripts/getfillcell.tcl
-===================================================================
---- qflow.orig/scripts/getfillcell.tcl
-+++ qflow/scripts/getfillcell.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #---------------------------------------------------------------------------
- # getfillcell.tcl ---
- #
-Index: qflow/scripts/place2def.tcl
-===================================================================
---- qflow.orig/scripts/place2def.tcl
-+++ qflow/scripts/place2def.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #---------------------------------------------------------------------------
- # place2def.tcl ---
- #
-Index: qflow/scripts/rtl2sim.tcl
-===================================================================
---- qflow.orig/scripts/rtl2sim.tcl
-+++ qflow/scripts/rtl2sim.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #
- # Usage:
- #	rtl2sim.tcl <verilog_rtl_filename> <dir> [<sim_filename>]
-Index: qflow/scripts/ybuffer.tcl
-===================================================================
---- qflow.orig/scripts/ybuffer.tcl
-+++ qflow/scripts/ybuffer.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #-------------------------------------------------------------------------
- # ybuffer --- post-process a mapped .blif file generated by yosys
- #
-Index: qflow/scripts/ypostproc.tcl
-===================================================================
---- qflow.orig/scripts/ypostproc.tcl
-+++ qflow/scripts/ypostproc.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #-------------------------------------------------------------------------
- # ypostproc --- post-process a mapped .blif file generated by yosys
- #
-Index: qflow/scripts/blifanno.tcl
-===================================================================
---- qflow.orig/scripts/blifanno.tcl
-+++ qflow/scripts/blifanno.tcl
-@@ -1,4 +1,4 @@
--#!/bin/tclsh
-+#!/usr/bin/tclsh
- #---------------------------------------------------------------------------
- # blifanno.tcl ---
- #
diff --git a/debian/patches/series b/debian/patches/series
index a695918..fa0c4f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_fix_install_dir.patch
 02_fix_compile_error.patch
-03_fix_path_of_tclsh.patch

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

More information about the debian-science-commits mailing list