[DRE-commits] [SCM] ruby-merb-core.git branch, master, updated. upstream/1.1.3-17-gfa35844

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit afda7cb89ec739a9020fe1f416f306d620b4602d
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Tue May 22 21:13:45 2012 +0200

    Correct copyright file

diff --git a/debian/changelog b/debian/changelog
index f20f12b..07e1303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-merb-core (1.1.3+dfsg-2) UNRELEASED; urgency=low
+
+  * Correct copyright file
+
+ -- Tollef Fog Heen <tfheen at debian.org>  Tue, 22 May 2012 21:13:08 +0200
+
 ruby-merb-core (1.1.3+dfsg-1) unstable; urgency=low
 
   * Update to new-style packaging, split merb-core into its own source
diff --git a/debian/copyright b/debian/copyright
index 5a5a95c..f2408a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,26 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: merb-core
-Source: FIXME <http://example.com/>
+Source: http://github.com/wycats/merb
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+Copyright: Copyright (c) 2008 Engine Yard Inc.
+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:
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/*
-Copyright: 2012  <tfheen at debian.org>
-License:
- [LICENSE TEXT]
+ 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.

-- 
ruby-merb-core.git