← Back to branch summary

~ubuntu-branches/ubuntu/quantal/x11proto-core/quantal

« back to all changes in this revision

Viewing changes to debian/copyright

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois, Julien Cristau, Robert Hooker, Cyril Brulebois
  • Date: 2011-01-14 04:18:40 UTC
  • mfrom: (1.1.12 upstream) (3.2.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110114041840-znf1g1v4ldzwwg4p
Tags: 7.0.20-1
[ Julien Cristau ]
* Merge changes from the experimental branch (7.0.17-1 upload).

[ Robert Hooker ]
* New upstream release. Changes:
  - 5d3428d... Add XF86XK_TouchpadOn/Off
  - Various spec updates.

[ Cyril Brulebois ]
* Update debian/copyright from upstream's COPYING.
* Add 01_keep_xorg_css.diff temporarily.
* Add patching in debian/rules, and quilt build-dep accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/copyright
4
4
Debianised by Daniel Stone <daniel.stone@ubuntu.com>.
5
5
 
6
6
 
7
 
Copyright © 1991 Sun Microsystems, Inc.  All rights reserved.
 
7
Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
8
8
 
9
9
Permission is hereby granted, free of charge, to any person obtaining a
10
10
copy of this software and associated documentation files (the "Software"),
67
67
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
68
68
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
69
69
SOFTWARE.
 
70