[DRE-commits] [SCM] ruby-creole.git branch, master, updated. upstream/0.4.2-2-g9fc1d60

[Eugene Lavnikevich]

The following commit has been merged in the master branch:
commit 9fc1d60f3ad885b0f9666710cc9a3ad02cdd9f8c
Author: Eugene Lavnikevich <e.lavnikevich at sam-solutions.net>
Date:   Wed Jul 11 18:37:05 2012 +0300

    Build-info updated

diff --git a/debian/control b/debian/control
index 8bd0f83..e7d1c6e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,19 @@ Source: ruby-creole
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders:  <>
+Uploaders: Eugene Lavnikevich <e.lavnikevich at sam-solutions.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-bacon
 Standards-Version: 3.9.3
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-creole.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-creole.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-creole.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-creole.git;a=summary
 Homepage: http://github.com/minad/creole
 XS-Ruby-Versions: all
 
 Package: ruby-creole
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# bacon (>= 0, development)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-bacon
 Description: Lightweight markup language
- Creole is a lightweight markup language (http://wikicreole.org/).
+ Creole is a common wiki markup language to be used across different wikis
+ (http://wikicreole.org/).
diff --git a/debian/copyright b/debian/copyright
index df881a0..6f32f23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,85 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: creole
-Source: FIXME <http://example.com/>
+Source: http://github.com/minad/creole
 
 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.
- .
- 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'.
+Copyright: Copyright (c) 2008 Lars Christensen
+License: Ruby
+ Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see the file GPL), or the conditions below:
+ .
+   1. You may make and give away verbatim copies of the source form of the
+      software without restriction, provided that you duplicate all of the
+      original copyright notices and associated disclaimers.
+ .
+   2. You may modify your copy of the software in any way, provided that
+      you do at least ONE of the following:
+ .
+        a) place your modifications in the Public Domain or otherwise
+           make them Freely Available, such as by posting said
+           modifications to Usenet or an equivalent medium, or by allowing
+           the author to include your modifications in the software.
+ . 
+        b) use the modified software only within your corporation or
+           organization.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or binary form,
+      provided that you do at least ONE of the following:
+ .
+        a) distribute the binaries and library files of the software,
+           together with instructions (in the manual page or equivalent)
+           on where to get the original distribution.
+ .
+        b) accompany the distribution with the machine-readable source of
+           the software.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   4. You may modify and include the part of the software into any other
+      software (possibly commercial).  But some files in the distribution
+      are not written by the author, so that they are not under these terms.
+ .
+      For the list of those files and their copying conditions, see the
+      file LEGAL.
+ .
+   5. The scripts and library files supplied as input to or produced as 
+      output from the software do not automatically fall under the
+      copyright of the software, but belong to whomever generated them, 
+      and may be sold commercially, and may be aggregated with this
+      software.
+ .
+   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      PURPOSE.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: 2012  <>
-License:
- [LICENSE TEXT]
+Copyright: Copyright 2012 Eugene Lavnikevich <e.lavnikevich at sam-solutions.net>
+License: GPL-2+
+ This package 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.
+ .
+ This package 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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
ruby-creole.git