[icestorm] 01/01: More fixes

[Ruben Undheim]

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

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

commit b4305ba54ef2c5e89cbbc89a78eb215dbc559a23
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Oct 8 17:38:57 2015 +0200

    More fixes
---
 debian/control                      |  5 ++++-
 debian/icestorm-chipdb.install      |  2 +-
 debian/icestorm.doc-base            | 14 ++++++++++++++
 debian/icestorm.install             |  3 +++
 debian/patches/01_installpath.patch | 12 ++++++------
 debian/patches/03_cxxflags.patch    |  9 +++++----
 6 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 4aa4ff9..1fcf23a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Section: electronics
 Priority: optional
 Build-Depends: debhelper (>= 9),
                libftdi-dev,
-               python3
+               python3,
+               txt2man
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/icestorm.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/icestorm.git
@@ -28,6 +29,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python3
+Recommends: yosys,
+            arachne-pnr
 Suggests: icestorm-chipdb
 Description: Tools to handle the bitstream format of Lattice iCE40 FPGAs
  Project IceStorm aims at documenting the bitstream format of Lattice iCE40
diff --git a/debian/icestorm-chipdb.install b/debian/icestorm-chipdb.install
index 1350cd8..c699e70 100644
--- a/debian/icestorm-chipdb.install
+++ b/debian/icestorm-chipdb.install
@@ -1 +1 @@
-usr/share/icebox/*
+usr/share/icestorm/chipdb/*
diff --git a/debian/icestorm.doc-base b/debian/icestorm.doc-base
new file mode 100644
index 0000000..75d113d
--- /dev/null
+++ b/debian/icestorm.doc-base
@@ -0,0 +1,14 @@
+Document: icestorm
+Title: Documentation for the Icestorm project
+Abstract: 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
+ the moment the focus of the project is on the HX1K-TQ144 and HX8K-CT256
+ devices, but most of the information is device-independent.
+ .
+ These documents describe how icestorm works.
+Section: Science/Electronics
+
+Format: HTML
+Index: /usr/share/doc/icestorm/html/index.html
+Files: /usr/share/doc/icestorm/html/*.html
diff --git a/debian/icestorm.install b/debian/icestorm.install
index 1b1c11b..72fa319 100644
--- a/debian/icestorm.install
+++ b/debian/icestorm.install
@@ -1,2 +1,5 @@
 usr/bin/*
 usr/share/icestorm/python/*
+docs/*.svg usr/share/doc/icestorm/html
+docs/*.html usr/share/doc/icestorm/html
+docs/*.png usr/share/doc/icestorm/html
diff --git a/debian/patches/01_installpath.patch b/debian/patches/01_installpath.patch
index 28050d5..08e1e10 100644
--- a/debian/patches/01_installpath.patch
+++ b/debian/patches/01_installpath.patch
@@ -21,11 +21,11 @@ Index: icestorm-0~20151006git103e6fd/icebox/Makefile
 -	cp icebox_html.py    $(DESTDIR)/bin/icebox_html
 -	cp icebox_maps.py    $(DESTDIR)/bin/icebox_maps
 -	cp icebox_vlog.py    $(DESTDIR)/bin/icebox_vlog
-+	mkdir -p $(DESTDIR)/usr/share/icebox
++	mkdir -p $(DESTDIR)/usr/share/icestorm/chipdb
 +	mkdir -p $(DESTDIR)/usr/bin
 +	mkdir -p $(DESTDIR)/usr/share/icestorm/python
-+	cp chipdb-1k.txt     $(DESTDIR)/usr/share/icebox/
-+	cp chipdb-8k.txt     $(DESTDIR)/usr/share/icebox/
++	cp chipdb-1k.txt     $(DESTDIR)/usr/share/icestorm/chipdb/
++	cp chipdb-8k.txt     $(DESTDIR)/usr/share/icestorm/chipdb/
 +	cp icebox.py         $(DESTDIR)/usr/share/icestorm/python/icebox.py
 +	cp iceboxdb.py       $(DESTDIR)/usr/share/icestorm/python/iceboxdb.py
 +	cp icebox_chipdb.py  $(DESTDIR)/usr/share/icestorm/python/icebox_chipdb
@@ -58,9 +58,9 @@ Index: icestorm-0~20151006git103e6fd/icebox/Makefile
 +	rm -f $(DESTDIR)/usr/bin/icebox_html
 +	rm -f $(DESTDIR)/usr/bin/icebox_maps
 +	rm -f $(DESTDIR)/usr/bin/icebox_vlog
-+	rm -f $(DESTDIR)/usr/share/icebox/chipdb-1k.txt
-+	rm -f $(DESTDIR)/usr/share/icebox/chipdb-8k.txt
-+	-rmdir $(DESTDIR)/usr/share/icebox
++	rm -f $(DESTDIR)/usr/share/icestorm/chipdb/chipdb-1k.txt
++	rm -f $(DESTDIR)/usr/share/icestorm/chipdb/chipdb-8k.txt
++	-rmdir $(DESTDIR)/usr/share/icestorm/chipdb
  
  .PHONY: all clean install uninstall
  
diff --git a/debian/patches/03_cxxflags.patch b/debian/patches/03_cxxflags.patch
index 0c4810d..97becdf 100644
--- a/debian/patches/03_cxxflags.patch
+++ b/debian/patches/03_cxxflags.patch
@@ -1,5 +1,6 @@
 Description: This makes sure that the CXXFLAGS given by the
- Debian build system are not overwritten, but prepended.
+ Debian build system are not overwritten, but prepended. Additionally
+ unwanted CXXFLAGS are removed.
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 
 Index: icestorm/icemulti/Makefile
@@ -11,7 +12,7 @@ Index: icestorm/icemulti/Makefile
  CXX ?= clang
  LDLIBS = -lm -lstdc++
 -CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
-+CXXFLAGS += -std=c++11
++CXXFLAGS += -Wall -std=c++11
  CC = $(CXX)
  DESTDIR = /usr/local
  
@@ -24,7 +25,7 @@ Index: icestorm/icepack/Makefile
  CXX ?= clang
  LDLIBS = -lm -lstdc++
 -CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
-+CXXFLAGS += -std=c++11
++CXXFLAGS += -Wall -std=c++11
  CC = $(CXX)
  DESTDIR = /usr/local
  
@@ -36,7 +37,7 @@ Index: icestorm/iceprog/Makefile
  # CC = clang
  LDLIBS = -L/usr/local/lib -lftdi -lm
 -CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
-+CFLAGS += -std=c99
++CFLAGS += -Wall -std=c99
  DESTDIR = /usr/local
  
  all: iceprog

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