[DRE-commits] r5610 - trunk/libgettext-activerecord-ruby/debian

[Gunnar Wolf]

Author: gwolf
Date: 2010-06-18 16:10:55 +0000 (Fri, 18 Jun 2010)
New Revision: 5610

Modified:
   trunk/libgettext-activerecord-ruby/debian/changelog
   trunk/libgettext-activerecord-ruby/debian/control
   trunk/libgettext-activerecord-ruby/debian/rules
Log:
Created -common binary package to fix conflict created by files in both Ruby version packages

Modified: trunk/libgettext-activerecord-ruby/debian/changelog
===================================================================
--- trunk/libgettext-activerecord-ruby/debian/changelog	2010-06-18 15:50:22 UTC (rev 5609)
+++ trunk/libgettext-activerecord-ruby/debian/changelog	2010-06-18 16:10:55 UTC (rev 5610)
@@ -1,3 +1,10 @@
+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

Modified: trunk/libgettext-activerecord-ruby/debian/control
===================================================================
--- trunk/libgettext-activerecord-ruby/debian/control	2010-06-18 15:50:22 UTC (rev 5609)
+++ trunk/libgettext-activerecord-ruby/debian/control	2010-06-18 16:10:55 UTC (rev 5610)
@@ -26,7 +26,7 @@
 
 Package: libgettext-activerecord-ruby1.8
 Architecture: all
-Depends: ruby1.8, libgettext-ruby1.8 (>= 2.0.4), libactiverecord-ruby1.8 (>= 2.3.2), ${misc:Depends}
+Depends: ruby1.8, libgettext-activerecord-ruby-common (= ${binary:Version}), libgettext-ruby1.8 (>= 2.0.4), libactiverecord-ruby1.8 (>= 2.3.2), ${misc:Depends}
 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:
@@ -39,7 +39,7 @@
 
 Package: libgettext-activerecord-ruby1.9.1
 Architecture: all
-Depends: ruby1.9.1, libgettext-ruby1.9.1 (>= 2.0.4), libactiverecord-ruby1.9.1 (>= 2.3.2), ${misc:Depends}
+Depends: ruby1.9.1, libgettext-activerecord-ruby-common (= ${binary:Version}), libgettext-ruby1.9.1 (>= 2.0.4), libactiverecord-ruby1.9.1 (>= 2.3.2), ${misc:Depends}
 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:
@@ -49,3 +49,18 @@
    * extract messages from models with the rake task.
  .
  This package is built for ruby 1.9.1.
+
+Package: libgettext-activerecord-ruby-common
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: libgettext-activerecord-ruby
+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.
+ .
+ This package contains common files used by either Ruby version
+ libgettext-activerecord-ruby is built for.

Modified: trunk/libgettext-activerecord-ruby/debian/rules
===================================================================
--- trunk/libgettext-activerecord-ruby/debian/rules	2010-06-18 15:50:22 UTC (rev 5609)
+++ trunk/libgettext-activerecord-ruby/debian/rules	2010-06-18 16:10:55 UTC (rev 5610)
@@ -16,3 +16,13 @@
 	# Move the Ukrainan files back, to avoid bloating the diff
 	[ -d po/ua ] || mv po/uk po/ua
 	[ -d data/locale/ua ] || mv data/locale/uk data/locale/ua
+
+install/libgettext-activerecord-ruby1.8::
+	# Files common to 1.8 and 1.9.1 are moved to -common
+	mkdir -p ./debian/libgettext-activerecord-ruby-common/usr/share/
+	mv ./debian/$(cdbs_curpkg)/usr/share/locale ./debian/libgettext-activerecord-ruby-common/usr/share/
+
+install/libgettext-activerecord-ruby1.9.1::
+	# Some files were moved to -common in the 1.8 package, just
+	# delete them here
+	rm -rf ./debian/$(cdbs_curpkg)/usr/share/locale