[fpga-icestorm] 01/02: Patch path to chipdb in icetime Make fpga-icestorm recommend fpga-icestorm-chipdb

[Ruben Undheim]

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

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

commit 4a849a9e50bfb79a1e121556a9fbcf8ef3bff6ec
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Jun 14 19:21:57 2016 +0200

    Patch path to chipdb in icetime
    Make fpga-icestorm recommend fpga-icestorm-chipdb
---
 debian/changelog                              | 10 ++++++++++
 debian/control                                |  4 ++--
 debian/patches/01_installpath.patch           | 21 +++++++++++++++++++--
 debian/patches/fix_spelling_in_binaries.patch |  4 ++--
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b19a72..c94268e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+fpga-icestorm (0~20160218gitf2b2549-3) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - Changed dependency on fpga-icestorm-chipdb from "Suggests:" to
+      "Recommends:".
+  * debian/patches/01_installpath.patch:
+    - Fix hard-coded path to chipdb in icetime (Closes: #827176)
+
+ -- Ruben Undheim <ruben.undheim at gmail.com>  Tue, 14 Jun 2016 19:19:29 +0200
+
 fpga-icestorm (0~20160218gitf2b2549-2) unstable; urgency=medium
 
   [ Daniel Shahaf ]
diff --git a/debian/control b/debian/control
index 5179726..e957a90 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python3
-Recommends: yosys
-Suggests: arachne-pnr, fpga-icestorm-chipdb
+Recommends: yosys, fpga-icestorm-chipdb
+Suggests: arachne-pnr
 Description: Tools to handle the bitstream format of Lattice iCE40 FPGAs
  Project IceStorm aims at documenting the bitstream format of Lattice iCE40
  FPGAs and providing simple tools for analyzing and creating bitstream files. At
diff --git a/debian/patches/01_installpath.patch b/debian/patches/01_installpath.patch
index 5c4903d..3a5d52f 100644
--- a/debian/patches/01_installpath.patch
+++ b/debian/patches/01_installpath.patch
@@ -9,8 +9,9 @@ to be findable by the python importer, but iceboxdb is not useful for any
 program other than icebox, so it should not be in the normal system-wide
 python include path.
 ---
- icebox/Makefile | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
+ icebox/Makefile    | 26 +++++++++++++-------------
+ icetime/icetime.cc |  5 +----
+ 2 files changed, 14 insertions(+), 17 deletions(-)
 
 diff --git a/icebox/Makefile b/icebox/Makefile
 index 43d4664..83796a1 100644
@@ -49,3 +50,19 @@ index 43d4664..83796a1 100644
  
  uninstall:
  	rm -f $(DESTDIR)$(PREFIX)/bin/icebox.py
+diff --git a/icetime/icetime.cc b/icetime/icetime.cc
+index fd7c898..ec070a3 100644
+--- a/icetime/icetime.cc
++++ b/icetime/icetime.cc
+@@ -266,10 +266,7 @@ void read_chipdb()
+ {
+ 	char buffer[1024];
+ 
+-	if (PREFIX[0] == '~' && PREFIX[1] == '/')
+-		snprintf(buffer, 1024, "%s%s/share/icebox/chipdb-%s.txt", getenv("HOME"), PREFIX+1, config_device.c_str());
+-	else
+-		snprintf(buffer, 1024, "%s/share/icebox/chipdb-%s.txt", PREFIX, config_device.c_str());
++	snprintf(buffer, 1024, "/usr/share/fpga-icestorm/chipdb/chipdb-%s.txt", config_device.c_str());
+ 
+ 	FILE *fdb = fopen(buffer, "r");
+ 	if (fdb == nullptr) {
diff --git a/debian/patches/fix_spelling_in_binaries.patch b/debian/patches/fix_spelling_in_binaries.patch
index e9e8e4b..52bc373 100644
--- a/debian/patches/fix_spelling_in_binaries.patch
+++ b/debian/patches/fix_spelling_in_binaries.patch
@@ -27,10 +27,10 @@ index 261cf0a..7a3593d 100644
  	}
  
 diff --git a/icetime/icetime.cc b/icetime/icetime.cc
-index fd7c898..69b9d9f 100644
+index ec070a3..0e194c2 100644
 --- a/icetime/icetime.cc
 +++ b/icetime/icetime.cc
-@@ -1886,7 +1886,7 @@ int main(int argc, char **argv)
+@@ -1883,7 +1883,7 @@ int main(int argc, char **argv)
  
  	if (device_type.empty()) {
  		device_type = "lp" + config_device;

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