Merge lp://qastaging/~ari-tczew/gbrainy/ubuntu into lp://qastaging/~ubuntu-desktop/gbrainy/ubuntu

Proposed by Artur Rona
Status: Merged
Merged at revision: 12
Proposed branch: lp://qastaging/~ari-tczew/gbrainy/ubuntu
Merge into: lp://qastaging/~ubuntu-desktop/gbrainy/ubuntu
Diff against target: 174 lines (+86/-9)
4 files modified
debian/changelog (+76/-0)
debian/control (+5/-5)
debian/copyright (+1/-1)
debian/patches/01_lpi.patch (+4/-3)
To merge this branch: bzr merge lp://qastaging/~ari-tczew/gbrainy/ubuntu
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Robert Ancell Pending
Review via email: mp+45649@code.qastaging.launchpad.net
To post a comment you must log in.
12. By Robert Ancell

* Merge from debian unstable. Remaining changes: (LP: #700773)
  - debian/control:
    + Add Vcs-Bzr link related to Ubuntu Desktop Team.
    + Build-Depends on liblaunchpad-integration-cil-dev.
    + Build-Depends on dh-autoreconf, gnome-common for autotools.
  - debian/patches/01_lpi.patch: Add Launchpad integration.
  - debian/rules: Run autoreconf due to patch on configure.ac.
* New upstream release:
   - Added new games (7 logic, 1 calculation and 16 verbal analogies).
   - Added support for exporting to PDF.
   - Several bug fixes and improved internationalization support.
* New upstream release:
   - Bug fixes and translation updates.
* Drop debian/patches/fix-ca-translation, it's now included upstream.
* New upstream release:
  - Bug fixes and translation updates (LP: #572607, #622197, #565293).
* debian/control:
   - Mention verbal analogies in the long description.
   - Bump Standards-Version to 3.9.1.
* debian/source/format:
   - Switch to the 3.0 (quilt) source format.
* debian/rules:
   - Remove simple-patchsys.
* Add debian/patches/fix-ca-translation.
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Add Vcs-Bzr link
  - Build-depend on gnome-common for autotools
  - Build-depend on liblaunchpad-integration-cil-dev
* debian/rules:
  - Run autoreconf on build
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* New upstream release
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/rules:
  - Run autoreconf on build
* debian/control:
  - Add Vcs-Bzr link
  - Build-depend on gnome-common instead of autotools-dev

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: