[DRE-commits] [SCM] ruby-echoe.git branch, master, updated. upstream/4.5.6-3-g3979939
Clint Byrum
clint at ubuntu.com
Fri May 20 00:10:25 UTC 2011
The following commit has been merged in the master branch:
commit 9c32a67599b6cd64939b3654fa6def8fa5ca1b09
Author: Clint Byrum <clint at ubuntu.com>
Date: Thu May 19 16:57:32 2011 -0700
Initial release (Closes: #627360)
diff --git a/debian/changelog b/debian/changelog
index 5ea6960..aec6ea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
ruby-echoe (4.5.6-1) UNRELEASED; urgency=low
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #627360)
- -- Clint Byrum <clint at ubuntu.com> Thu, 19 May 2011 15:54:18 -0700
+ -- Clint Byrum <clint at ubuntu.com> Thu, 19 May 2011 16:43:30 -0700
diff --git a/debian/control b/debian/control
index b474ddb..829cc43 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,21 @@ Source: ruby-echoe
Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: <clint at ubuntu.com>
+Uploaders: Clint Byrum <clint at ubuntu.com>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.2)
Standards-Version: 3.9.1
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-echoe.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-echoe.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-echoe.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-echoe.git;a=summary
Homepage: http://fauna.github.com/fauna/echoe/
XS-Ruby-Versions: all
Package: ruby-echoe
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-# gemcutter (>= 0, runtime), rubyforge (>= 0, runtime), allison (>= 0, runtime)
-Description: A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.
- A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter,
+ ruby-rubyforge,
+ rubygems (>= 1.3.6)
+Description: A Rubygems packaging tool that provides common Rake tasks
+ A Rubygems packaging tool that provides Rake tasks for documentation,
+ extension compiling, testing, and deployment.
diff --git a/debian/copyright b/debian/copyright
index 6fa44ea..5d6cc35 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,217 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
-Upstream-Name: echoe
-Source: FIXME (URL where source can be downloaded)
+Format: http://dep.debian.net/deps/dep5/
+Source: http://fauna.github.com/fauna/echoe/files/README.html
Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-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 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: 2007-2011 Cloudburst, LLC.
+License: AFL-3.0
+ Academic Free License (AFL) v. 3.0
+ .
+ This Academic Free License (the "License") applies to any original work
+ of authorship (the "Original Work") whose owner (the "Licensor") has
+ placed the following licensing notice adjacent to the copyright notice
+ for the Original Work:
+ .
+ Licensed under the Academic Free License version 3.0
+ .
+ 1) Grant of Copyright License. Licensor grants You a worldwide,
+ royalty-free, non-exclusive, sublicensable license, for the duration of
+ the copyright, to do the following:
+ .
+ a) to reproduce the Original Work in copies, either alone or as part of
+ a collective work;
+ .
+ b) to translate, adapt, alter, transform, modify, or arrange the
+ Original Work, thereby creating derivative works ("Derivative Works")
+ based upon the Original Work;
+ .
+ c) to distribute or communicate copies of the Original Work and
+ Derivative Works to the public, under any license of your choice that
+ does not contradict the terms and conditions, including Licensor's
+ reserved rights and remedies, in this Academic Free License;
+ .
+ d) to perform the Original Work publicly; and
+ .
+ e) to display the Original Work publicly.
+ .
+ 2) Grant of Patent License. Licensor grants You a worldwide,
+ royalty-free, non-exclusive, sublicensable license, under patent claims
+ owned or controlled by the Licensor that are embodied in the Original
+ Work as furnished by the Licensor, for the duration of the patents, to
+ make, use, sell, offer for sale, have made, and import the Original Work
+ and Derivative Works.
+ .
+ 3) Grant of Source Code License. The term "Source Code" means the
+ preferred form of the Original Work for making modifications to it and
+ all available documentation describing how to modify the Original Work.
+ Licensor agrees to provide a machine-readable copy of the Source Code of
+ the Original Work along with each copy of the Original Work that
+ Licensor distributes. Licensor reserves the right to satisfy this
+ obligation by placing a machine-readable copy of the Source Code in an
+ information repository reasonably calculated to permit inexpensive and
+ convenient access by You for as long as Licensor continues to distribute
+ the Original Work.
+ .
+ 4) Exclusions From License Grant. Neither the names of Licensor, nor the
+ names of any contributors to the Original Work, nor any of their
+ trademarks or service marks, may be used to endorse or promote products
+ derived from this Original Work without express prior permission of the
+ Licensor. Except as expressly stated herein, nothing in this License
+ grants any license to Licensor's trademarks, copyrights, patents, trade
+ secrets or any other intellectual property. No patent license is granted
+ to make, use, sell, offer for sale, have made, or import embodiments of
+ any patent claims other than the licensed claims defined in Section 2.
+ No license is granted to the trademarks of Licensor even if such marks
+ are included in the Original Work. Nothing in this License shall be
+ interpreted to prohibit Licensor from licensing under terms different
+ from this License any Original Work that Licensor otherwise would have a
+ right to license.
+ .
+ 5) External Deployment. The term "External Deployment" means the use,
+ distribution, or communication of the Original Work or Derivative Works
+ in any way such that the Original Work or Derivative Works may be used
+ by anyone other than You, whether those works are distributed or
+ communicated to those persons or made available as an application
+ intended for use over a network. As an express condition for the grants
+ of license hereunder, You must treat any External Deployment by You of
+ the Original Work or a Derivative Work as a distribution under section
+ 1(c).
+ .
+ 6) Attribution Rights. You must retain, in the Source Code of any
+ Derivative Works that You create, all copyright, patent, or trademark
+ notices from the Source Code of the Original Work, as well as any
+ notices of licensing and any descriptive text identified therein as an
+ "Attribution Notice." You must cause the Source Code for any Derivative
+ Works that You create to carry a prominent Attribution Notice reasonably
+ calculated to inform recipients that You have modified the Original
+ Work.
+ .
+ 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants
+ that the copyright in and to the Original Work and the patent rights
+ granted herein by Licensor are owned by the Licensor or are sublicensed
+ to You under the terms of this License with the permission of the
+ contributor(s) of those copyrights and patent rights. Except as
+ expressly stated in the immediately preceding sentence, the Original
+ Work is provided under this License on an "AS IS" BASIS and WITHOUT
+ WARRANTY, either express or implied, including, without limitation, the
+ warranties of non-infringement, merchantability or fitness for a
+ particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL
+ WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential
+ part of this License. No license to the Original Work is granted by this
+ License except under this disclaimer.
+ .
+ 8) Limitation of Liability. Under no circumstances and under no legal
+ theory, whether in tort (including negligence), contract, or otherwise,
+ shall the Licensor be liable to anyone for any indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or the use of the Original Work including,
+ without limitation, damages for loss of goodwill, work stoppage,
+ computer failure or malfunction, or any and all other commercial damages
+ or losses. This limitation of liability shall not apply to the extent
+ applicable law prohibits such limitation.
+ .
+ 9) Acceptance and Termination. If, at any time, You expressly assented
+ to this License, that assent indicates your clear and irrevocable
+ acceptance of this License and all of its terms and conditions. If You
+ distribute or communicate copies of the Original Work or a Derivative
+ Work, You must make a reasonable effort under the circumstances to
+ obtain the express assent of recipients to the terms of this License.
+ This License conditions your rights to undertake the activities listed
+ in Section 1, including your right to create Derivative Works based upon
+ the Original Work, and doing so without honoring these terms and
+ conditions is prohibited by copyright law and international treaty.
+ Nothing in this License is intended to affect copyright exceptions and
+ limitations (including "fair use" or "fair dealing"). This License shall
+ terminate immediately and You may no longer exercise any of the rights
+ granted to You by this License upon your failure to honor the conditions
+ in Section 1(c).
+ .
+ 10) Termination for Patent Action. This License shall terminate
+ automatically and You may no longer exercise any of the rights granted
+ to You by this License as of the date You commence an action, including
+ a cross-claim or counterclaim, against Licensor or any licensee alleging
+ that the Original Work infringes a patent. This termination provision
+ shall not apply for an action alleging patent infringement by
+ combinations of the Original Work with other software or hardware.
+ .
+ 11) Jurisdiction, Venue and Governing Law. Any action or suit relating
+ to this License may be brought only in the courts of a jurisdiction
+ wherein the Licensor resides or in which Licensor conducts its primary
+ business, and under the laws of that jurisdiction excluding its
+ conflict-of-law provisions. The application of the United Nations
+ Convention on Contracts for the International Sale of Goods is expressly
+ excluded. Any use of the Original Work outside the scope of this License
+ or after its termination shall be subject to the requirements and
+ penalties of copyright or patent law in the appropriate jurisdiction.
+ This section shall survive the termination of this License.
+ .
+ 12) Attorneys' Fees. In any action to enforce the terms of this License
+ or seeking damages relating thereto, the prevailing party shall be
+ entitled to recover its costs and expenses, including, without
+ limitation, reasonable attorneys' fees and costs incurred in connection
+ with such action, including any appeal of such action. This section
+ shall survive the termination of this License.
+ .
+ 13) Miscellaneous. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable.
+ .
+ 14) Definition of "You" in This License. "You" throughout this License,
+ whether in upper or lower case, means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License. For legal entities, "You" includes any entity that controls, is
+ controlled by, or is under common control with you. For purposes of this
+ definition, "control" means (i) the power, direct or indirect, to cause
+ the direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+ .
+ 15) Right to Use. You may use the Original Work in all ways not
+ otherwise restricted or conditioned by this License or by law, and
+ Licensor promises not to interfere with or be responsible for such uses
+ by You.
+ .
+ 16) Modification of This License. This License is Copyright (c) 2005
+ Lawrence Rosen. Permission is granted to copy, distribute, or
+ communicate this License without modification. Nothing in this License
+ permits You to modify this License as applied to the Original Work or to
+ Derivative Works. However, You may modify the text of this License and
+ copy, distribute or communicate your modified version (the "Modified
+ License") and apply it to other original works of authorship subject to
+ the following conditions: (i) You may not indicate in any way that your
+ Modified License is the "Academic Free License" or "AFL" and you may not
+ use those names in the name of your Modified License; (ii) You must
+ replace the notice specified in the first paragraph above with the
+ notice "Licensed under <insert your license name here>" or with a notice
+ of your own that is not confusingly similar to the notice in this
+ License; and (iii) You may not claim that your original works are open
+ source software unless your Modified License has been approved by Open
+ Source Initiative (OSI) and You comply with its license review and
+ certification process.
+
+Files: vendor/rake/*
+Copyright: 2003, 2004 by Jim Weirich (jim at weirichhouse.org)
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ 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.
Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
+Copyright: Canonical Ltd. 2011, All Rights Reserved
+License: AFL-3.0
+Comment: Package and license review done by Clint Byrum <clint at ubuntu.com>
+
diff --git a/debian/patches/depend-on-system-rake.patch b/debian/patches/depend-on-system-rake.patch
new file mode 100644
index 0000000..4aa6048
--- /dev/null
+++ b/debian/patches/depend-on-system-rake.patch
@@ -0,0 +1,18 @@
+From: Clint Byrum <clint at ubuntu.com>
+Description: Removes dependency on embedded rake, uses sytem rake instead
+
+Index: echoe-4.5.6/lib/echoe.rb
+===================================================================
+--- echoe-4.5.6.orig/lib/echoe.rb 2011-04-29 10:15:08.234500466 -0700
++++ echoe-4.5.6/lib/echoe.rb 2011-04-29 10:15:57.681676408 -0700
+@@ -3,8 +3,8 @@
+
+ require 'rake'
+ require 'rake/clean'
+-require "#{$HERE}/../vendor/rake/lib/rake/contrib/compositepublisher"
+-require "#{$HERE}/../vendor/rake/lib/rake/contrib/sshpublisher"
++require "rake/contrib/compositepublisher"
++require "rake/contrib/sshpublisher"
+ require 'rake/gempackagetask'
+ require 'rake/rdoctask'
+ require 'rake/testtask'
diff --git a/debian/patches/remove_require_rubygems.patch b/debian/patches/remove_require_rubygems.patch
new file mode 100644
index 0000000..7dcd50c
--- /dev/null
+++ b/debian/patches/remove_require_rubygems.patch
@@ -0,0 +1,21 @@
+Index: echoe-4.5.6/lib/echoe.rb
+===================================================================
+--- echoe-4.5.6.orig/lib/echoe.rb 2011-04-29 10:53:09.853563105 -0700
++++ echoe-4.5.6/lib/echoe.rb 2011-04-29 10:54:24.729245889 -0700
+@@ -18,7 +18,6 @@
+
+ require "#{$HERE}/echoe/extensions"
+
+-require 'rubygems'
+ require 'rubyforge'
+
+ Echoe.silence { require 'rubygems/specification' }
+@@ -27,7 +26,7 @@
+ begin
+ gem 'gemcutter'
+ require 'rubygems_plugin'
+-rescue Gem::LoadError
++rescue LoadError
+ end
+
+ begin; require 'rcov/rcovtask'; rescue LoadError; end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7185826
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+depend-on-system-rake.patch
+remove_require_rubygems.patch
--
ruby-echoe.git
More information about the Pkg-ruby-extras-commits
mailing list