-
Committer:
Bazaar Package Importer
-
Author(s):
Onkar Shinde
-
Date:
2008-09-11 01:04:45 UTC
-
mfrom:
(1.2.1 upstream)
(3.1.5 intrepid)
-
Revision ID:
james.westby@ubuntu.com-20080911010445-mpi5ex6m4sk77nqt
Tags: 8.07-1
* Merge with Ubuntu
* Remaining Debian changes
  - debian/control
    * electric doesn't build with GCJ. Hence remove default-jdk from build
      depends.
    * Set 'Maintainer' to Debian Java Maintainers. Remove
      XSBC-Original-Maintainer field.
    * Add 'Uploaders' field.
    * Add Vcs-* fields
  - debian/copyright
    * Update copyright holders, GPL 2 -> GPL 3.