[Pkg-bitcoin-commits] [cgminer] 05/05: Added hashratio support; BD on zlib1g-dev; D-S-V = 3.9.6, no changes; some debugging to look into bug 757381 (show help2man output in buildlogs)
Scott Sheridan Howard
showard at moszumanska.debian.org
Sun Oct 12 15:28:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
showard pushed a commit to branch master
in repository cgminer.
commit cf224da60983a76be6de934e6bdde298d69f54b9
Author: Scott Howard <showard314 at gmail.com>
Date: Sun Oct 12 11:28:36 2014 -0400
Added hashratio support; BD on zlib1g-dev; D-S-V = 3.9.6, no changes; some debugging to look into bug 757381 (show help2man output in buildlogs)
---
API.class | Bin 3772 -> 0 bytes
debian/changelog | 5 ++++
debian/control | 3 +-
debian/copyright | 86 ++++---------------------------------------------------
debian/rules | 2 ++
5 files changed, 14 insertions(+), 82 deletions(-)
diff --git a/API.class b/API.class
deleted file mode 100644
index 0fdf734..0000000
Binary files a/API.class and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index 9e5863f..f34cd45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ cgminer (4.6.1-1) unstable; urgency=medium
* New upstream release
* updated debian/copyright
+ * Added hashratio support
+ * BD on zlib1g-dev
+ * D-S-V = 3.9.6, no changes
+ * some debugging to look into bug 757381 (show help2man output in
+ buildlogs)
-- Scott Howard <showard at debian.org> Sun, 12 Oct 2014 10:17:16 -0400
diff --git a/debian/control b/debian/control
index 235d235..46393b0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 9), dh-autoreconf
,libudev-dev [!kfreebsd-any]
,pkg-config
,help2man
-Standards-Version: 3.9.5
+ ,zlib1g-dev
+Standards-Version: 3.9.6
Homepage: https://github.com/ckolivas/cgminer
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bitcoin/cgminer.git
Vcs-Git: git://anonscm.debian.org/pkg-bitcoin/cgminer.git
diff --git a/debian/copyright b/debian/copyright
index dcdfcd4..ddf097e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: cgminer
Source: https://github.com/ckolivas/cgminer
-Files: debian/*
-Copyright: 2012-2013 Dmitry Smirnov <onlyjob at debian.org>
-License: GPL-3+
-
Files: *
Copyright: 2011-2013 Andrew Smith
2013 Avalon project
@@ -25,32 +21,15 @@ Comment:
This section also covers files with GPL-2+ headers as released
under GPL-3+ license as part of this software.
+Files: debian/*
+Copyright: 2012-2013 Dmitry Smirnov <onlyjob at debian.org>
+ 2013-2014 Scott Howard <showard at debian.org>
+License: GPL-3+
+
Files: api-example.rb
Copyright: 2014, James Hilliard
License: GPL-3+
-Files: driver-ztex.c
- libztex.c
- libztex.h
-Copyright: 2012 Luke Dashjr
- 2009-2011 ZTEX GmbH
- 2012 Xiangfu <xiangfu at openmobilefree.com>
- 2012 <nelisky.btc at gmail.com>
- 2012 Peter Stuge <peter at stuge.se>
- 2012 Denis Ahrens <denis at h3q.com>
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- ․
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
- ․
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".
-
Files: api.c
driver-bflsc.c
logging.c
@@ -66,32 +45,6 @@ Copyright: 2012-2013, Andrew Smith
2013, Con Kolivas <kernel at kolivas.org>
License: GPL-3+
-Files: uthash.h
-Copyright: 2003-2011 Troy D. Hanson (http://uthash.sourceforge.net)
-License: custom
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- ․
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- ․
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: compat/jansson/*
-Copyright: 2009-2013 Petri Lehtinen <petri at digip.org>
- 2011 Basile Starynkevitch <basile at starynkevitch.net>
-License: Expat
-
Files: compat/libusb-1.0/*
Copyright: 2009-2010, Pete Batard <pbatard at gmail.com>
2001, Johannes Erdfelt <johannes at erdfelt.com>
@@ -129,11 +82,6 @@ License: BSD-3-clause
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-Files: driver-bitfury.c
- driver-bitfury.h
-Copyright: 2013, Con Kolivas
-License: GPL-3+
-
Files: bitforce-firmware-flash.c
fpgautils.h
Copyright: 2012, Luke Dashjr
@@ -327,30 +275,6 @@ Files: api-example.py
Copyright: 2013, Setkeh Mkfr
License: GPL-3+
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- ․
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- ․
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Comment:
- This license also known as "MIT/X11 (BSD like)" or "MIT" however FSF
- consider "MIT" labelling ambiguous and copyright-format specification
- recommend to label such license as "Expat".
-
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/rules b/debian/rules
index 1692ce0..aaddb7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ DRIVERS= --enable-avalon \
--enable-cointerra \
--enable-drillbit \
--enable-hashfast \
+ --enable-hashratio \
--enable-icarus \
--enable-klondike \
--enable-minion \
@@ -47,6 +48,7 @@ override_dh_auto_build:
#generates manpage, done during build since each arch has different config flags
MAN_NAME=multi-threaded multi-pool GPU, FPGA and CPU bitcoin miner.
debian/cgminer.1:
+ help2man --no-discard-stderr --no-info --name="$(MAN_NAME)" ./cgminer #for debugging bug #757381
help2man --no-discard-stderr --no-info --name="$(MAN_NAME)" ./cgminer > debian/cgminer.1
perl \
-E 's{\s+(It was generated by help2man)}{ $$1}; # correcting help2man comment' \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git
More information about the Pkg-bitcoin-commits
mailing list