Skip to content

Commit 77168f7

Browse files
author
MarcoFalke
committed
Merge #13809: contrib: Remove debian and rpm subfolder
fa0e1e2 contrib: Remove debian and rpm subfolders (MarcoFalke) Pull request description: The folders are now located here: * https://github.com/bitcoin-core/packaging/tree/master/debian * https://github.com/bitcoin-core/packaging/tree/master/rpm Note that I kept the copyright file, so that it can be updated for our purposes in the commit that adds new files. Tree-SHA512: 4c919e8e04cdcc56f2c4c16e83c68d5ec74b7e4438ca54222a37f85cf604b77880393d1a0004f16f270ab04ee00b2060129c5c2e0b34815679940f1c3b5754f3
2 parents 8ce55df + fa0e1e2 commit 77168f7

33 files changed

+6
-1660
lines changed

Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
4242
$(top_srcdir)/contrib/bitcoin-tx.bash-completion \
4343
$(top_srcdir)/contrib/bitcoind.bash-completion \
4444
$(top_srcdir)/contrib/init \
45-
$(top_srcdir)/contrib/install_db4.sh \
46-
$(top_srcdir)/contrib/rpm
45+
$(top_srcdir)/contrib/install_db4.sh
4746
DIST_SHARE = \
4847
$(top_srcdir)/share/genbuild.sh \
4948
$(top_srcdir)/share/rpcauth

contrib/README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ Utility to generate the pnSeed[] array that is compiled into the client.
2121
Build Tools and Keys
2222
---------------------
2323

24-
### [Debian](/contrib/debian) ###
25-
Contains files used to package bitcoind/bitcoin-qt
26-
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
24+
### Packaging ###
25+
The [Debian](/contrib/debian) subfolder contains the copyright file.
26+
27+
All other packaging related files can be found in the [bitcoin-core/packaging](https://github.com/bitcoin-core/packaging) repository.
2728

2829
### [Gitian-descriptors](/contrib/gitian-descriptors) ###
2930
Files used during the gitian build process. For more information about gitian, see the [the Bitcoin Core documentation repository](https://github.com/bitcoin-core/docs).
@@ -34,9 +35,6 @@ PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md)
3435
### [MacDeploy](/contrib/macdeploy) ###
3536
Scripts and notes for Mac builds.
3637

37-
### [RPM](/contrib/rpm) ###
38-
RPM spec file for building bitcoin-core on RPM based distributions.
39-
4038
### [Gitian-build](/contrib/gitian-build.py) ###
4139
Script for running full Gitian builds.
4240

contrib/debian/README.md

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

contrib/debian/bitcoin-qt.desktop

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

contrib/debian/bitcoin-qt.install

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

contrib/debian/bitcoin-qt.lintian-overrides

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

contrib/debian/bitcoin-qt.manpages

Lines changed: 0 additions & 1 deletion
This file was deleted.

contrib/debian/bitcoin-qt.protocol

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

contrib/debian/bitcoin-tx.bash-completion

Lines changed: 0 additions & 1 deletion
This file was deleted.

contrib/debian/bitcoin-tx.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)