[DRE-commits] [SCM] ruby-actionmailer-2.3.git branch, debian-sid, updated. upstream/2.3.11-10-ge1059ed
Ondřej Surý
ondrej at sury.org
Fri Jun 3 12:40:55 UTC 2011
The following commit has been merged in the debian-sid branch:
commit 249e8327f3b9bb04f71294631ab6ad845838301f
Author: Ondřej Surý <ondrej at sury.org>
Date: Fri Jun 3 14:26:54 2011 +0200
Use RAILS_VERSION from debian/rules to generate dependencies
diff --git a/debian/control b/debian/control
index 479a236..8d11f2a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~),
gem2deb (>= 0.2.3~),
ruby-tmail (>= 1.2.7~),
- ruby-actionpack-2.3,
+ ruby-actionpack-2.3 (>= 2.3.11),
+ ruby-actionpack-2.3 (<< 2.3.11.),
ruby-text-format (>= 0.6.3~) | libtext-format-ruby (>= 0.6.3~)
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionmailer-2.3.git
@@ -21,7 +22,8 @@ XB-Ruby-Versions: ${ruby:Versions}
Depends: ${shlibs:Depends},
${misc:Depends},
ruby | ruby-interpreter,
- ruby-actionpack-2.3 (>= ${source:Version}~), ruby-actionpack-2.3 (<< ${source:Version}.1~),
+ ruby-actionpack-2.3 (>= 2.3.11),
+ ruby-actionpack-2.3 (<< 2.3.11.1),
ruby-text-format | libtext-format-ruby (>= 0.6.3~)
Replaces: libactionmailer-ruby (<< 2.3.11-1~), libactionmailer-ruby1.8 (<< 2.3.11-1~)
Conflicts: libactionmailer-ruby (<< 2.3.11-1~), libactionmailer-ruby1.8 (<< 2.3.11-1~)
diff --git a/debian/control b/debian/control.in
similarity index 88%
copy from debian/control
copy to debian/control.in
index 479a236..9926805 100644
--- a/debian/control
+++ b/debian/control.in
@@ -7,7 +7,8 @@ DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~),
gem2deb (>= 0.2.3~),
ruby-tmail (>= 1.2.7~),
- ruby-actionpack-2.3,
+ ruby-actionpack-2.3 (>= @RAILS_VERSION@),
+ ruby-actionpack-2.3 (<< @RAILS_VERSION at .),
ruby-text-format (>= 0.6.3~) | libtext-format-ruby (>= 0.6.3~)
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionmailer-2.3.git
@@ -21,7 +22,8 @@ XB-Ruby-Versions: ${ruby:Versions}
Depends: ${shlibs:Depends},
${misc:Depends},
ruby | ruby-interpreter,
- ruby-actionpack-2.3 (>= ${source:Version}~), ruby-actionpack-2.3 (<< ${source:Version}.1~),
+ ruby-actionpack-2.3 (>= @RAILS_VERSION@),
+ ruby-actionpack-2.3 (<< @RAILS_VERSION at .1),
ruby-text-format | libtext-format-ruby (>= 0.6.3~)
Replaces: libactionmailer-ruby (<< 2.3.11-1~), libactionmailer-ruby1.8 (<< 2.3.11-1~)
Conflicts: libactionmailer-ruby (<< 2.3.11-1~), libactionmailer-ruby1.8 (<< 2.3.11-1~)
diff --git a/debian/rules b/debian/rules
index a5e7dc8..af4206f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,13 @@
# If you need to specify the .gemspec (eg there is more than one)
#export DH_RUBY_GEMSPEC=gem.gemspec
+RAILS_VERSION=$(shell sed -n "s/^ version: //p" metadata.yml)
+
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_testdir: debian/control
+ dh_testdir
+
+debian/control: debian/control.in
+ sed -e "s/@RAILS_VERSION@/$(RAILS_VERSION)/" >$@ <$<
--
ruby-actionmailer-2.3.git
More information about the Pkg-ruby-extras-commits
mailing list