Merge lp:~ubuntu-branches/ubuntu/natty/psycopg2/natty-201012031811 into lp:ubuntu/natty/psycopg2
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/psycopg2/natty-201012031811 |
| Merge into: | lp:ubuntu/natty/psycopg2 |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/psycopg2/natty-201012031811 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/psycopg2 now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/psycopg2/natty-201012031811. A merge should be performed if necessary.
Unmerged revisions
- 14. By Daniel Holbach
-
* Merge from Debian (LP: #611040). Remaining changes:
debian/control, debian/rules: Install a seperate testsuite package.
* New upstream release. (Closes: #582823)
* debian/control:
- bumped Standards-Version to 3.9.0, no changes required.
- removed the zope-psycopg2da binary package. (Closes: #583293)
* New upstream release.
* debian/control: bumped Standards-Version to 3.8.5, no changes required.
* NMU
* Update for python2.3 as the default python version (closes: #205746).
