Merge lp://staging/~fginther/grail/grail-2.0.1.1-oneiric into lp://staging/grail/oneiric
Proposed by
Francis Ginther
| Status: | Merged |
|---|---|
| Approved by: | Daniel d'Andrada |
| Approved revision: | 89 |
| Merged at revision: | 87 |
| Proposed branch: | lp://staging/~fginther/grail/grail-2.0.1.1-oneiric |
| Merge into: | lp://staging/grail/oneiric |
| Diff against target: |
2252 lines (+275/-449) 44 files modified
ChangeLog (+15/-22) INSTALL (+1/-1) Makefile.am (+1/-1) Makefile.in (+5/-5) configure (+33/-33) configure.ac (+5/-5) debian/changelog (+11/-182) debian/control (+17/-12) debian/copyright (+2/-2) debian/libgrail-dev.install (+1/-1) debian/libgrail1-udeb.install (+1/-1) debian/libgrail1.install (+1/-1) debian/libgrail1.symbols (+1/-1) debian/rules (+1/-1) debian/watch (+1/-1) grail.pc.in (+2/-2) include/grail.h (+8/-8) src/Makefile.am (+5/-5) src/Makefile.in (+31/-31) src/gebuf.h (+1/-1) src/gestures-drag.c (+3/-3) src/gestures-pinch.c (+3/-3) src/gestures-rotate.c (+3/-3) src/gestures-tapping.c (+2/-2) src/gestures-touch.c (+2/-2) src/grail-api.c (+11/-11) src/grail-event.c (+5/-5) src/grail-frame.c (+16/-16) src/grail-gestures.c (+10/-10) src/grail-gestures.h (+10/-10) src/grail-impl.h (+4/-4) src/grail-init.c (+4/-4) src/grail-inserter.c (+5/-5) src/grail-inserter.h (+6/-6) src/grail-legacy.c (+2/-2) src/grail-recognizer.c (+1/-1) src/grail-recognizer.h (+1/-1) test/Makefile.am (+2/-2) test/Makefile.in (+3/-4) test/check-transform.c (+7/-7) tools/Makefile.am (+1/-1) tools/Makefile.in (+1/-1) tools/grail-test-mtdev.c (+13/-13) tools/grail-transform.c (+17/-17) |
| To merge this branch: | bzr merge lp://staging/~fginther/grail/grail-2.0.1.1-oneiric |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel d'Andrada (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* New upstream microrelease, bug fixes only
- Rename project to simply 'grail' (LP: #1040218)
* Updated debian/watch file for project rename
* Rename package and update packaging
- Added Conflicts and Replaces clauses for libgrail-dev, grail-tools and
libgrail1
Description of the change
The primary rationale for this change is to repackage grail for the project rename.
* New upstream microrelease, bug fixes only
- Rename project to simply 'grail' (LP: #1040218)
* Updated debian/watch file for project rename
* Rename package and update packaging
- Added Conflicts and Replaces clauses for libgrail-dev, grail-tools and
libgrail1
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks ok. Builds fine.