[DRE-commits] [redmine] 02/02: Reapply packaging changes from 2.4.2-1~bpo70+1

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master-wheezy-backports
in repository redmine.

commit 7fb3012e59e2be1b33c3798da7ad9eddcdd83bed
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jul 20 20:30:04 2014 -0300

    Reapply packaging changes from 2.4.2-1~bpo70+1
---
 debian/changelog | 21 +++++++++++++++++++++
 debian/control   |  4 ++--
 debian/gbp.conf  |  4 ++--
 debian/install   |  1 -
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e20c8f7..41a5639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+redmine (2.5.1-2~bpo70+2) wheezy-backports; urgency=medium
+
+  * Reapply changes from 2.4.2-1~bpo70+1 to use ruby-railties-3.2 and
+    ruby-rack packages from wheezy, and to not try loading the Gemfile
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sun, 20 Jul 2014 20:22:26 -0300
+
 redmine (2.5.1-2~bpo70+1) wheezy-backports; urgency=medium
 
   * Backport for Debian 7.0
@@ -19,6 +26,20 @@ redmine (2.5.1-1) unstable; urgency=medium
 
  -- Ondřej Surý <ondrej at debian.org>  Tue, 29 Apr 2014 09:38:26 +0200
 
+redmine (2.4.2-1~bpo70+1) wheezy-backports; urgency=low
+
+  * Rebuild for wheezy-backports.
+  * Drop version qualifiers from the following dependencies, to be able to use
+    the versions already on wheezy.
+    - ruby-railties
+      + The `rake tmp:cache:clear` command will not work.
+    - ruby-rack
+  * debian/install: do not install Gemfile as passenger will try to load it,
+    and will fail because this Gemfile is stricter than what we can provide in
+    wheezy (e.g. it requires rails >= 3.2.12).
+
+ -- Antonio Terceiro <terceiro at debian.org>  Thu, 13 Feb 2014 21:11:28 -0300
+
 redmine (2.4.2-1) unstable; urgency=low
 
   * New upstream version 2.4.2
diff --git a/debian/control b/debian/control
index 5276f45..7462862 100644
--- a/debian/control
+++ b/debian/control
@@ -16,11 +16,11 @@ Package: redmine
 Architecture: all
 Pre-Depends: debconf
 Depends: ruby | ruby-interpreter,
- ruby-railties-3.2 (>= 3.2.16-1~),
+ ruby-railties-3.2,
  ruby-rails-observers,
  dbconfig-common,
  redmine-sqlite | redmine-mysql | redmine-pgsql,
- ruby-rack (>= 1.4.5~) | ruby-rack1.4,
+ ruby-rack | ruby-rack1.4,
  ruby-coderay (>= 1.0.6),
  ruby-net-ldap (>= 0.3.1),
  ruby-openid,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index ad1914a..09381ca 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,8 +4,8 @@
 pristine-tar = True
 sign-tags = True
 
-upstream-branch = upstream
-debian-branch = master
+upstream-branch = upstream-wheezy-backports
+debian-branch = master-wheezy-backports
 
 
 [git-import-orig]
diff --git a/debian/install b/debian/install
index 041821e..1616017 100644
--- a/debian/install
+++ b/debian/install
@@ -6,7 +6,6 @@ extra usr/share/redmine
 lib usr/share/redmine
 public usr/share/redmine
 Rakefile usr/share/redmine
-Gemfile usr/share/redmine
 script usr/share/redmine
 test usr/share/redmine
 config.ru usr/share/redmine

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git