[DRE-commits] [SCM] ruby-gettext-activerecord.git branch, master, updated. upstream/2.1.0-2-g132bde9
Gunnar Wolf
gwolf at gwolf.org
Sat Aug 20 13:26:21 UTC 2011
The following commit has been merged in the master branch:
commit 132bde94c0dca32338d8e9c11b9fea04b8f61175
Author: Gunnar Wolf <gwolf at gwolf.org>
Date: Sat Aug 20 08:19:34 2011 -0500
Included the pre-gem2deb packaging info
diff --git a/debian/changelog b/debian/changelog
index f8953b9..a1b0f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,26 @@
-ruby-gettext-activerecord (2.1.0-1) UNRELEASED; urgency=low
+ruby-gettext-activerecord (2.1.0-4) unstable; urgency=low
- * Initial release (Closes: #nnnn)
+ * Repackaged with the gem2deb infrastructure; merged all the binary
+ packages into one (plus dummy transition packages)
-- Gunnar Wolf <gwolf at debian.org> Sat, 20 Aug 2011 07:15:58 -0500
+
+libgettext-activerecord-ruby (2.1.0-3) unstable; urgency=low
+
+ * Added a -common binary package holding the common files for the 1.8
+ and 1.9.1 packages (Closes: #585836)
+
+ -- Gunnar Wolf <gwolf at debian.org> Fri, 18 Jun 2010 10:59:26 -0500
+
+libgettext-activerecord-ruby (2.1.0-2) unstable; urgency=low
+
+ * Added explicit mention to the GPL2, which is mentioned as part of
+ the Ruby license (and I missed :-/ )
+
+ -- Gunnar Wolf <gwolf at debian.org> Sun, 06 Jun 2010 13:20:54 -0500
+
+libgettext-activerecord-ruby (2.1.0-1) unstable; urgency=low
+
+ * Initial upload (Closes: #580701)
+
+ -- Gunnar Wolf <gwolf at debian.org> Sat, 05 Jun 2010 08:25:04 -0500
diff --git a/debian/control b/debian/control
index 45ef2cd..36c1e0b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,59 @@ Source: ruby-gettext-activerecord
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.6~)
Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-gettext-activerecord.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-gettext-activerecord.git;a=summary
-Homepage: http://gettext.rubyforge.org/
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-gettext-activerecord.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-gettext-activerecord.git;a=summary
+Homepage: http://www.yotabanana.com/hiki/ruby-gettext.html
XS-Ruby-Versions: all
Package: ruby-gettext-activerecord
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# gettext (>= 2.1.0), activerecord (>= 2.3.2)
-Description: Localization support for ActiveRecord by Ruby-GetText-Package.
- Localization support for ActiveRecord by Ruby-GetText-Package.
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-gettext (>= 2.1.0) | libgettext-ruby1.8 (>= 2.1.0) | libgettext-ruby1.9.1 (>= 2.1.0), ruby-activerecord (>= 2.3.2) | libactiverecord-ruby1.8 (>= 2.3.2) | libactiverecord-ruby1.9.1 (>= 2.3.2)
+Replaces: libgettext-activerecord-ruby (<< 2.1.0-4~), libgettext-activerecord-ruby1.8 (<< 2.1.0-4~), libgettext-activerecord-ruby1.9.1 (<< 2.1.0-4~), libgettext-activerecord-ruby-common (<< 2.1.0-4~)
+Breaks: libgettext-activerecord-ruby (<< 2.1.0-4~), libgettext-activerecord-ruby1.8 (<< 2.1.0-4~), libgettext-activerecord-ruby1.9.1 (<< 2.1.0-4~), libgettext-activerecord-ruby-common (<< 2.1.0-4~)
+Provides: libgettext-activerecord-ruby, libgettext-activerecord-ruby1.8, libgettext-activerecord-ruby1.9.1, libgettext-activerecord-ruby-common
+Description: GetText localization for Ruby programs using ActiveRecord
+ This package provides the localization for ActiveRecord-2.2 or later
+ using Ruby-GetText-Package. This support consists in:
+ .
+ * Validation messages translation
+ * Model translation
+ * extract messages from models with the rake task.
+
+# Transitional packages
+Package: libgettext-activerecord-ruby
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-gettext-activerecord
+Description: Transitional package for ruby-gettext-activerecord
+ This is a transitional package to ease upgrades to the ruby-gettext-activerecord
+ package. It can safely be removed.
+
+Package: libgettext-activerecord-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-gettext-activerecord
+Description: Transitional package for ruby-gettext-activerecord
+ This is a transitional package to ease upgrades to the ruby-gettext-activerecord
+ package. It can safely be removed.
+
+Package: libgettext-activerecord-ruby1.9.1
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-gettext-activerecord
+Description: Transitional package for ruby-gettext-activerecord
+ This is a transitional package to ease upgrades to the ruby-gettext-activerecord
+ package. It can safely be removed.
+
+Package: libgettext-activerecord-ruby-common
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-gettext-activerecord
+Description: Transitional package for ruby-gettext-activerecord
+ This is a transitional package to ease upgrades to the ruby-gettext-activerecord
+ package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index 5451c9b..2b8f7a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,160 @@
-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: gettext-activerecord
-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: gettext_activerecord
+Upstream-Maintainer: Masao Mutoh
+Upstream-Source: http://www.yotabanana.com/hiki/ruby-gettext.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: Copyright (c) 2001-2009 Masao Mutoh <mutoh at sowhate.com>
+License: Ruby+GPL2+LGPL3
+
+Files: po/bg/gettext_activerecord.po
+Copyright: Copyright (c) Georgi Stoimenov <georgistoimenov at abv.bg>, 2008
+License: Ruby+GPL2+LGPL3
+
+Files: po/ca/gettext_activerecord.po
+Copyright: Copyright (c) Ramon Salvadó <rsalvado at gnuine.com>, 2006-2008.
+License: Ruby+GPL2+LGPL3
+
+Files: po/bs/gettext_activerecord.po
+Copyright: Copyright (c) Sanjin Sehic <saserr at gmail.com>, 2007.
+License: Ruby+GPL2+LGPL3
+
+Files: po/cs/gettext_activerecord.po
+Copyright: Copyright (c) Karel Miarka <kajism at yahoo.com>, 2005,2006.
+License: Ruby+GPL2+LGPL3
+
+Files: po/el/gettext_activerecord.po
+Copyright: Copyright (c) damphyr <damphyr at gmx.net>, 2006-2008.
+License: Ruby+GPL2+LGPL3
+
+Files: po/eo/gettext_activerecord.po
+Copyright: Copyright (c) Malte Milatz <malte at gmx-topmail.de>, 2006-2008.
+License: Ruby+GPL2+LGPL3
+
+Files: po/es/gettext_activerecord.po
+Copyright: Copyright (c) David Espada <davinci at escomposlinux.org>, 2005-2008.
+License: Ruby+GPL2+LGPL3
+
+Files: po/fr/gettext_activerecord.po
+Copyright: Copyright (c) Laurent Sansonetti <lrz at chopine.be>, 2005,2006
+License: Ruby+GPL2+LGPL3
+
+Files: po/hr/gettext_activerecord.po
+Copyright: Copyright (c) Sanjin Sehic <saserr at gmail.com>, 2007.
+License: Ruby+GPL2+LGPL3
+
+Files: po/hu/gettext_activerecord.po
+Copyright: Copyright (c) Tamás Tompa <tompata at gmail.com>, 2008.
+License: Ruby+GPL2+LGPL3
+
+Files: po/it/gettext_activerecord.po
+Copyright: Copyright (c) Marco Lazzeri <marco.lazzeri at gmail.com>, 2006.
+License: Ruby+GPL2+LGPL3
+
+Files: po/ko/gettext_activerecord.po
+Copyright: Copyright (c) Gyoung-Yoon Noh <nohmad at gmail.com>, 2006.
+License: Ruby+GPL2+LGPL3
+
+Files: po/nl/gettext_activerecord.po
+Copyright: Copyright (c) Menno Jonkers <ruby-gettext at jonkers.com>, 2005-2007.
+License: Ruby+GPL2+LGPL3
+
+Files: po/ru/gettext_activerecord.po
+Copyright: Copyright (c) Yuri Kozlov <kozlov.y at gmail.com>, 2006-2008.
+License: Ruby+GPL2+LGPL3
+
+Files: po/sr/gettext_activerecord.po
+Copyright: Copyright (c) Slobodan Paunović <slobodan dot paunovic at gmail dot com>, 2008
+License: Ruby+GPL2+LGPL3
+
+Files: po/vi/gettext_activerecord.po
+Copyright: Copyright (c) Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007,2008.
+License: Ruby+GPL2+LGPL3
+
+Files: po/zh/gettext_activerecord.po
+Copyright: Copyright (c) Yingfeng <blogyingfeng at gmail.com>, 2006.
+License: Ruby+GPL2+LGPL3
+
+Files: po/pt_BR/gettext_activerecord.po
+Copyright: Copyright (c) Joao Pedrosa <joaopedrosa at gmail.com>, 2005-2007.
+License: Ruby+GPL2+LGPL3
+
+Files: po/zh_TW/gettext_activerecord.po
+Copyright: Copyright (c) LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
+License: Ruby+GPL2+LGPL3
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.
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2f020a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+validations_format_string
diff --git a/debian/patches/validations_format_string b/debian/patches/validations_format_string
new file mode 100644
index 0000000..97b12eb
--- /dev/null
+++ b/debian/patches/validations_format_string
@@ -0,0 +1,30 @@
+From: Gunnar Wolf <gwolf at debian.org
+Bug: http://rubyforge.org/tracker/index.php?func=detail&aid=28280&group_id=855&atid=3377
+Forwarded: yes
+Last-Update: 2010-06-05
+Description: Incomplete substitution on strings in localize_error_message (validations.rb)
+ This patch fixes an incomplete hash being given to the format string,
+ which caused some strings to raise an exception.
+===================================================================
+--- libgettext-activerecord-ruby-2.1.0.orig/lib/gettext_activerecord/validations.rb 2010-06-05 19:54:08.000000000 -0500
++++ libgettext-activerecord-ruby-2.1.0/lib/gettext_activerecord/validations.rb 2010-06-05 19:54:55.000000000 -0500
+@@ -163,16 +163,15 @@
+ msgstr = @base.gettext(msgid)
+ msgstr = _(msgid) if msgstr == msgid
+ msgstr = msgstr.gsub("%{fn}", "%{attribute}").gsub("%d", "%{count}").gsub("%{val}", "%{value}") # for backward compatibility.
++ attrname = @base.class.human_attribute_name(attr)
+ if attr == "base"
+ full_message = msgstr
+- elsif /%\{attribute\}/ =~ msgstr
+- full_message = msgstr % {:attribute => @base.class.human_attribute_name(attr)}
+ elsif append_field
+- full_message = @base.class.human_attribute_name(attr) + " " + msgstr
++ full_message = attrname + " " + msgstr
+ else
+ full_message = msgstr
+ end
+- full_message % {:count => count, :value => value}
++ full_message % {:count => count, :value => value, :attribute => attrname}
+ end
+
+ def localize_error_messages(append_field = true) # :nodoc:
diff --git a/debian/require-rubygems.overrides b/debian/require-rubygems.overrides
new file mode 100644
index 0000000..6593608
--- /dev/null
+++ b/debian/require-rubygems.overrides
@@ -0,0 +1 @@
+debian/ruby-gettext-activerecord/usr/lib/ruby/vendor_ruby/gettext_activerecord/parser.rb
diff --git a/debian/ruby-gettext-activerecord.docs b/debian/ruby-gettext-activerecord.docs
index 0d5eab8..e475c53 100644
--- a/debian/ruby-gettext-activerecord.docs
+++ b/debian/ruby-gettext-activerecord.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.rdoc
+README.rdoc
diff --git a/debian/ruby-gettext-activerecord.examples b/debian/ruby-gettext-activerecord.examples
index 19ae3fc..640e65f 100644
--- a/debian/ruby-gettext-activerecord.examples
+++ b/debian/ruby-gettext-activerecord.examples
@@ -1,3 +1 @@
-# FIXME: sample/ dir found in source. Consider installing the examples.
-# Examples:
-# sample/*
+sample/*
diff --git a/debian/ruby-gettext-activerecord.install b/debian/ruby-gettext-activerecord.install
index d503ed9..8062614 100644
--- a/debian/ruby-gettext-activerecord.install
+++ b/debian/ruby-gettext-activerecord.install
@@ -1,3 +1 @@
-# FIXME: data/ dir found in source. Consider installing it somewhere.
-# Examples:
-# data/* /usr/share/ruby-gettext-activerecord/
+data/locale/* /usr/share/locale
diff --git a/debian/rules b/debian/rules
index a5e7dc8..a57a932 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,15 @@
# If you need to specify the .gemspec (eg there is more than one)
#export DH_RUBY_GEMSPEC=gem.gemspec
+LOCALEDIR=debian/ruby-gettext-activerecord/usr/share/locale/
+
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_install:
+ dh_install
+ # Ukrainan language code is mistakenly shipped as ua instead
+ # of uk - Bug report at
+ # http://rubyforge.org/tracker/index.php?func=detail&aid=28277&group_id=855&atid=3377
+ # *** CHECK: is the /po directory used?
+ [ -d $(LOCALEDIR)/uk ] || mv $(LOCALEDIR)/ua $(LOCALEDIR)/uk
--
ruby-gettext-activerecord.git
More information about the Pkg-ruby-extras-commits
mailing list