Your message dated Wed, 10 Jul 2013 06:03:02 +0000
with message-id <[email protected]>
and subject line Bug#676948: fixed in pommed 1.39~dfsg-3
has caused the Debian Bug report #676948,
regarding pommed: rely on sys/inotify.h for inotify support
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
676948: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676948
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: pommed
Version: 1.39~dfsg-2
Severity: wishlist
Tags: patch upstream
sys/inotify.h was added to glibc in version 2.4 in 2006,
and workarounds for older glibc versions are no longer required.
>From 45c48507e138755f76810da0b1f2626bb7805000 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <[email protected]>
Date: Mon, 9 Apr 2012 15:51:09 +0300
Subject: rely on sys/inotify.h for inotify support
sys/inotify.h was added to glibc in version 2.4 in 2006,
and workarounds for older glibc versions are no longer required.
---
gpomme/Makefile | 4 +-
gpomme/conffile.c | 7 +---
gpomme/gpomme.c | 7 +---
gpomme/inotify-syscalls.h | 98 ---------------------------------------------
pommed/Makefile | 4 +-
pommed/evdev.c | 7 +---
pommed/inotify-syscalls.h | 98 ---------------------------------------------
7 files changed, 5 insertions(+), 220 deletions(-)
delete mode 100644 gpomme/inotify-syscalls.h
delete mode 100644 pommed/inotify-syscalls.h
diff --git a/gpomme/Makefile b/gpomme/Makefile
index 0874b48..d7e05d5 100644
--- a/gpomme/Makefile
+++ b/gpomme/Makefile
@@ -12,9 +12,7 @@ DBUSGLIB_LIBS = $(shell pkg-config dbus-glib-1 --libs)
CONFUSE_CFLAGS = $(shell pkg-config libconfuse --cflags)
CONFUSE_LIBS = $(shell pkg-config libconfuse --libs)
-INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
-
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
+CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS)
LDLIBS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS)
SOURCES = gpomme.c theme.c conffile.c \
diff --git a/gpomme/conffile.c b/gpomme/conffile.c
index aca25e9..f62fd1b 100644
--- a/gpomme/conffile.c
+++ b/gpomme/conffile.c
@@ -31,12 +31,7 @@
#include <dirent.h>
#include <libintl.h>
-#ifndef NO_SYS_INOTIFY_H
-# include <sys/inotify.h>
-#else
-# include <linux/inotify.h>
-# include "inotify-syscalls.h"
-#endif
+#include <sys/inotify.h>
#include <confuse.h>
diff --git a/gpomme/gpomme.c b/gpomme/gpomme.c
index c0839cd..53ca4df 100644
--- a/gpomme/gpomme.c
+++ b/gpomme/gpomme.c
@@ -31,12 +31,7 @@
#include <sys/types.h>
#include <sys/wait.h>
-#ifndef NO_SYS_INOTIFY_H
-# include <sys/inotify.h>
-#else
-# include <linux/inotify.h>
-# include "inotify-syscalls.h"
-#endif
+#include <sys/inotify.h>
#include <libintl.h>
diff --git a/gpomme/inotify-syscalls.h b/gpomme/inotify-syscalls.h
deleted file mode 100644
index a1d5408..0000000
--- a/gpomme/inotify-syscalls.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Inotify syscall numbers
- * Taken from the Linux kernel source tree
- *
- * Licensed under the terms of the GNU General Public License Version 2.
- *
- * Copyright (c) 2006 Tobias Klauser <[email protected]>
- */
-
-#ifndef _LINUX_INOTIFY_SYSCALLS_H
-#define _LINUX_INOTIFY_SYSCALLS_H
-
-#include <sys/syscall.h>
-
-#if defined(__i386__)
-# define __NR_inotify_init 291
-# define __NR_inotify_add_watch 292
-# define __NR_inotify_rm_watch 293
-#elif defined(__x86_64__)
-# define __NR_inotify_init 253
-# define __NR_inotify_add_watch 254
-# define __NR_inotify_rm_watch 255
-#elif defined(__powerpc__) || defined(__powerpc64__)
-# define __NR_inotify_init 275
-# define __NR_inotify_add_watch 276
-# define __NR_inotify_rm_watch 277
-#elif defined (__ia64__)
-# define __NR_inotify_init 1277
-# define __NR_inotify_add_watch 1278
-# define __NR_inotify_rm_watch 1279
-#elif defined (__s390__)
-# define __NR_inotify_init 284
-# define __NR_inotify_add_watch 285
-# define __NR_inotify_rm_watch 286
-#elif defined (__alpha__)
-# define __NR_inotify_init 444
-# define __NR_inotify_add_watch 445
-# define __NR_inotify_rm_watch 446
-#elif defined (__sparc__) || defined (__sparc64__)
-# define __NR_inotify_init 151
-# define __NR_inotify_add_watch 152
-# define __NR_inotify_rm_watch 156
-#elif defined (__arm__)
-# define __NR_OABI_SYSCALL_BASE 0x900000
-# if defined(__thumb__) || defined(__ARM_EABI__)
-# define __NR_SYSCALL_BASE 0
-# else
-# define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE
-# endif
-# define __NR_inotify_init (__NR_SYSCALL_BASE + 316)
-# define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 317)
-# define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 318)
-#elif defined (__sh__)
-# define __NR_inotify_init 290
-# define __NR_inotify_add_watch 291
-# define __NR_inotify_rm_watch 292
-#elif defined (__hppa__)
-# define __NR_inotify_init 269
-# define __NR_inotify_add_watch 270
-# define __NR_inotify_rm_watch 271
-#elif defined (__mips__)
-# include <sgidefs.h>
-# if _MIPS_SIM == _MIPS_SIM_ABI32
-# define __NR_Linux 4000
-# define __NR_inotify_init (__NR_Linux + 284)
-# define __NR_inotify_add_watch (__NR_Linux + 285)
-# define __NR_inotify_rm_watch (__NR_Linux + 286)
-# elif _MIPS_SIM == _MIPS_SIM_ABI64
-# define __NR_Linux 5000
-# define __NR_inotify_init (__NR_Linux + 243)
-# define __NR_inotify_add_watch (__NR_Linux + 244)
-# define __NR_inotify_rm_watch (__NR_Linux + 245)
-# elif _MIPS_SIM == _MIPS_SIM_NABI32
-# define __NR_Linux 6000
-# define __NR_inotify_init (__NR_Linux + 247)
-# define __NR_inotify_add_watch (__NR_Linux + 248)
-# define __NR_inotify_rm_watch (__NR_Linux + 249)
-# endif
-#else
-# error "inotify not supported on this architecture!"
-#endif
-
-static inline int inotify_init (void)
-{
- return syscall (__NR_inotify_init);
-}
-
-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
-{
- return syscall (__NR_inotify_add_watch, fd, name, mask);
-}
-
-static inline int inotify_rm_watch (int fd, __u32 wd)
-{
- return syscall (__NR_inotify_rm_watch, fd, wd);
-}
-
-#endif /* _LINUX_INOTIFY_SYSCALLS_H */
diff --git a/pommed/Makefile b/pommed/Makefile
index 5f3cbf9..45a9ade 100644
--- a/pommed/Makefile
+++ b/pommed/Makefile
@@ -14,11 +14,9 @@ AUDIOFILE_LIBS = $(shell pkg-config audiofile --libs)
CONFUSE_CFLAGS = $(shell pkg-config libconfuse --cflags)
CONFUSE_LIBS = $(shell pkg-config libconfuse --libs)
-INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
-
TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
+CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(TIMERFD_CFLAGS)
LDLIBS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
diff --git a/pommed/evdev.c b/pommed/evdev.c
index 7c9524b..fab0c94 100644
--- a/pommed/evdev.c
+++ b/pommed/evdev.c
@@ -31,12 +31,7 @@
#include <sys/epoll.h>
-#ifndef NO_SYS_INOTIFY_H
-# include <sys/inotify.h>
-#else
-# include <linux/inotify.h>
-# include "inotify-syscalls.h"
-#endif
+#include <sys/inotify.h>
#include <linux/input.h>
diff --git a/pommed/inotify-syscalls.h b/pommed/inotify-syscalls.h
deleted file mode 100644
index a1d5408..0000000
--- a/pommed/inotify-syscalls.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Inotify syscall numbers
- * Taken from the Linux kernel source tree
- *
- * Licensed under the terms of the GNU General Public License Version 2.
- *
- * Copyright (c) 2006 Tobias Klauser <[email protected]>
- */
-
-#ifndef _LINUX_INOTIFY_SYSCALLS_H
-#define _LINUX_INOTIFY_SYSCALLS_H
-
-#include <sys/syscall.h>
-
-#if defined(__i386__)
-# define __NR_inotify_init 291
-# define __NR_inotify_add_watch 292
-# define __NR_inotify_rm_watch 293
-#elif defined(__x86_64__)
-# define __NR_inotify_init 253
-# define __NR_inotify_add_watch 254
-# define __NR_inotify_rm_watch 255
-#elif defined(__powerpc__) || defined(__powerpc64__)
-# define __NR_inotify_init 275
-# define __NR_inotify_add_watch 276
-# define __NR_inotify_rm_watch 277
-#elif defined (__ia64__)
-# define __NR_inotify_init 1277
-# define __NR_inotify_add_watch 1278
-# define __NR_inotify_rm_watch 1279
-#elif defined (__s390__)
-# define __NR_inotify_init 284
-# define __NR_inotify_add_watch 285
-# define __NR_inotify_rm_watch 286
-#elif defined (__alpha__)
-# define __NR_inotify_init 444
-# define __NR_inotify_add_watch 445
-# define __NR_inotify_rm_watch 446
-#elif defined (__sparc__) || defined (__sparc64__)
-# define __NR_inotify_init 151
-# define __NR_inotify_add_watch 152
-# define __NR_inotify_rm_watch 156
-#elif defined (__arm__)
-# define __NR_OABI_SYSCALL_BASE 0x900000
-# if defined(__thumb__) || defined(__ARM_EABI__)
-# define __NR_SYSCALL_BASE 0
-# else
-# define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE
-# endif
-# define __NR_inotify_init (__NR_SYSCALL_BASE + 316)
-# define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 317)
-# define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 318)
-#elif defined (__sh__)
-# define __NR_inotify_init 290
-# define __NR_inotify_add_watch 291
-# define __NR_inotify_rm_watch 292
-#elif defined (__hppa__)
-# define __NR_inotify_init 269
-# define __NR_inotify_add_watch 270
-# define __NR_inotify_rm_watch 271
-#elif defined (__mips__)
-# include <sgidefs.h>
-# if _MIPS_SIM == _MIPS_SIM_ABI32
-# define __NR_Linux 4000
-# define __NR_inotify_init (__NR_Linux + 284)
-# define __NR_inotify_add_watch (__NR_Linux + 285)
-# define __NR_inotify_rm_watch (__NR_Linux + 286)
-# elif _MIPS_SIM == _MIPS_SIM_ABI64
-# define __NR_Linux 5000
-# define __NR_inotify_init (__NR_Linux + 243)
-# define __NR_inotify_add_watch (__NR_Linux + 244)
-# define __NR_inotify_rm_watch (__NR_Linux + 245)
-# elif _MIPS_SIM == _MIPS_SIM_NABI32
-# define __NR_Linux 6000
-# define __NR_inotify_init (__NR_Linux + 247)
-# define __NR_inotify_add_watch (__NR_Linux + 248)
-# define __NR_inotify_rm_watch (__NR_Linux + 249)
-# endif
-#else
-# error "inotify not supported on this architecture!"
-#endif
-
-static inline int inotify_init (void)
-{
- return syscall (__NR_inotify_init);
-}
-
-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
-{
- return syscall (__NR_inotify_add_watch, fd, name, mask);
-}
-
-static inline int inotify_rm_watch (int fd, __u32 wd)
-{
- return syscall (__NR_inotify_rm_watch, fd, wd);
-}
-
-#endif /* _LINUX_INOTIFY_SYSCALLS_H */
--
1.7.10
--- End Message ---
--- Begin Message ---
Source: pommed
Source-Version: 1.39~dfsg-3
We believe that the bug you reported is fixed in the latest version of
pommed, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Nobuhiro Iwamatsu <[email protected]> (supplier of updated pommed package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 09 Jul 2013 11:25:35 +0900
Source: pommed
Binary: pommed gpomme wmpomme
Architecture: source amd64
Version: 1.39~dfsg-3
Distribution: unstable
Urgency: low
Maintainer: Debian Mactel <[email protected]>
Changed-By: Nobuhiro Iwamatsu <[email protected]>
Description:
gpomme - graphical client for pommed
pommed - Apple laptops hotkeys event handler
wmpomme - WindowMaker dockapp client for pommed
Closes: 676948 688529 708150
Changes:
pommed (1.39~dfsg-3) unstable; urgency=low
.
* Update debian/control.
- Change Maintainer field and Add Uploaders field. (Closes: #688529)
Maintainer: Debian Mactel <[email protected]>
Uploaders: Nobuhiro Iwamatsu <[email protected]>
- Bump Standard Version: 3.9.4
- Update debhelper to 9.
* Update debian/compat to 9.
* Update debian/rules.
- Convert to dh.
* Add patches/MacBookPro91.patch. Support Macbook Pro 9,1. (Closes: #708150)
* Add patches/0001-rely-on-sys-inotify.h-for-inotify-support.patch.
Update inotify support. (Closes: #676948)
* Update debian/copyright to DEP5.
Checksums-Sha1:
22c335643a8deb4310341f7216f8d942d3ff8bd4 2038 pommed_1.39~dfsg-3.dsc
2bae46aa89a254d2f355713a367d4dcae39bf12d 10775 pommed_1.39~dfsg-3.debian.tar.gz
d6ca224f3426f1303c4f97d93d717c7e9ba64cba 61338 pommed_1.39~dfsg-3_amd64.deb
d1d39ea240dec4e7acd10a244ea222a0351deb48 345322 gpomme_1.39~dfsg-3_amd64.deb
2cc5e6cfa1f9155f800b7a862b590f70be16b5fc 32016 wmpomme_1.39~dfsg-3_amd64.deb
Checksums-Sha256:
9aaf4bb1dfc8729ff9294844d2a27a764ab8f8b8e3e8d9c917bce18e1e6e6cc1 2038
pommed_1.39~dfsg-3.dsc
0e905253df56a3715ca2c01347477cef568eac7dce81742a62e4c428806152f2 10775
pommed_1.39~dfsg-3.debian.tar.gz
63cfb99c2078af519ac313e8a7ca1739414ce444b8ee89a5ffe2c648683e4d7a 61338
pommed_1.39~dfsg-3_amd64.deb
01a635d70d35cf651932e1ad5fd025e6d98cd459f512ba2041d88fa06cd8b3ed 345322
gpomme_1.39~dfsg-3_amd64.deb
4bff98c5713434beb91895724a23f3ca0182ccdcce38c0aa5026536fd81208e4 32016
wmpomme_1.39~dfsg-3_amd64.deb
Files:
adcac8fc7ec8e5f6006239fe6d79e926 2038 utils optional pommed_1.39~dfsg-3.dsc
f94309938412aea80ddc3991ed064972 10775 utils optional
pommed_1.39~dfsg-3.debian.tar.gz
fdf44cd83514dd5c75bc352148ad1310 61338 utils optional
pommed_1.39~dfsg-3_amd64.deb
fc855dbe37e9d4d30d37c3c9012a2f21 345322 utils optional
gpomme_1.39~dfsg-3_amd64.deb
b2154d8ff8797e945b3d5eb370c0d7f9 32016 utils optional
wmpomme_1.39~dfsg-3_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJR3PVXAAoJEDIkf7tArR+meqoP/1m28GWWrZasfuaSxHv30Iir
+DdCckxPcjT4DA2cpqWHdlnyMdASFXM9n/gwMAH37jCD29Ah90MEyOoo1eqMSjsH
USLmu9CRM9z3rzv8qvqgUaVpGEHZ8lITHEHO7QgKXG9IDrzsNNfC1dO5Rs2DQq0g
/WYPwRvQQtlGxRTjHCbDlq+6QKHs5id8wqGwubY46HGhRll7EQUD5fuvjcQ3WojV
4YwZ6nQtot3irE3b+3nmhpsX1PBpXjTwCui6Z6BKzU0v4fWT5RZW4o6RZ4Vaee46
EG5kdPXIxp+PMcdKdpVKdKnZ8VdfMzTMdkR/58qOEsD5XSguzqOtToExtb4xuUuW
GCg/KSTxt7wMH3JwiiX77vUNYC9Af/m2assUvg8Es1CAsjJhlpoM+nP5AEm5tB84
uHsCN2aZDC7Z/ltld3y3xV6k6ct9XM+Mrxg00jer3HOKiqkmxArn/ihSVeAFFUAM
ZQ04WUEzghCaOHSbZoEv6iTv4icaxnoU4yfE5FoO8zQlmZmMH66+E5nf8BIATw3p
TIQojZh1ZG+sLlEgPCCMxrHcmDX/zfvtYq3iaVPV/unIZoX8s7A1iFz1X/bP74uw
ROmMH7kKA8Z+ZLPq4YWKEAzU01Mh2AGhle7Yb7cUQ7HpwasJLWyzV0/B+WulWU7n
diFRVDLoFimrZ71UE47I
=GH7r
-----END PGP SIGNATURE-----
--- End Message ---
