[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-vmmouse: Changes to 'debian-unstable'



 debian/changelog                          |    9 +++++++--
 debian/rules                              |    1 +
 debian/xserver-xorg-input-vmmouse.install |    3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit dd73565540732584f71850844435cf79f6432d70
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Jun 4 10:26:00 2010 +0200

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 3e02d89..f2a8161 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
+xserver-xorg-input-vmmouse (1:12.6.9-2) unstable; urgency=low
 
   [ Robert Hooker ]
   * Pull from upstream master branch up to commit 833698b3b98
@@ -10,7 +10,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
   * Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.
   * Stop shipping hal-probe-vmmouse.
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Fri, 04 Jun 2010 03:05:36 -0400
+ -- Julien Cristau <jcristau@debian.org>  Fri, 04 Jun 2010 10:25:57 +0200
 
 xserver-xorg-input-vmmouse (1:12.6.9-1) unstable; urgency=low
 

commit 7529f52dc978956447f43f5b188c93afd5b73557
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Jun 4 10:25:18 2010 +0200

    Stop shipping hal-probe-vmmouse.

diff --git a/debian/changelog b/debian/changelog
index 520fb32..3e02d89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.
+  * Stop shipping hal-probe-vmmouse.
 
  -- Robert Hooker <sarvatt@ubuntu.com>  Fri, 04 Jun 2010 03:05:36 -0400
 
diff --git a/debian/xserver-xorg-input-vmmouse.install b/debian/xserver-xorg-input-vmmouse.install
index 6e48297..e3e4e58 100644
--- a/debian/xserver-xorg-input-vmmouse.install
+++ b/debian/xserver-xorg-input-vmmouse.install
@@ -1,6 +1,5 @@
 usr/lib/xorg/modules/input/*.so
 bin/vmmouse_detect
-usr/lib/hal/hal-probe-vmmouse
 usr/share/man
 usr/share/X11/xorg.conf.d
 lib/udev/rules.d

commit 610b1d6c40bf97294346a5380c0ac8c99a7f16c0
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Jun 4 10:24:32 2010 +0200

    Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.

diff --git a/debian/changelog b/debian/changelog
index 760c683..520fb32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * Pull from upstream master branch up to commit 833698b3b98
     - Fixed an issue where vmmouse was matched against the non-event device
       as well causing it to load multiple times and get stuck.
   * Version build-dependency on xutils-dev as it requires util-macros 1.4.
 
+  [ Julien Cristau ]
+  * Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.
+
  -- Robert Hooker <sarvatt@ubuntu.com>  Fri, 04 Jun 2010 03:05:36 -0400
 
 xserver-xorg-input-vmmouse (1:12.6.9-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 8f9b639..3c860be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ build-stamp: configure
 	test -d build || mkdir build
 	cd build && \
 	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+		     --bindir=/bin \
 	             --infodir=\$${prefix}/share/info $(confflags) \
 	             CFLAGS="$(CFLAGS)"
 	cd build && $(MAKE)
diff --git a/debian/xserver-xorg-input-vmmouse.install b/debian/xserver-xorg-input-vmmouse.install
index afa6194..6e48297 100644
--- a/debian/xserver-xorg-input-vmmouse.install
+++ b/debian/xserver-xorg-input-vmmouse.install
@@ -1,5 +1,5 @@
 usr/lib/xorg/modules/input/*.so
-usr/bin/vmmouse_detect
+bin/vmmouse_detect
 usr/lib/hal/hal-probe-vmmouse
 usr/share/man
 usr/share/X11/xorg.conf.d


Reply to: