[DRE-commits] [SCM] ruby-actionpack-3.2.git branch, master, updated. debian/3.2.3-2-7-ga7511f7

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 18b7272ee5f86d5e8449b71869cb25bb9ea358bb
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 16 21:06:42 2012 -0300

    Review debian/control.in

diff --git a/debian/control b/debian/control
index 012bc3a..622c664 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends: ${shlibs:Depends},
 	 ruby-erubis (>= 2.7.0~),
 	 ruby-tzinfo (>= 0.3.29~)
 Conflicts: ruby-actionpack-2.3
-Description: Web-flow and rendering framework putting the VC in MVC (part of Rails).
- Action Pack is a framework for web apps on Rails. Simple,
+Description: web-flow and rendering framework putting the VC in MVC (part of Rails)
+ Action Pack is a framwork for web apps on Rails. Simple,
  battle-tested conventions for building and testing MVC web
  applications. Works with any Rack-compatible server.
diff --git a/debian/control.in b/debian/control.in
index acbc9a1..bbb82ed 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -37,7 +37,8 @@ Depends: ${shlibs:Depends},
 	 ruby-builder (>= 3.0.0),
 	 ruby-erubis (>= 2.7.0~),
 	 ruby-tzinfo (>= 0.3.29~)
-Description: Web-flow and rendering framework putting the VC in MVC (part of Rails).
+Conflicts: ruby-actionpack-2.3
+Description: web-flow and rendering framework putting the VC in MVC (part of Rails)
  Action Pack is a framwork for web apps on Rails. Simple,
  battle-tested conventions for building and testing MVC web
  applications. Works with any Rack-compatible server.

-- 
ruby-actionpack-3.2.git