Merge lp:~l3on/ubuntu/oneiric/ruby-sinatra/fix-843734 into lp:ubuntu/oneiric/ruby-sinatra

Proposed by Leo Iannacone
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~l3on/ubuntu/oneiric/ruby-sinatra/fix-843734
Merge into: lp:ubuntu/oneiric/ruby-sinatra
Diff against target: 37 lines (+10/-2)
2 files modified
debian/changelog (+7/-0)
debian/control (+3/-2)
To merge this branch: bzr merge lp:~l3on/ubuntu/oneiric/ruby-sinatra/fix-843734
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+89530@code.launchpad.net

Description of the change

Changed depends from ruby-rack to libruby-rack to fix unmetdep as
reported in bug LP: #843734

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! I uploaded this, but didn't technically merge (it should merge into lp:ubuntu/oneiric-proposed/ruby-sinatra, which doesn't exist yet).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-26 01:23:37 +0000
3+++ debian/changelog 2012-01-21 11:18:29 +0000
4@@ -1,3 +1,10 @@
5+ruby-sinatra (1.2.6-1ubuntu1) oneiric-proposed; urgency=low
6+
7+ * ruby-sinatra depends on librack-ruby instead ruby-rack.
8+ Changes not needed in 12.04. (LP: #843734)
9+
10+ -- Leo Iannacone <l3on@ubuntu.com> Mon, 16 Jan 2012 21:08:02 +0100
11+
12 ruby-sinatra (1.2.6-1) unstable; urgency=low
13
14 * New upstream version: 1.2.6
15
16=== modified file 'debian/control'
17--- debian/control 2011-07-26 01:23:37 +0000
18+++ debian/control 2012-01-21 11:18:29 +0000
19@@ -1,7 +1,8 @@
20 Source: ruby-sinatra
21 Section: ruby
22 Priority: optional
23-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
26 Uploaders: Lucas Nussbaum <lucas@lucas-nussbaum.net>, Youhei SASAKI <uwabami@gfd-dennou.org>
27 DM-Upload-Allowed: yes
28 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-tilt
29@@ -15,7 +16,7 @@
30 Package: ruby-sinatra
31 Architecture: all
32 XB-Ruby-Versions: ${ruby:Versions}
33-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, ruby-rack, ruby-tilt
34+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter, librack-ruby, ruby-tilt
35 Replaces: libsinatra-ruby1.8 (<< 1.2.3-1~), libsinatra-ruby1.9.1 (<< 1.2.3-1~), libsinatra-ruby (<< 1.2.3-1~), libsinatra-ruby-doc (<< 1.2.3-1~)
36 Conflicts: libsinatra-ruby1.8 (<< 1.2.3-1~), libsinatra-ruby1.9.1 (<< 1.2.3-1~), libsinatra-ruby (<< 1.2.3-1~), libsinatra-ruby-doc (<< 1.2.3-1~)
37 Provides: libsinatra-ruby1.8, libsinatra-ruby1.9.1, libsinatra-ruby, libsinatra-ruby-doc

Subscribers

People subscribed via source and target branches

to all changes: