[DRE-commits] [berkshelf-api] 06/15: Fix desription and copyright

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository berkshelf-api.

commit 167d8f93626bc44f4ff84e27f617aeeb1d7a3fd3
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Wed Aug 19 19:19:00 2015 +0300

    Fix desription and copyright
---
 debian/control   | 11 +++++++++--
 debian/copyright | 40 +++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index 29e08a0..9f68ab4 100644
--- a/debian/control
+++ b/debian/control
@@ -45,5 +45,12 @@ Depends: ruby | ruby-interpreter,
          ruby-semverse (>= 1.0),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: A server which indexes cookbooks from various sources and hosts it over a REST API
- Berkshelf dependency API server
+Description: berkshelf dependency API server
+ A server which indexes cookbooks from various sources and hosts it over a
+ REST API.
+ .
+ Berkshelf-api supports the next endpoints:
+   * Chef server
+   * A local directory containing cookbooks
+   * GitHub Organization (not recommended)
+   * Community and private suppermarket servers (optional)
diff --git a/debian/copyright b/debian/copyright
index efd33cf..992b791 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,29 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: berkshelf-api
-Source: FIXME <http://example.com/>
+Source: http://berkshelf.com/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2012-2015 Jamie Winsor <jamie at vialstudios.com>
+           2012-2013 Andrew Garson <agarson at riotgames.com>
+License: Apache-2.0
 
 Files: debian/*
 Copyright: 2015 Hleb Valoshka <375gnu at gmail.com>
-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'.

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