[icestorm] 01/01: Fix lintians
Ruben Undheim
rubund-guest at moszumanska.debian.org
Thu Oct 8 06:29:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository icestorm.
commit c236775683ae7bbde10ae64114bbcc6f0891940e
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Thu Oct 8 08:10:18 2015 +0200
Fix lintians
---
debian/copyright | 19 +++++++++-
debian/man/icebox_colbuf.txt | 2 +-
debian/man/icebox_diff.txt | 2 +-
debian/man/icebox_maps.txt | 2 +-
debian/patches/02_spelling_fixes.patch | 68 ++++++++++++++++++++++++++++++++++
debian/patches/03_cxxflags.patch | 36 ++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 2 +-
debian/watch | 2 +
9 files changed, 130 insertions(+), 5 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index daf9b8a..3dc4e65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: icestorm
-Source: <url://example.com>
+Source: https://github.com/cliffordwolf/icestorm
Files: *
Copyright: 2015 Clifford Wolf
@@ -9,6 +9,23 @@ License: ISC
Files: debian/*
Copyright: 2015 Ruben Undheim <ruben.undheim at gmail.com>
License: GPL-2+
+
+
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
diff --git a/debian/man/icebox_colbuf.txt b/debian/man/icebox_colbuf.txt
index be851f8..2dfe3a7 100644
--- a/debian/man/icebox_colbuf.txt
+++ b/debian/man/icebox_colbuf.txt
@@ -1,5 +1,5 @@
NAME
- icebox_colbuf -
+ icebox_colbuf - manage colbuf bits
SYNOPSIS
icebox-colbuf [options] [input.txt [output.txt]]
diff --git a/debian/man/icebox_diff.txt b/debian/man/icebox_diff.txt
index 2f80678..1388108 100644
--- a/debian/man/icebox_diff.txt
+++ b/debian/man/icebox_diff.txt
@@ -1,5 +1,5 @@
NAME
- icebox_diff -
+ icebox_diff - compare two bitstreams
SYNOPSIS
icebox_diff [options]
diff --git a/debian/man/icebox_maps.txt b/debian/man/icebox_maps.txt
index f022291..777251b 100644
--- a/debian/man/icebox_maps.txt
+++ b/debian/man/icebox_maps.txt
@@ -1,5 +1,5 @@
NAME
- icebox_maps -
+ icebox_maps - a tool in the icestorm project
SYNOPSIS
icebox_maps -m bitmaps
diff --git a/debian/patches/02_spelling_fixes.patch b/debian/patches/02_spelling_fixes.patch
new file mode 100644
index 0000000..fcb7b45
--- /dev/null
+++ b/debian/patches/02_spelling_fixes.patch
@@ -0,0 +1,68 @@
+Description: This patch fixes a few spelling mistakes in error output messages
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+
+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 @@
+ break;
+
+ default:
+- error("Unkown command: 0x%02x 0x%02x\n", command, payload);
++ error("Unknown command: 0x%02x 0x%02x\n", command, payload);
+ }
+ break;
+
+@@ -381,7 +381,7 @@
+ break;
+
+ default:
+- error("Unkown command: 0x%02x 0x%02x\n", command, payload);
++ error("Unknown command: 0x%02x 0x%02x\n", command, payload);
+ }
+ }
+
+@@ -854,21 +854,21 @@
+ {
+ if (this->device == "1k") return 12;
+ if (this->device == "8k") return 32;
+- panic("Unkown chip type '%s'.\n", this->device.c_str());
++ panic("Unknown chip type '%s'.\n", this->device.c_str());
+ }
+
+ int FpgaConfig::chip_height() const
+ {
+ if (this->device == "1k") return 16;
+ if (this->device == "8k") return 32;
+- panic("Unkown chip type '%s'.\n", this->device.c_str());
++ panic("Unknown chip type '%s'.\n", this->device.c_str());
+ }
+
+ vector<int> FpgaConfig::chip_cols() const
+ {
+ if (this->device == "1k") return vector<int>({18, 54, 54, 42, 54, 54, 54});
+ if (this->device == "8k") return vector<int>({18, 54, 54, 54, 54, 54, 54, 54, 42, 54, 54, 54, 54, 54, 54, 54, 54});
+- panic("Unkown chip type '%s'.\n", this->device.c_str());
++ panic("Unknown chip type '%s'.\n", this->device.c_str());
+ }
+
+ string FpgaConfig::tile_type(int x, int y) const
+@@ -886,7 +886,7 @@
+ return "logic";
+ }
+
+- panic("Unkown chip type '%s'.\n", this->device.c_str());
++ panic("Unknown chip type '%s'.\n", this->device.c_str());
+ }
+
+ int FpgaConfig::tile_width(const string &type) const
+@@ -896,7 +896,7 @@
+ if (type == "ramb") return 42;
+ if (type == "ramt") return 42;
+ if (type == "io") return 18;
+- panic("Unkown tile type '%s'.\n", type.c_str());
++ panic("Unknown tile type '%s'.\n", type.c_str());
+ }
+
+ void FpgaConfig::cram_clear()
diff --git a/debian/patches/03_cxxflags.patch b/debian/patches/03_cxxflags.patch
new file mode 100644
index 0000000..86e0c53
--- /dev/null
+++ b/debian/patches/03_cxxflags.patch
@@ -0,0 +1,36 @@
+Description: This makes sure that the CXXFLAGS given by the
+ Debian build system are not overwritten, but prepended.
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+
+--- icestorm-0~20151006git103e6fd.orig/icemulti/Makefile
++++ icestorm-0~20151006git103e6fd/icemulti/Makefile
+@@ -1,7 +1,7 @@
+ # CXX = clang
+ CXX ?= clang
+ LDLIBS = -lm -lstdc++
+-CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
++CXXFLAGS += -MD -O0 -ggdb -Wall -std=c++11
+ CC = $(CXX)
+ DESTDIR = /usr/local
+
+--- icestorm-0~20151006git103e6fd.orig/icepack/Makefile
++++ icestorm-0~20151006git103e6fd/icepack/Makefile
+@@ -1,7 +1,7 @@
+ # CXX = clang
+ CXX ?= clang
+ LDLIBS = -lm -lstdc++
+-CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
++CXXFLAGS += -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
+ CC = $(CXX)
+ DESTDIR = /usr/local
+
+--- icestorm-0~20151006git103e6fd.orig/iceprog/Makefile
++++ icestorm-0~20151006git103e6fd/iceprog/Makefile
+@@ -1,6 +1,6 @@
+ # CC = clang
+ LDLIBS = -L/usr/local/lib -lftdi -lm
+-CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
++CFLAGS += -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
+ DESTDIR = /usr/local
+
+ all: iceprog
diff --git a/debian/patches/series b/debian/patches/series
index 0b5dce9..60ec8e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
01_installpath.patch
+02_spelling_fixes.patch
+03_cxxflags.patch
diff --git a/debian/rules b/debian/rules
index ba7cb15..44757b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
CHANGELOG_DATE ?= $(shell date -d "`dpkg-parsechangelog --show-field Date`" +"%d %B %Y")
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..4764922
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/cliffordwolf/icestorm/releases /cliffordwolf/icestorm/archive/\w+-(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/icestorm.git
More information about the debian-science-commits
mailing list