[DRE-commits] [ruby-select2-rails] 04/04: add link to full apache 2 license

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-select2-rails.

commit d51f500854a6ee41e6177e83298e23aac2988eb5
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Nov 2 03:30:31 2015 +0530

    add link to full apache 2 license
---
 debian/copyright | 49 +++++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 7941bcf..8a22012 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,20 +10,33 @@ License: Expat
 Files: vendor/assets/javascripts/select2.js
 Copyright: 2012 Igor Vaynberg
 License: apache-2.0 or GPL-2
- This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
- General Public License version 2 (the "GPL License"). You may choose either license to govern your
- use of this software only upon the condition that you accept all of the terms of either the Apache
- License or the GPL License.
+ This software is licensed under the Apache License, Version 2.0 (the "Apache
+ License") or the GNU General Public License version 2 (the "GPL License"). You
+ may choose either license to govern your use of this software only upon the
+ condition that you accept all of the terms of either the Apache License or the
+ GPL License.
  .
  You may obtain a copy of the Apache License and the GPL License at:
  .
  .    http://www.apache.org/licenses/LICENSE-2.0
  .    http://www.gnu.org/licenses/gpl-2.0.html
  .
- Unless required by applicable law or agreed to in writing, software distributed under the
- Apache License or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for
- the specific language governing permissions and limitations under the Apache License and the GPL License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the Apache License or the GPL License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the Apache License and the GPL License for the specific language
+ governing permissions and limitations under the Apache License and the GPL
+ License.
+ .
+ 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'.
+ .
+ On Debian systems, the full text of the Apache License version 2.0 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.
 
 Files: debian/*
 Copyright: 2015 Praveen Arimbrathodiyil <praveen at debian.org>
@@ -48,23 +61,3 @@ License: Expat
  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: GPL-2
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License version 2 as published by the Free Software Foundation.
- .
- 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.
- .
- 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'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-select2-rails.git