[DRE-commits] [SCM] ruby-locale-rails.git branch, master, updated. upstream/2.0.5-4-gec6ba79
Gunnar Wolf
gwolf at gwolf.org
Fri Sep 2 10:41:19 UTC 2011
The following commit has been merged in the master branch:
commit 47771340519f59e564eaa8c622f50f8cf130ab95
Author: Gunnar Wolf <gwolf at gwolf.org>
Date: Fri Sep 2 05:30:15 2011 -0500
Added in the pre-gem2deb packaging information)
diff --git a/debian/changelog b/debian/changelog
index 006dc81..03540cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,26 @@
-ruby-locale-rails (2.0.5-1) UNRELEASED; urgency=low
+ruby-locale-rails (2.0.5-4) unstable; urgency=low
- * Initial release (Closes: #nnnn)
+ * Repackaged using the gem2deb infrastructure
-- Gunnar Wolf <gwolf at debian.org> Fri, 02 Sep 2011 05:17:56 -0500
+
+liblocale-rails-ruby (2.0.5-3) unstable; urgency=low
+
+ * Fully qualify module calls to avoid name clash with I18N class
+ (Closes: #588757)
+ * Standards-version 3.8.4→3.9.1.0 (no changes needed)
+
+ -- Gunnar Wolf <gwolf at debian.org> Sun, 12 Sep 2010 22:06:42 -0500
+
+liblocale-rails-ruby (2.0.5-2) unstable; urgency=low
+
+ * Missed declaring liblocale-rails-ruby dependency on liblocale-rails-
+ ruby1.8 (Closes: #585831)
+
+ -- Gunnar Wolf <gwolf at debian.org> Fri, 18 Jun 2010 10:47:13 -0500
+
+liblocale-rails-ruby (2.0.5-1) unstable; urgency=low
+
+ * Initial upload (Closes: #580694)
+
+ -- Gunnar Wolf <gwolf at debian.org> Sun, 06 Jun 2010 12:52:04 -0500
diff --git a/debian/control b/debian/control
index 690df5b..3cef4d7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,28 @@ Source: ruby-locale-rails
Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: <gwolf at debian.org>
+Uploaders: Gunnar Wolf <gwolf at debian.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~)
Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-locale-rails.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-locale-rails.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-locale-rails.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-locale-rails.git;a=summary
Homepage: http://locale.rubyforge.org/
XS-Ruby-Versions: all
Package: ruby-locale-rails
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# locale (>= 2.0.5)
-Description: Ruby-Locale for Ruby on Rails is the pure ruby library which provides basic functions for localization based on Ruby-Locale.
- Ruby-Locale for Ruby on Rails is the pure ruby library which provides basic functions for localization.
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-locale (>= 2.0.5) | liblocale-ruby (>= 2.0.5)
+Description: Pure ruby library with basic functions for Rails localization
+ This library supports Rails i18n, and has the following features:
+ .
+ * Auto-Detect the client locale
+ * Detect candidate locales from supported locales by the application.
+ * Localized Routes
+ * Localized Action/Fragment cache
+ * Localized view template files
+ * I18n.t fallback to localized message candidates.
+ .
+ Applications can use this library with your preferred i18n backends
+ which don't have above features.
diff --git a/debian/copyright b/debian/copyright
index 9129780..e476edc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,136 @@
-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: locale-rails
-Source: FIXME (URL where source can be downloaded)
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Upstream-Name: locale_rails
+Upstream-Maintainer: Masao Mutoh
+Upstream-Source: http://rubygems.org/gems/locale_rails
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: Copyright (c) 2008-2009 Masao Mutoh <mutoh at sowhate.com>
+License: Ruby+GPL2+LGPL3
+
+Files: sample/public/javascripts/controls.js
+Copyright: (c) 2005-2008 Thomas Fuchs, (c) 2005-2007 Ivan Krstic, (c) 2005-2007 Jon Tirsen
+License: MIT-scriptaculous
+
+Files: sample/public/javascripts/dragdrop.js, test/public/javascripts/dragdrop.js
+Copyright: (c) 2005-2008 Thomas Fuchs, (c) 2005-2007 Sammi Williams
+License: MIT-scriptaculous
+
+Files: sample/public/javascripts/effects.js, test/public/javascripts/effects.js
+Copyright: (c) 2005-2008 Thomas Fuchs; Contributors: Justin Palmer, Mark Pilgrim, Martin Bialasinki
+License: MIT-scriptaculous
+
+Files: sample/public/javascripts/prototype.js, test/public/javascripts/prototype.js
+Copyright: (c) 2005-2008 Sam Stephenson
+License: MIT-prototype
Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
+Copyright: Copyright (c) 2010, Gunnar Wolf <gwolf at debian.org>
+License: GPL2
+
+License: GPL2
+ This program is licensed under the GPL (General Public License:
+ http://www.gnu.org/licenses/gpl-2.0.txt).
+ A copy of the GPL 2.0 can be found at /usr/share/common-licenses/GPL-2
+ on any Debian system.
+
+License: LGPL3
+ This program is licensed under the LGPL (Lesser General Public License:
+ http://www.gnu.org/licenses/lgpl-3.0.txt
+ .
+ A copy of the LGPL 3.0 can be found at /usr/share/common-licenses/LGPL-3
+ on any Debian system.
+
+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
+ version 2 (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.
+
+
+License: MIT-scriptaculous
+ 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.
+
+License: MIT-prototype
+ 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 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.
diff --git a/debian/patches/fully_qualify_i18n_locale b/debian/patches/fully_qualify_i18n_locale
new file mode 100644
index 0000000..6cc6106
--- /dev/null
+++ b/debian/patches/fully_qualify_i18n_locale
@@ -0,0 +1,65 @@
+Author: "Marc Dequènes (Duck)" <duck at duckcorp.org>
+Origin: other
+Bug-Debian: 588757
+Forwarded: No
+Reviewed-by: Gunnar Wolf <gwolf at debian.org>
+Description: Fully qualify calls to Locale in order to avoid name clashes with I18N
+
+Index: liblocale-rails-ruby-2.0.5/lib/locale_rails/i18n.rb
+===================================================================
+--- liblocale-rails-ruby-2.0.5.orig/lib/locale_rails/i18n.rb 2010-09-12 21:55:11.000000000 -0500
++++ liblocale-rails-ruby-2.0.5/lib/locale_rails/i18n.rb 2010-09-12 21:55:20.000000000 -0500
+@@ -13,35 +13,35 @@
+
+ # Gets the supported locales.
+ def supported_locales
+- Locale.app_language_tags
++ ::Locale.app_language_tags
+ end
+
+ # Sets the supported locales.
+ # I18n.set_supported_locales("ja-JP", "ko-KR", ...)
+ def set_supported_locales(*tags)
+- Locale.set_app_language_tags(*tags)
++ ::Locale.set_app_language_tags(*tags)
+ end
+
+ # Sets the supported locales as an Array.
+ # I18n.supported_locales = ["ja-JP", "ko-KR", ...]
+ def supported_locales=(tags)
+- Locale.set_app_language_tags(*tags)
++ ::Locale.set_app_language_tags(*tags)
+ end
+
+ # Sets the locale.
+ # I18n.locale = "ja-JP"
+ def locale=(tag)
+- Locale.clear
+- tag = Locale::Tag::Rfc.parse(tag.to_s) if tag.kind_of? Symbol
+- Locale.current = tag
+- Thread.current[:locale] = Locale.candidates(:type => :rfc)[0]
++ ::Locale.clear
++ tag = ::Locale::Tag::Rfc.parse(tag.to_s) if tag.kind_of? Symbol
++ ::Locale.current = tag
++ Thread.current[:locale] = ::Locale.candidates(:type => :rfc)[0]
+ end
+
+ # Sets the default locale.
+ # I18n.default_locale = "ja"
+ def default_locale=(tag)
+- tag = Locale::Tag::Rfc.parse(tag.to_s) if tag.kind_of? Symbol
+- Locale.default = tag
++ tag = ::Locale::Tag::Rfc.parse(tag.to_s) if tag.kind_of? Symbol
++ ::Locale.default = tag
+ @@default_locale = tag
+ end
+
+@@ -50,7 +50,7 @@
+ # MissingTranslationData is overrided to fallback messages in candidate locales.
+ def locale_rails_exception_handler(exception, locale, key, options) #:nodoc:
+ ret = nil
+- Locale.candidates(:type => :rfc).each do |loc|
++ ::Locale.candidates(:type => :rfc).each do |loc|
+ begin
+ ret = backend.translate(loc, key, options)
+ break
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cfc760e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fully_qualify_i18n_locale
diff --git a/debian/ruby-locale-rails.docs b/debian/ruby-locale-rails.docs
index 0d5eab8..e475c53 100644
--- a/debian/ruby-locale-rails.docs
+++ b/debian/ruby-locale-rails.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.rdoc
+README.rdoc
diff --git a/debian/ruby-locale-rails.examples b/debian/ruby-locale-rails.examples
index 19ae3fc..640e65f 100644
--- a/debian/ruby-locale-rails.examples
+++ b/debian/ruby-locale-rails.examples
@@ -1,3 +1 @@
-# FIXME: sample/ dir found in source. Consider installing the examples.
-# Examples:
-# sample/*
+sample/*
--
ruby-locale-rails.git
More information about the Pkg-ruby-extras-commits
mailing list