diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-21 11:27:26 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-21 11:27:26 -0800 |
| commit | 4ad4f66327ae21527035eb577d79a449296e37f8 (patch) | |
| tree | f002ff143a226b6eb9662d70228d1efe88d923e1 | |
| parent | e6389c32290dd05db5e50636b917125903f859cf (diff) | |
| parent | 555d1cd02f1089b50ffe04d73cb452d6b490bd03 (diff) | |
Merge pull request #652 from TheBlueMatt/master
Update contrib/debian/ for 0.5.0 release and fix copyright file.
| -rw-r--r-- | contrib/debian/changelog | 12 | ||||
| -rw-r--r-- | contrib/debian/copyright | 21 |
2 files changed, 13 insertions, 20 deletions
diff --git a/contrib/debian/changelog b/contrib/debian/changelog index ccde9776d8..6355141036 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -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. diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 166bab6da3..5db418df3a 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -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, @@ -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. |