[DRE-commits] [ruby-nokogumbo] 01/03: update copyright, prepare to remove gumbo-parser embedded copy, fill ITP number

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-nokogumbo.

commit 7d4acaff4e9c166f0fa5e65bda45fef21ad872ee
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Jun 16 09:47:13 2015 +0200

    update copyright, prepare to remove gumbo-parser embedded copy, fill ITP number
---
 debian/changelog |  4 ++--
 debian/copyright | 40 ++++++++++++++++++----------------------
 debian/watch     |  1 +
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 191365f..c9d7417 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-nokogumbo (1.4.2-1) UNRELEASED; urgency=medium
+ruby-nokogumbo (1.4.2+ds-1) UNRELEASED; urgency=medium
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #788872)
 
  -- Cédric Boutillier <boutil at debian.org>  Mon, 15 Jun 2015 14:27:07 +0200
diff --git a/debian/copyright b/debian/copyright
index f606c8f..b0b157f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,31 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nokogumbo
 Source: FIXME <http://example.com/>
+Files-Excluded: gumbo-parser
+Comment: gumbo-parser/ contains a convenience copy of the gumbo library,
+ provided by the gumbo-parser source package.
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: Sam Ruby <rubys at intertwingly.net>
+License: Apache-2.0
 
 Files: debian/*
 Copyright: 2015 Cédric Boutillier <boutil at debian.org>
-License: GPL-2+ (FIXME)
+License: Apache-2.0
 Comment: the Debian packaging is licensed under the same terms as the original package.
 
-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.
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- 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.
+     http://www.apache.org/licenses/LICENSE-2.0
  .
- 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
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
  .
- 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'.
diff --git a/debian/watch b/debian/watch
index fdb7e57..0eff34c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=uversionmangle=s/$/+ds/ \
 http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/nokogumbo .*/nokogumbo-(.*).tar.gz

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