Skip to content
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.

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

Update contrib/debian/ for 0.5.0 release and fix copyright file. #652

Merged
merged 1 commit into from
Nov 21, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update contrib/debian/ for 0.5.0 release and fix copyright file.
  • Loading branch information
Matt Corallo committed Nov 21, 2011
commit 555d1cd02f1089b50ffe04d73cb452d6b490bd03
12 changes: 12 additions & 0 deletions contrib/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
bitcoin (0.5.0-natty0) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Mon, 21 Nov 2011 11:32:00 -0500

bitcoin (0.5.0~rc7-natty0) natty; urgency=low

* New upstream release candidate.

-- Matt Corallo <matt@bluematt.me> Sun, 20 Nov 2011 17:08:00 -0500

bitcoin (0.5.0~rc3-natty0) natty; urgency=low

* New upstream release candidate.
Expand Down
21 changes: 1 addition & 20 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ License: GPL-3+
Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
src/qt/res/src/*.svg
Copyright: Wladimir van der Laan
License: MIT
License: Expat

Files: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
src/qt/res/icons/history.png, src/qt/res/icons/key.png,
Expand Down Expand Up @@ -163,24 +163,5 @@ Comment:
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

License: MIT
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.

License: PUB-DOM
This work is in the public domain.