[Pkg-bitcoin-commits] [cgminer] 04/04: New upstream release
Scott Sheridan Howard
showard at moszumanska.debian.org
Fri Nov 22 04:09:47 UTC 2013
This is an automated email from the git hooks/post-receive script.
showard pushed a commit to branch master
in repository cgminer.
commit eb406332f4cb27ee741c262b353dfc99b41b5419
Author: Scott Howard <showard314 at gmail.com>
Date: Thu Nov 21 23:05:14 2013 -0500
New upstream release
---
.gitignore | 47 +----------------------------------
API.class | Bin 3431 -> 0 bytes
debian/changelog | 6 +++++
debian/docs | 2 --
debian/patches/path_to_cl.patch | 8 +++---
debian/patches/series | 2 +-
debian/patches/system_jansson.patch | 30 ++++++++++++++++++++++
debian/rules | 11 +++++---
8 files changed, 49 insertions(+), 57 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2920e45..845ca06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,46 +1 @@
-cgminer
-cgminer.exe
-minerd
-minerd.exe
-*.o
-*.bin
-
-autom4te.cache
-.deps
-
-Makefile
-Makefile.in
-INSTALL
-aclocal.m4
-configure
-depcomp
-missing
-install-sh
-stamp-h1
-cpuminer-config.h*
-compile
-config.log
-config.status
-config.guess
-config.sub
-
-mingw32-config.cache
-
-*~
-
-ext_deps
-config.h.in
-config.h
-
-ccan/libccan.a
-lib/arg-nonnull.h
-lib/c++defs.h
-lib/libgnu.a
-lib/signal.h
-lib/string.h
-lib/stdint.h
-lib/warn-on-use.h
-
-mkinstalldirs
-
-*.swp
+.pc
diff --git a/API.class b/API.class
deleted file mode 100644
index d506b93..0000000
Binary files a/API.class and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index f158f7b..cf4bbd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cgminer (3.8.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Scott Howard <showard at debian.org> Thu, 21 Nov 2013 21:54:34 -0500
+
cgminer (3.4.2-2) unstable; urgency=low
* Link against -lusb for kfreebsd* archs (Closes: #722568)
diff --git a/debian/docs b/debian/docs
index affb8da..ae08c08 100644
--- a/debian/docs
+++ b/debian/docs
@@ -2,6 +2,4 @@ API-README
AUTHORS
FPGA-README
README
-SCRYPT-README
-GPU-README
ASIC-README
diff --git a/debian/patches/path_to_cl.patch b/debian/patches/path_to_cl.patch
index 32a2a79..3bb4fec 100644
--- a/debian/patches/path_to_cl.patch
+++ b/debian/patches/path_to_cl.patch
@@ -3,11 +3,11 @@ Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Forwarded: not-needed
Description: don't install non-executable files to /usr/bin
-Index: cgminer-3.4.2/configure.ac
+Index: cgminer-3.8.1/configure.ac
===================================================================
---- cgminer-3.4.2.orig/configure.ac 2013-09-10 14:41:07.781861664 -0400
-+++ cgminer-3.4.2/configure.ac 2013-09-10 14:41:07.773861664 -0400
-@@ -400,7 +400,7 @@
+--- cgminer-3.8.1.orig/configure.ac 2013-11-21 22:04:26.120187829 -0500
++++ cgminer-3.8.1/configure.ac 2013-11-21 22:04:26.112187829 -0500
+@@ -390,7 +390,7 @@
prefix=/usr/local
fi
diff --git a/debian/patches/series b/debian/patches/series
index 7a7654a..369865a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-system_libusb.patch
path_to_cl.patch
+system_jansson.patch
diff --git a/debian/patches/system_jansson.patch b/debian/patches/system_jansson.patch
new file mode 100644
index 0000000..a0fa678
--- /dev/null
+++ b/debian/patches/system_jansson.patch
@@ -0,0 +1,30 @@
+Description: Use system jansson
+Author: Scott Howard <showard at debian.org>
+
+Index: cgminer/configure.ac
+===================================================================
+--- cgminer.orig/configure.ac 2013-11-21 22:54:46.104259604 -0500
++++ cgminer/configure.ac 2013-11-21 22:54:46.100259603 -0500
+@@ -308,8 +308,7 @@
+
+ AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
+
+-AC_CONFIG_SUBDIRS([compat/jansson-2.5])
+-JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"
++JANSSON_LIBS="-ljansson"
+
+ PKG_PROG_PKG_CONFIG()
+
+Index: cgminer/compat/Makefile.am
+===================================================================
+--- cgminer.orig/compat/Makefile.am 2013-11-21 22:54:46.104259604 -0500
++++ cgminer/compat/Makefile.am 2013-11-21 22:55:13.460260254 -0500
+@@ -1,8 +1,6 @@
+
+-SUBDIRS = jansson-2.5
+
+ if WANT_USBUTILS
+ if WANT_STATIC_LIBUSB
+-SUBDIRS += libusb-1.0
+ endif
+ endif
diff --git a/debian/rules b/debian/rules
index dbb4597..10b6bd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,13 @@ override_dh_auto_configure:
--enable-scrypt \
--enable-modminer \
--enable-bflsc \
- --disable-silent-rules
+ --enable-bitfury \
+ --enable-hashfast \
+ --disable-silent-rules \
+ --enable-knc \
+ --enable-bab \
+ --enable-klondike \
+ --with-system-libusb
override_dh_auto_build:
dh_auto_build
@@ -32,9 +38,6 @@ override_dh_auto_build:
$(shell dpkg-buildflags --get CPPFLAGS) \
-I /usr/include/libusb-1.0/ -o cgminer-api
-override_dh_auto_install:
- dh_auto_install
- chmod a-x $(CURDIR)/debian/cgminer/*/*/*/*.cl
#generates manpage, we used to do it at build time but now that CPU mining is
#disabled we can generate this prior to upload
--
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