Skip to content

contrib: Remove debian and rpm subfolder #13809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
maflcko merged 1 commit into from
Jul 31, 2018
Merged

contrib: Remove debian and rpm subfolder #13809

maflcko merged 1 commit into from
Jul 31, 2018

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Jul 30, 2018 •
edited
Loading

@maflcko maflcko force-pushed the Mf1808-debianContrib branch from fadc03f to faa3656 Compare July 30, 2018 17:45
@maflcko maflcko changed the title contrib: Remove debian subfolder contrib: Remove debian and rpm subfolder Jul 30, 2018
@maflcko maflcko force-pushed the Mf1808-debianContrib branch from faa3656 to fa0e1e2 Compare July 30, 2018 18:01
@maflcko maflcko mentioned this pull request Jul 30, 2018
Closed
2 tasks
@practicalswift
Copy link
Contributor

practicalswift commented Jul 30, 2018 •
edited
Loading

utACK fa0e1e2

1654 lines (re)moved – very nice!

@kallewoof
Copy link
Contributor

kallewoof commented Jul 30, 2018

utACK fa0e1e2

Small diff for debian dir, but nothing significant.
Diff for rpm dir is clean.

@laanwj
Copy link
Member

laanwj commented Jul 31, 2018 •
edited
Loading

Thanks for picking this up, utACK fa0e1e2

Edit: huh that was strange, looked like github lost my comment at first

@fanquake
Copy link
Member

fanquake commented Jul 31, 2018 •
edited
Loading

utACK fa0e1e2

Only nit could be to drop:

Files: debian/*
Copyright: 2010-2011, Jonas Smedegaard <[email protected]>
           2011, Matt Corallo <[email protected]>
License: GPL-2+

from contrib/debian/copyright, as copyright is now the only file in debian/*.

Edit: @MarcoFalke What do you mean by:

Note that I kept the copyright file, so that it can be updated for our purposes in the commit that adds new files.

If we are copying the files from /packaging/ back in here pre-release then the above nit is redundant.

@maflcko
Copy link
Member Author

maflcko commented Jul 31, 2018

@BugTheBlueMatt

@TheBlueMatt
Copy link
Contributor

TheBlueMatt commented Jul 31, 2018

Currently people tend to be pretty good about updating contrib/debian/copyright when things change, which is super nice cause I won't ever keep track of it. It may make sense to move it from contrib/debian/copyright to contrib/copyright or something like that.

@maflcko
Copy link
Member Author

maflcko commented Jul 31, 2018

It is still in the debian format, so I think it makes sense to keep in the debian folder. (Also I don't feel like updating all the internal and external links to the file)

@maflcko
Copy link
Member Author

maflcko commented Jul 31, 2018

If anyone feels strongly about that, it should be done in a separate commit to not invalidate the previous review.

@maflcko maflcko merged commit fa0e1e2 into bitcoin:master Jul 31, 2018
maflcko pushed a commit that referenced this pull request Jul 31, 2018
Merge #13809: contrib: Remove debian and rpm subfolder
77168f7 
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
@maflcko maflcko deleted the Mf1808-debianContrib branch July 31, 2018 15:58
@Bushstar Bushstar mentioned this pull request Aug 13, 2018
Merged
@luke-jr luke-jr mentioned this pull request Dec 31, 2018
Closed
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jul 6, 2021
@UdjinM6
Merge bitcoin#13809: contrib: Remove debian and rpm subfolder
03d01ca 
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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Scripts and tools

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@maflcko @practicalswift @kallewoof @laanwj @fanquake @TheBlueMatt