~jbicha/ubuntu/oneiric/gcompris/gcompris-9.6.1

Viewing all changes in revision 27.

  • Committer: Bazaar Package Importer
  • Author(s): Jordan Mantha
  • Date: 2008-03-26 11:07:46 UTC
  • mfrom: (1.1.12 upstream) (5.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20080326110746-kf1k59ehfkjn5rvk
Tags: 8.4.4-1.1ubuntu1
* Merge from Debian unstable (Closes LP: #156679), remaining changes:
  - debian/control:
     + use gnome-games instead of gnuchess
     + add intltool as a build dependency
     + depend on python (>= 2.5) | python-pysqlite2
  - debian/rules: add intltool-update to generate .pot
  - update all .py files importing pysqlite2 to try importing
    from sqlite3 first before pysqlite2
* Modify Maintainer value to match the DebianMaintainerField
  specification.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: