Merge lp:~stevenk/meta-lp-deps/meta-lp-deps-python2.6-dev into lp:meta-lp-deps

[Steve Kowalik]

Add python2.6-dev to launchpad-dependencies. It is required for us to build our eggs.

[lp:~stevenk/meta-lp-deps/meta-lp-deps-python2.6-dev]

129. By Steve Kowalik on 2011-10-20

Missing comma. :-(

130. By Steve Kowalik on 2011-10-20

Replace python-dev with python2.6-dev

131. By Steve Kowalik on 2011-10-20

Fix changelog.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-30 11:52:14 +0000
+++ debian/changelog	2011-10-20 02:01:18 +0000
@@ -1,3 +1,9 @@
+launchpad-dependencies (0.101) oneiric; urgency=low
+
+  * Replace python-dev with python2.6-dev in launchpad-dependencies.
+
+ -- Steve Kowalik <[e-mail]>  Thu, 20 Oct 2011 12:46:07 +1100
+
 launchpad-dependencies (0.100) oneiric; urgency=low
 
   * Add rabbitmq-management as a depedency on

=== modified file 'debian/control'
--- debian/control	2011-09-23 10:28:33 +0000
+++ debian/control	2011-10-20 02:01:18 +0000
@@ -7,7 +7,7 @@
 
 Package: launchpad-dependencies
 Architecture: all
-Depends: bzr, python-dev, gettext, build-essential,
+Depends: bzr, python2.6-dev, gettext, build-essential,
   ncompress, python-psycopg2, python-apt (>= ${python-apt-version}), python-geoip,
   libgpgme11-dev (>= 1.1.0), cvs, python-svn,
   python-subversion, python-sqlite, ubuntu-keyring,
@@ -19,8 +19,7 @@
   python-magic, geoip-data | geoip-data-city-lite,
   python2.6, python2.6 (>= 2.6.7-2ubuntu1) | python-profiler,
   python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
-  python-pygments,
-  python-subunit (>= 0.0.4),
+  python-pygments, python-subunit (>= 0.0.4),
   python-support, python-pysqlite2, zlib1g-dev,
   ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
   openssh-client, python-egenix-mxdatetime,