Merge lp://staging/~speijnik/python-apt/debian-gsoc09 into lp://staging/~mvo/python-apt/python-apt--mvo
Proposed by
Stephan Peijnik
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~speijnik/python-apt/debian-gsoc09 |
| Merge into: | lp://staging/~mvo/python-apt/python-apt--mvo |
| Diff against target: |
99 lines (+32/-1) (has conflicts) 5 files modified
apt/__init__.py (+5/-0) debian/changelog (+13/-0) debian/control (+2/-1) po/python-apt.pot (+4/-0) python/apt_pkgmodule.cc (+8/-0) Text conflict in debian/changelog Text conflict in po/python-apt.pot |
| To merge this branch: | bzr merge lp://staging/~speijnik/python-apt/debian-gsoc09 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Stephan Peijnik (speijnik) wrote | # |
Revision history for this message
| Michael Vogt (mvo) | # |
review:
Approve
Unmerged revisions
- 231. By Stephan Peijnik
-
debian/control:
- Added XB-Python-Version attribute for python-apt-dbg package.apt/__init__.py:
- Defined API_LEVEL constant. - 230. By Stephan Peijnik
-
Merged with debian.
- 229. By Stephan Peijnik
-
Merged with debian-sid branch.
Updated changelog and preparing 0.7.11.2. - 228. By Stephan Peijnik
-
* python/
apt_pkgmodule. cc: Initialize the package system automatically on module load time.
- 227. By Stephan Peijnik
-
Fixed build bug with python-debian 0.1.10, build-depending on 0.1.13 now.
Updating diff...
An updated diff will be available in a few minutes. Reload to see the changes.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Important exception handling fixes. Required for update-manager 0.200.