lp:~ari-tczew/gbrainy/ubuntu

Branch merges

Propose for merging

Merged into lp:~ubuntu-desktop/gbrainy/ubuntu at revision 14

Daniel Holbach: Approve on 2011-01-17

Diff: 56 lines (+24/-3)

2 files modified

debian/changelog (+22/-1)
debian/copyright (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #700773: Merge gbrainy 1.61-1 (main) from Debian unstable (main)

Wishlist

Fix Released

Link a bug report

Related blueprints

14. By Artur Rona on 2011-01-16

* 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:
   - Bug fixes and updated/new translations (Closes: #609284, #606470;
     LP: #695691, #693447).
* Update copyright years in debian/copyright.

13. By Robert Ancell on 2011-01-13

New upstream release

12. By Robert Ancell on 2011-01-13

* 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

11. By Robert Ancell on 2010-12-20

* New upstream release
* debian/control:
  - Use standards-version 3.9.1
* debian/rules:
  - Drop simple-patchsys.mk
* debian/source/format:
  - Use source version 3.0

10. By Robert Ancell on 2010-11-04

New upstream release

9. By Robert Ancell on 2010-09-06

New upstream release

8. By Robert Ancell on 2010-08-09

* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Add Vcs-Bzr link
  - Build-depend on dh-autoreconf, gnome-common for autotools
  - Build-depend on liblaunchpad-integration-cil-dev
* debian/rules:
  - Use dh-autoreconf
* debian/patches/01_lpi.patch:
  - Add Launchpad integration

7. By Robert Ancell on 2010-06-23

* 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

6. By Testy Tester <test@maverick-test> on 2010-05-31

New upstream release

5. By Robert Ancell on 2010-04-13

* 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
* New upstream release:
   - 18 bug fixes.
   - Updated and new translations.
* Drop debian/patches/10-two-sixes-correct-answer.patch, already upstream.
* Add debian/source/version file with "1.0".