[fpga-icestorm] 02/02: After importing and exporting with gbp-pq
Ruben Undheim
rubund-guest at moszumanska.debian.org
Tue Jun 14 16:47:24 UTC 2016
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 79a104fb8567ffc33909c865ad5b08e9f6137d12
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Tue Jun 14 18:47:07 2016 +0200
After importing and exporting with gbp-pq
---
debian/patches/01_installpath.patch | 20 ++++++------
debian/patches/02_spelling_fixes.patch | 23 ++++++++------
debian/patches/03_cxxflags.patch | 45 +++++++++++++++++++--------
debian/patches/fix_spelling_in_binaries.patch | 18 ++++++++---
debian/patches/override-CXX.patch | 7 +++++
debian/patches/reproducible.patch | 13 +++++---
6 files changed, 87 insertions(+), 39 deletions(-)
diff --git a/debian/patches/01_installpath.patch b/debian/patches/01_installpath.patch
index 7529ce2..5c4903d 100644
--- a/debian/patches/01_installpath.patch
+++ b/debian/patches/01_installpath.patch
@@ -1,19 +1,21 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
-
-Subject:
-Install the python programs and the iceboxdb module in
-/usr/share/fpga-icestorm/python, instead of in /usr/bin where upstream
-wants to put them.
+Date: Tue, 14 Jun 2016 18:46:08 +0200
+Subject: Install the python programs and the iceboxdb module in
+ /usr/share/fpga-icestorm/python,
+ instead of in /usr/bin where upstream wants to put them.
The rationale for this is that icebox imports iceboxdb, so iceboxdb needs
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(-)
-Index: icestorm/icebox/Makefile
-===================================================================
---- icestorm.orig/icebox/Makefile
-+++ icestorm/icebox/Makefile
+diff --git a/icebox/Makefile b/icebox/Makefile
+index 43d4664..83796a1 100644
+--- a/icebox/Makefile
++++ b/icebox/Makefile
@@ -15,19 +15,19 @@ clean:
rm -f icebox.pyc iceboxdb.pyc
diff --git a/debian/patches/02_spelling_fixes.patch b/debian/patches/02_spelling_fixes.patch
index b6e45e7..80282ac 100644
--- a/debian/patches/02_spelling_fixes.patch
+++ b/debian/patches/02_spelling_fixes.patch
@@ -1,11 +1,16 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Tue, 14 Jun 2016 18:46:08 +0200
Subject: This patch fixes a few spelling mistakes in error output messages
-Index: icestorm-0~20151006git103e6fd/icepack/icepack.cc
-===================================================================
---- icestorm-0~20151006git103e6fd.orig/icepack/icepack.cc 2015-10-07 17:23:26.976543581 +0200
-+++ icestorm-0~20151006git103e6fd/icepack/icepack.cc 2015-10-08 08:03:46.501963533 +0200
-@@ -328,7 +328,7 @@
+---
+ icepack/icepack.cc | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/icepack/icepack.cc b/icepack/icepack.cc
+index 6a9e05a..3b09936 100644
+--- a/icepack/icepack.cc
++++ b/icepack/icepack.cc
+@@ -328,7 +328,7 @@ void FpgaConfig::read_bits(std::istream &ifs)
break;
default:
@@ -14,7 +19,7 @@ Index: icestorm-0~20151006git103e6fd/icepack/icepack.cc
}
break;
-@@ -381,7 +381,7 @@
+@@ -381,7 +381,7 @@ void FpgaConfig::read_bits(std::istream &ifs)
break;
default:
@@ -23,7 +28,7 @@ Index: icestorm-0~20151006git103e6fd/icepack/icepack.cc
}
}
-@@ -854,21 +854,21 @@
+@@ -854,21 +854,21 @@ int FpgaConfig::chip_width() const
{
if (this->device == "1k") return 12;
if (this->device == "8k") return 32;
@@ -48,7 +53,7 @@ Index: icestorm-0~20151006git103e6fd/icepack/icepack.cc
}
string FpgaConfig::tile_type(int x, int y) const
-@@ -886,7 +886,7 @@
+@@ -886,7 +886,7 @@ string FpgaConfig::tile_type(int x, int y) const
return "logic";
}
@@ -57,7 +62,7 @@ Index: icestorm-0~20151006git103e6fd/icepack/icepack.cc
}
int FpgaConfig::tile_width(const string &type) const
-@@ -896,7 +896,7 @@
+@@ -896,7 +896,7 @@ int FpgaConfig::tile_width(const string &type) const
if (type == "ramb") return 42;
if (type == "ramt") return 42;
if (type == "io") return 18;
diff --git a/debian/patches/03_cxxflags.patch b/debian/patches/03_cxxflags.patch
index 4cf57a5..bb73b18 100644
--- a/debian/patches/03_cxxflags.patch
+++ b/debian/patches/03_cxxflags.patch
@@ -1,8 +1,19 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
-Subject: This makes sure that the CXXFLAGS given by the
- Debian build system are not overwritten, but prepended. Additionally
- unwanted CXXFLAGS are removed.
+Date: Tue, 14 Jun 2016 18:46:08 +0200
+Subject: This makes sure that the CXXFLAGS given by the Debian build system
+ are not overwritten,
+ but prepended. Additionally unwanted CXXFLAGS are removed.
+---
+ icemulti/Makefile | 2 +-
+ icepack/Makefile | 2 +-
+ icepll/Makefile | 2 +-
+ iceprog/Makefile | 2 +-
+ icetime/Makefile | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/icemulti/Makefile b/icemulti/Makefile
+index c901413..63c5715 100644
--- a/icemulti/Makefile
+++ b/icemulti/Makefile
@@ -1,6 +1,6 @@
@@ -13,6 +24,8 @@ Subject: This makes sure that the CXXFLAGS given by the
all: icemulti$(EXE)
+diff --git a/icepack/Makefile b/icepack/Makefile
+index 78701db..5bdb10b 100644
--- a/icepack/Makefile
+++ b/icepack/Makefile
@@ -1,6 +1,6 @@
@@ -23,16 +36,8 @@ Subject: This makes sure that the CXXFLAGS given by the
MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
all: icepack$(EXE) iceunpack$(EXE)
---- a/iceprog/Makefile
-+++ b/iceprog/Makefile
-@@ -1,6 +1,6 @@
- include ../config.mk
- LDLIBS = -L/usr/local/lib -lftdi -lm
--CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
-+CFLAGS += -Wall -std=c99
-
- ifeq ($(MXE),1)
- LDLIBS += -lusb
+diff --git a/icepll/Makefile b/icepll/Makefile
+index b47de3e..d746bf4 100644
--- a/icepll/Makefile
+++ b/icepll/Makefile
@@ -1,6 +1,6 @@
@@ -43,6 +48,20 @@ Subject: This makes sure that the CXXFLAGS given by the
all: icepll$(EXE)
+diff --git a/iceprog/Makefile b/iceprog/Makefile
+index b9f00d9..126a4e3 100644
+--- a/iceprog/Makefile
++++ b/iceprog/Makefile
+@@ -1,6 +1,6 @@
+ include ../config.mk
+ LDLIBS = -L/usr/local/lib -lftdi -lm
+-CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
++CFLAGS += -Wall -std=c99
+
+ ifeq ($(MXE),1)
+ LDLIBS += -lusb
+diff --git a/icetime/Makefile b/icetime/Makefile
+index 6355f06..3709a8b 100644
--- a/icetime/Makefile
+++ b/icetime/Makefile
@@ -1,6 +1,6 @@
diff --git a/debian/patches/fix_spelling_in_binaries.patch b/debian/patches/fix_spelling_in_binaries.patch
index 090835f..e9e8e4b 100644
--- a/debian/patches/fix_spelling_in_binaries.patch
+++ b/debian/patches/fix_spelling_in_binaries.patch
@@ -1,8 +1,16 @@
From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Tue, 14 Jun 2016 18:46:08 +0200
Subject: This patch fixes a few spelling errors detected by lintian
---- fpga-icestorm-0~20160218gitf2b2549.orig/icepll/icepll.cc
-+++ fpga-icestorm-0~20160218gitf2b2549/icepll/icepll.cc
+---
+ icepll/icepll.cc | 4 ++--
+ icetime/icetime.cc | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/icepll/icepll.cc b/icepll/icepll.cc
+index 261cf0a..7a3593d 100644
+--- a/icepll/icepll.cc
++++ b/icepll/icepll.cc
@@ -84,12 +84,12 @@ int main(int argc, char **argv)
int best_divq = 0;
@@ -18,8 +26,10 @@ Subject: This patch fixes a few spelling errors detected by lintian
exit(1);
}
---- fpga-icestorm-0~20160218gitf2b2549.orig/icetime/icetime.cc
-+++ fpga-icestorm-0~20160218gitf2b2549/icetime/icetime.cc
+diff --git a/icetime/icetime.cc b/icetime/icetime.cc
+index fd7c898..69b9d9f 100644
+--- a/icetime/icetime.cc
++++ b/icetime/icetime.cc
@@ -1886,7 +1886,7 @@ int main(int argc, char **argv)
if (device_type.empty()) {
diff --git a/debian/patches/override-CXX.patch b/debian/patches/override-CXX.patch
index 0035201..fff2628 100644
--- a/debian/patches/override-CXX.patch
+++ b/debian/patches/override-CXX.patch
@@ -1,7 +1,14 @@
From: Sebastian Kuzminsky <seb at highlab.com>
+Date: Tue, 14 Jun 2016 18:46:08 +0200
Subject: This patch makes sure that CXX and CC can be set by the package
build system.
+---
+ config.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index 36c03c2..affb06a 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 381f0d8..0de82a9 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -1,12 +1,18 @@
From: Daniel Shahaf <danielsh at apache.org>
+Date: Tue, 14 Jun 2016 18:46:08 +0200
Subject: make the build reproducible
Bug-Debian: https://bugs.debian.org/823616
Last-Update: 2016-05-06
+---
+ icebox/icebox_chipdb.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
---- fpga-icestorm-0~20160218gitf2b2549.orig/icebox/icebox_chipdb.py
-+++ fpga-icestorm-0~20160218gitf2b2549/icebox/icebox_chipdb.py
-@@ -172,7 +172,7 @@ all_group_segments = ic.group_segments(a
+diff --git a/icebox/icebox_chipdb.py b/icebox/icebox_chipdb.py
+index 09a1ceb..0d54b46 100755
+--- a/icebox/icebox_chipdb.py
++++ b/icebox/icebox_chipdb.py
+@@ -172,7 +172,7 @@ all_group_segments = ic.group_segments(all_tiles, connect_gb=False)
print(".device %s %d %d %d" % (ic.device, ic.max_x+1, ic.max_y+1, len(all_group_segments)))
print()
@@ -15,4 +21,3 @@ Last-Update: 2016-05-06
key_dev, key_package = key.split("-")
if key_dev == ic.device:
print(".pins %s" % (key_package))
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fpga-icestorm.git
More information about the debian-science-commits
mailing list