xorg-server: Changes to 'debian-unstable'
debian/changelog | 5 ++---
debian/copyright | 22 ----------------------
2 files changed, 2 insertions(+), 25 deletions(-)
New commits:
commit 9dbf5635a646d139b30eaa83cc78543901233fa0
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 1 00:33:21 2010 +0200
Drop mention of input_id from debian/copyright
We stopped shipping it a while back.
diff --git a/debian/changelog b/debian/changelog
index b0528dc..1c6aaf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,6 @@ xorg-server (2:1.7.6.902-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add listing files under /etc/X11/xorg.conf.d in bug script.
- * Fix stuff pointed out by lintian:
- - Fix FSF address in debian/copyright.
- - Point to the complete text of the GPL in debian/copyright.
* Fix typo in 10-mouse.conf: s/Mouse/Pointer/ (Closes: #579130).
[ Julien Cristau ]
@@ -21,6 +18,8 @@ xorg-server (2:1.7.6.902-1) UNRELEASED; urgency=low
- fixes Xvfb crash with XI2 (closes: #575905)
* 19-exa-handle-pixmap-create-destroy-in-lower-layers.diff is now upstream,
remove it.
+ * Drop mention of input_id from debian/copyright since we stopped shipping
+ it a while back.
-- Julien Cristau <jcristau@debian.org> Fri, 30 Apr 2010 15:46:51 +0200
diff --git a/debian/copyright b/debian/copyright
index cd2b454..8fe50d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -560,25 +560,3 @@ I. Lee Hetherington <ilh@lcs.mit.edu>
Permission is hereby granted to use, modify, and distribute this program
for any purpose provided this copyright notice and the one below remain
intact.
-
-
-debian/local/input_id.c is stolen from udev and is:
- Copyright (C) 2009 Martin Pitt <martin.pitt@ubuntu.com>
- Portions Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with keymap; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
- On Debian systems, the complete text of the GNU General Public
- License can be found in the /usr/share/common-licenses/GPL file.
Reply to: