Merge branch 'master' of ssh://db.debian.org/git/debian.org

* 'master' of ssh://db.debian.org/git/debian.org:
  Added libintl-perl to debian.org-www-master.debian.org

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 863a0f2ba11f1349ade3a629c2efc8cc8e43e06b..8f79b6a6651ba9a01b8bd35ebc79411537cdd9c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,4 @@
-debian.org (XX) XXstable; urgency=low
-  
-  [ Francesca Ciceri ]
-  * debian.org-www-master.debian.org:
-    - add libintl-perl
+debian.org (42) unstable; urgency=low
 
   [ Steve McIntyre ]
   * cdbuilder.debian.org
@@ -24,6 +20,8 @@ debian.org (XX) XXstable; urgency=low
     - add libjson-perl
   * ftp-master:
     - add python-simplejson || python (>= 2.6)
+    - dependency on python-sqlalchemy is no longer versioned
+    - remove irb (now provided by ruby)
 
   [ Bernd Zeimetz ]
   * nm.d.o:
@@ -39,7 +37,10 @@ debian.org (XX) XXstable; urgency=low
   [ Stephen Gran ]
   * Add wheezy chroots to upgrade-porter-chroots
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 16 Feb 2011 10:21:15 +0100
+  [ Francesca Ciceri ]
+  * debian.org-www-master.debian.org:
+    - add libintl-perl
+ -- Peter Palfrader <weasel@debian.org>  Sat, 19 Mar 2011 23:29:43 +0100
 
 debian.org (41.1) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 3f655f0a940513e30d4bfbf9e6bf33c260d4da94..f51c2810af18501209dd191ddcfe4647f4131019 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -258,8 +258,7 @@ Depends: edos-distcheck,
        python-psycopg2,
        python-mako,
        python-nose,
-       python-sqlalchemy (>= 0.5),
-       python-sqlalchemy (<< 0.6),
+       python-sqlalchemy,
        quinn-diff,
        r-base-core,
        r-cran-lattice,
@@ -338,7 +337,6 @@ Depends: apt-utils,
        procmail,
        cvs,
        ruby,
-       irb,
        lynx,
        libxml-rss-perl,
        ghostscript,