Skip to content

Commit b194872

Browse files
fanquakelaanwj
authored andcommitted
Remove old manpages from contrib/debian
1 parent a82e5d8 commit b194872

File tree

11 files changed

+9
-100
lines changed

11 files changed

+9
-100
lines changed

contrib/debian/bitcoin-qt.manpages

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc/man/bitcoin-qt.1

contrib/debian/bitcoin-tx.manpages

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc/man/bitcoin-tx.1

contrib/debian/bitcoind.manpages

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
debian/manpages/bitcoind.1
2-
debian/manpages/bitcoin.conf.5
3-
debian/manpages/bitcoin-cli.1
1+
doc/man/bitcoind.1
2+
doc/man/bitcoin-cli.1

contrib/debian/copyright

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ Copyright: 2010-2011, Jonas Smedegaard <[email protected]>
1515
2011, Matt Corallo <[email protected]>
1616
License: GPL-2+
1717

18-
Files: debian/manpages/*
19-
Copyright: Micah Anderson <[email protected]>
20-
License: GPL-3+
21-
2218
Files: src/qt/res/icons/add.png
2319
src/qt/res/icons/address-book.png
2420
src/qt/res/icons/chevron.png

contrib/debian/manpages/bitcoin-cli.1

Lines changed: 0 additions & 21 deletions
This file was deleted.

contrib/debian/manpages/bitcoin-qt.1

Lines changed: 0 additions & 13 deletions
This file was deleted.

contrib/debian/manpages/bitcoin.conf.5

Lines changed: 0 additions & 19 deletions
This file was deleted.

contrib/debian/manpages/bitcoind.1

Lines changed: 0 additions & 30 deletions
This file was deleted.

contrib/debian/rules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
#build/bitcoind::
66
# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_bitcoin)
77

8-
DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/*
9-
DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
10-
118
%:
129
dh --with bash-completion $@
1310

contrib/rpm/bitcoin.spec

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ Source1: http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz
2727
Source10: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/examples/bitcoin.conf
2828

2929
#man pages
30-
Source20: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoind.1
31-
Source21: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin-cli.1
32-
Source22: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin-qt.1
33-
Source23: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/debian/manpages/bitcoin.conf.5
30+
Source20: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoind.1
31+
Source21: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-cli.1
32+
Source22: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/doc/man/bitcoin-qt.1
3433

3534
#selinux
3635
Source30: https://raw.githubusercontent.com/bitcoin/bitcoin/v%{version}/contrib/rpm/bitcoin.te
@@ -306,7 +305,6 @@ install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/bitcoin-cli.1
306305
%if %{_buildqt}
307306
install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/bitcoin-qt.1
308307
%endif
309-
install -D -p %{SOURCE23} %{buildroot}%{_mandir}/man5/bitcoin.conf.5
310308

311309
# nuke these, we do extensive testing of binaries in %%check before packaging
312310
rm -f %{buildroot}%{_bindir}/test_*
@@ -415,7 +413,6 @@ rm -rf %{buildroot}
415413
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/bitcoin
416414
%attr(0644,root,root) %{_datadir}/selinux/*/*.pp
417415
%attr(0644,root,root) %{_mandir}/man1/bitcoind.1*
418-
%attr(0644,root,root) %{_mandir}/man5/bitcoin.conf.5*
419416

420417
%files utils
421418
%defattr(-,root,root,-)
@@ -425,7 +422,6 @@ rm -rf %{buildroot}
425422
%attr(0755,root,root) %{_bindir}/bitcoin-tx
426423
%attr(0755,root,root) %{_bindir}/bench_bitcoin
427424
%attr(0644,root,root) %{_mandir}/man1/bitcoin-cli.1*
428-
%attr(0644,root,root) %{_mandir}/man5/bitcoin.conf.5*
429425

430426

431427

0 commit comments

Comments
 (0)