[DRE-commits] [ruby-select2-rails] 03/04: fix duplicate 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 5132d32ef48186ee2684847e737d467a6c232340
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Nov 2 03:25:06 2015 +0530

    fix duplicate license
---
 debian/copyright | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c675d62..7941bcf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,20 @@ 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.
+ .
+ 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.
 
 Files: debian/*
 Copyright: 2015 Praveen Arimbrathodiyil <praveen at debian.org>
@@ -35,22 +49,6 @@ License: Expat
  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: 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.
- .
- 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.
-
 License: GPL-2
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

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