Merge lp:~jderose/ubuntu/precise/couchdb/1.1.1-low-delta into lp:debian/wheezy/couchdb
Status: | Needs review |
---|---|
Proposed branch: | lp:~jderose/ubuntu/precise/couchdb/1.1.1-low-delta |
Merge into: | lp:debian/wheezy/couchdb |
Diff against target: |
171 lines (+70/-17) 7 files modified
debian/changelog (+17/-0) debian/control (+21/-1) debian/couchdb-bin.install (+3/-0) debian/couchdb.install (+7/-0) debian/couchdb.postinst (+2/-1) debian/couchdb.postrm (+5/-2) debian/rules (+15/-13) |
To merge this branch: | bzr merge lp:~jderose/ubuntu/precise/couchdb/1.1.1-low-delta |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+85389@code.launchpad.net |
Description of the change
I don't know if merging into this branch actually works, but the point is I want lp:ubuntu/couchdb to be replaced by what *this* merge produces.
Yes, my merge is like a 70k line diff from lp:ubuntu/couchdb, but it's only around a 160 line diff from lp:debian/wheezy/couchdb... and that was the point :^)
Unmerged revisions
- 30. By Jason Gerard DeRose
-
Appended my changelog entry, now 1.1.1-2ubuntu1
- 29. By Jason Gerard DeRose
-
Merged 1.1.1-2 from debian
- 28. By Jason Gerard DeRose
-
couchdb now Replaces couchdb-bin (<= 1.0.1-0ubuntu18)
- 27. By Jason Gerard DeRose
-
Made couchdb.install a bit clearer
- 26. By Jason Gerard DeRose
-
Seemingly fixed amd64 PPA build problem by using common-
binary- predeb- indep - 25. By Jason Gerard DeRose
-
Made couchdb.install a bit clearer
- 24. By Jason Gerard DeRose
-
Updated debian/changelog
- 23. By Jason Gerard DeRose
-
Fixed couchdb.postrm so it doesn't remove everything in /etc/couchdb
- 22. By Jason Gerard DeRose
-
couchdb-bin now carries /etc/couchdb/
default. ini - 21. By Jason Gerard DeRose
-
Renamed postinst, postrm scripts