xorg-server: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/copyright | 4 +++-
debian/local/10-mouse.conf | 2 +-
debian/xserver-xorg-core.bug.script | 6 ++++++
4 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit b0205b5ba26110899100fafbec31c44a5d024771
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 26 12:22:14 2010 +0200
Fix typo in 10-mouse.conf: s/Mouse/Pointer/ (Closes: #579130).
diff --git a/debian/changelog b/debian/changelog
index b981f69..56b8ad8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.7.6.901-4) UNRELEASED; urgency=low
* 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).
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 20 Apr 2010 17:46:32 +0300
diff --git a/debian/local/10-mouse.conf b/debian/local/10-mouse.conf
index 49c3bae..39183ea 100644
--- a/debian/local/10-mouse.conf
+++ b/debian/local/10-mouse.conf
@@ -1,5 +1,5 @@
Section "InputClass"
Identifier "mouse catchall"
- MatchIsMouse "on"
+ MatchIsPointer "on"
Driver "mouse"
EndSection
commit eb4ddad62dfb65e57c80c733a44190111cbe8849
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 19 16:53:14 2010 +0200
Point to the complete text of the GPL in debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index ccd2167..b981f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-server (2:1.7.6.901-4) UNRELEASED; urgency=low
* 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.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 20 Apr 2010 17:46:32 +0300
diff --git a/debian/copyright b/debian/copyright
index de4145c..cd2b454 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -579,3 +579,6 @@ debian/local/input_id.c is stolen from udev and is:
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.
commit d14576b1467e575057e71f0140a35d5e0c069d67
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 19 16:45:27 2010 +0200
Fix FSF address in debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 797819d..ccd2167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xorg-server (2:1.7.6.901-4) 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.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 20 Apr 2010 17:46:32 +0300
diff --git a/debian/copyright b/debian/copyright
index 355494e..de4145c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -578,5 +578,4 @@ debian/local/input_id.c is stolen from udev and is:
You should have received a copy of the GNU General Public License
along with keymap; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
commit 50997a061dd81631b1f7327f6e6d46300d51f081
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Apr 19 16:27:05 2010 +0200
Add listing files under /etc/X11/xorg.conf.d in bug script.
diff --git a/debian/changelog b/debian/changelog
index 8ed1d6a..797819d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
xorg-server (2:1.7.6.901-4) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Update patch 17; Add missing __datadir__ to cpprules.in.
+ [ Cyril Brulebois ]
+ * Add listing files under /etc/X11/xorg.conf.d in bug script.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 20 Apr 2010 17:46:32 +0300
xorg-server (2:1.7.6.901-3) unstable; urgency=low
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 2f12659..bcc11cf 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -6,6 +6,7 @@ PATH="/sbin:$PATH"
CONFIG_DIR=/etc/X11
SERVER_SYMLINK="$CONFIG_DIR/X"
XORGCONFIG="$CONFIG_DIR/xorg.conf"
+XORGCONFIG_DIR="$CONFIG_DIR/xorg.conf.d"
CONFIG_AUX_DIR=/var/lib/x11
SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
@@ -92,6 +93,11 @@ if [ -e "$XORGCONFIG" ]; then
printf "Contents of $XORGCONFIG:\n"
iconv -c -t ascii "$XORGCONFIG"
printf "\n"
+ if [ -d "$XORGCONFIG_DIR" ]; then
+ printf "Contents of $XORGCONFIG_DIR:\n"
+ ls -l "$XORGCONFIG_DIR"
+ printf "\n"
+ fi
else
printf "$XORGCONFIG does not exist.\n"
fi
Reply to: