[Glibc-bsd-commits] r3380 - in trunk/freebsd-moused/debian: . patches
Guillem Jover
guillem at alioth.debian.org
Tue May 31 03:38:29 UTC 2011
Author: guillem
Date: 2011-05-31 03:38:28 +0000 (Tue, 31 May 2011)
New Revision: 3380
Added:
trunk/freebsd-moused/debian/patches/glibc.patch
trunk/freebsd-moused/debian/patches/libbsd.patch
trunk/freebsd-moused/debian/patches/retry.patch
Removed:
trunk/freebsd-moused/debian/patches/000_libbsd.patch
trunk/freebsd-moused/debian/patches/001_glibc.diff
trunk/freebsd-moused/debian/patches/002_retry.diff
Modified:
trunk/freebsd-moused/debian/changelog
trunk/freebsd-moused/debian/patches/series
Log:
Remove numeric prefixes from patches
Modified: trunk/freebsd-moused/debian/changelog
===================================================================
--- trunk/freebsd-moused/debian/changelog 2011-05-31 02:52:11 UTC (rev 3379)
+++ trunk/freebsd-moused/debian/changelog 2011-05-31 03:38:28 UTC (rev 3380)
@@ -9,6 +9,7 @@
* Refactor source and tar name into SOURCE and TARNAME in debian/rules.
* Line-wrap PMAKE variable in debian/rules.
* Use libbsd-dev instead of local copy of strlcpy().
+ * Remove numeric prefixes from patches.
-- Guillem Jover <guillem at debian.org> Thu, 30 Apr 2009 20:57:46 +0200
Deleted: trunk/freebsd-moused/debian/patches/000_libbsd.patch
===================================================================
--- trunk/freebsd-moused/debian/patches/000_libbsd.patch 2011-05-31 02:52:11 UTC (rev 3379)
+++ trunk/freebsd-moused/debian/patches/000_libbsd.patch 2011-05-31 03:38:28 UTC (rev 3380)
@@ -1,25 +0,0 @@
----
- usr.sbin/moused/Makefile | 1 +
- usr.sbin/moused/moused.c | 1 +
- 2 files changed, 2 insertions(+)
-
---- a/usr.sbin/moused/Makefile
-+++ b/usr.sbin/moused/Makefile
-@@ -2,6 +2,7 @@
-
- PROG= moused
- MAN= moused.8
-+LDADD= -lbsd
-
- WARNS?=6
-
---- a/usr.sbin/moused/moused.c
-+++ b/usr.sbin/moused/moused.c
-@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <bsd/string.h>
- #include <syslog.h>
- #include <termios.h>
- #include <unistd.h>
Deleted: trunk/freebsd-moused/debian/patches/001_glibc.diff
===================================================================
--- trunk/freebsd-moused/debian/patches/001_glibc.diff 2011-05-31 02:52:11 UTC (rev 3379)
+++ trunk/freebsd-moused/debian/patches/001_glibc.diff 2011-05-31 03:38:28 UTC (rev 3380)
@@ -1,28 +0,0 @@
----
- usr.sbin/moused/moused.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/usr.sbin/moused/moused.c
-+++ b/usr.sbin/moused/moused.c
-@@ -45,10 +45,10 @@
- **/
-
- #include <sys/cdefs.h>
--__FBSDID("$FreeBSD$");
-
- #include <sys/param.h>
- #include <sys/consio.h>
-+#include <sys/ttycom.h>
- #include <sys/mouse.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-@@ -533,8 +533,7 @@ static void hup(int sig);
- static void cleanup(int sig);
- static void pause_mouse(int sig);
- static void usage(void);
--static void log_or_warn(int log_pri, int errnum, const char *fmt, ...)
-- __printflike(3, 4);
-+static void log_or_warn(int log_pri, int errnum, const char *fmt, ...);
-
- static int r_identify(void);
- static const char *r_if(int type);
Deleted: trunk/freebsd-moused/debian/patches/002_retry.diff
===================================================================
--- trunk/freebsd-moused/debian/patches/002_retry.diff 2011-05-31 02:52:11 UTC (rev 3379)
+++ trunk/freebsd-moused/debian/patches/002_retry.diff 2011-05-31 03:38:28 UTC (rev 3380)
@@ -1,32 +0,0 @@
-
-Description: retry forever after mouse is dettached, since you never know
- when it can be attached back.
-Status: sent upstream
-
----
- usr.sbin/moused/moused.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/usr.sbin/moused/moused.c
-+++ b/usr.sbin/moused/moused.c
-@@ -878,9 +878,9 @@ main(int argc, char *argv[])
- usage();
- }
-
-- retry = 1;
-+ retry = 0;
- if (strncmp(rodent.portname, "/dev/ums", 8) == 0) {
-- if (usbmodule() != 0)
-+ if ((retry != 0) && (usbmodule() != 0))
- retry = 5;
- }
-
-@@ -891,7 +891,7 @@ main(int argc, char *argv[])
- signal(SIGQUIT, cleanup);
- signal(SIGTERM, cleanup);
- signal(SIGUSR1, pause_mouse);
-- for (i = 0; i < retry; ++i) {
-+ for (i = 0; i < retry || retry == 0; ++i) {
- if (i > 0)
- sleep(2);
- rodent.mfd = open(rodent.portname, O_RDWR | O_NONBLOCK);
Copied: trunk/freebsd-moused/debian/patches/glibc.patch (from rev 3379, trunk/freebsd-moused/debian/patches/001_glibc.diff)
===================================================================
--- trunk/freebsd-moused/debian/patches/glibc.patch (rev 0)
+++ trunk/freebsd-moused/debian/patches/glibc.patch 2011-05-31 03:38:28 UTC (rev 3380)
@@ -0,0 +1,28 @@
+---
+ usr.sbin/moused/moused.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/usr.sbin/moused/moused.c
++++ b/usr.sbin/moused/moused.c
+@@ -45,10 +45,10 @@
+ **/
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD$");
+
+ #include <sys/param.h>
+ #include <sys/consio.h>
++#include <sys/ttycom.h>
+ #include <sys/mouse.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+@@ -533,8 +533,7 @@ static void hup(int sig);
+ static void cleanup(int sig);
+ static void pause_mouse(int sig);
+ static void usage(void);
+-static void log_or_warn(int log_pri, int errnum, const char *fmt, ...)
+- __printflike(3, 4);
++static void log_or_warn(int log_pri, int errnum, const char *fmt, ...);
+
+ static int r_identify(void);
+ static const char *r_if(int type);
Copied: trunk/freebsd-moused/debian/patches/libbsd.patch (from rev 3379, trunk/freebsd-moused/debian/patches/000_libbsd.patch)
===================================================================
--- trunk/freebsd-moused/debian/patches/libbsd.patch (rev 0)
+++ trunk/freebsd-moused/debian/patches/libbsd.patch 2011-05-31 03:38:28 UTC (rev 3380)
@@ -0,0 +1,25 @@
+---
+ usr.sbin/moused/Makefile | 1 +
+ usr.sbin/moused/moused.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/usr.sbin/moused/Makefile
++++ b/usr.sbin/moused/Makefile
+@@ -2,6 +2,7 @@
+
+ PROG= moused
+ MAN= moused.8
++LDADD= -lbsd
+
+ WARNS?=6
+
+--- a/usr.sbin/moused/moused.c
++++ b/usr.sbin/moused/moused.c
+@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <bsd/string.h>
+ #include <syslog.h>
+ #include <termios.h>
+ #include <unistd.h>
Copied: trunk/freebsd-moused/debian/patches/retry.patch (from rev 3379, trunk/freebsd-moused/debian/patches/002_retry.diff)
===================================================================
--- trunk/freebsd-moused/debian/patches/retry.patch (rev 0)
+++ trunk/freebsd-moused/debian/patches/retry.patch 2011-05-31 03:38:28 UTC (rev 3380)
@@ -0,0 +1,32 @@
+
+Description: retry forever after mouse is dettached, since you never know
+ when it can be attached back.
+Status: sent upstream
+
+---
+ usr.sbin/moused/moused.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/usr.sbin/moused/moused.c
++++ b/usr.sbin/moused/moused.c
+@@ -878,9 +878,9 @@ main(int argc, char *argv[])
+ usage();
+ }
+
+- retry = 1;
++ retry = 0;
+ if (strncmp(rodent.portname, "/dev/ums", 8) == 0) {
+- if (usbmodule() != 0)
++ if ((retry != 0) && (usbmodule() != 0))
+ retry = 5;
+ }
+
+@@ -891,7 +891,7 @@ main(int argc, char *argv[])
+ signal(SIGQUIT, cleanup);
+ signal(SIGTERM, cleanup);
+ signal(SIGUSR1, pause_mouse);
+- for (i = 0; i < retry; ++i) {
++ for (i = 0; i < retry || retry == 0; ++i) {
+ if (i > 0)
+ sleep(2);
+ rodent.mfd = open(rodent.portname, O_RDWR | O_NONBLOCK);
Modified: trunk/freebsd-moused/debian/patches/series
===================================================================
--- trunk/freebsd-moused/debian/patches/series 2011-05-31 02:52:11 UTC (rev 3379)
+++ trunk/freebsd-moused/debian/patches/series 2011-05-31 03:38:28 UTC (rev 3380)
@@ -1,3 +1,3 @@
-000_libbsd.patch
-001_glibc.diff
-002_retry.diff
+glibc.diff
+libbsd.patch
+retry.diff
More information about the Glibc-bsd-commits
mailing list