--- gnome-settings-daemon-2.21.5.2.orig/debian/patches/11_sleepkey.patch +++ gnome-settings-daemon-2.21.5.2/debian/patches/11_sleepkey.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-2.21.5.2/plugins/media-keys/gsd-media-keys-manager.c 2008-01-14 16:12:58.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/gsd-media-keys-manager.c 2008-01-16 15:23:45.000000000 +0100 +@@ -869,7 +869,7 @@ + do_mail_action (manager); + break; + case SLEEP_KEY: +- do_sleep_action ("apm", "xset dpms force off"); ++ do_sleep_action ("gdm-signal -s", "xset dpms force off"); + break; + case SCREENSAVER_KEY: + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) { --- gnome-settings-daemon-2.21.5.2.orig/debian/patches/90_configure_xinput_change.patch +++ gnome-settings-daemon-2.21.5.2/debian/patches/90_configure_xinput_change.patch @@ -0,0 +1,490 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/config.h.in gnome-settings-daemon-2.21.5.2.new/config.h.in +--- gnome-settings-daemon-2.21.5.2/config.h.in 2008-01-15 19:26:37.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/config.h.in 2008-01-16 18:21:55.000000000 +0100 +@@ -63,6 +63,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_X11_XLIB_H + ++/* Define if XInput extension is available */ ++#undef HAVE_XINPUT ++ + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ + #undef NO_MINUS_C_MINUS_O + +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/configure gnome-settings-daemon-2.21.5.2.new/configure +--- gnome-settings-daemon-2.21.5.2/configure 2008-01-15 19:26:36.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/configure 2008-01-16 18:20:48.000000000 +0100 +@@ -936,6 +936,8 @@ + GCONF_SCHEMAS_INSTALL_TRUE + GCONF_SCHEMAS_INSTALL_FALSE + DBUS_SYS_DIR ++HAVE_XINPUT_TRUE ++HAVE_XINPUT_FALSE + XF86MISC_LIBS + LIBGNOMEKBD_CFLAGS + LIBGNOMEKBD_LIBS +@@ -5566,7 +5568,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5569 "configure"' > conftest.$ac_ext ++ echo '#line 5571 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7420,11 +7422,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7423: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7425: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7427: \$? = $ac_status" >&5 ++ echo "$as_me:7429: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7688,11 +7690,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7691: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7693: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7695: \$? = $ac_status" >&5 ++ echo "$as_me:7697: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7792,11 +7794,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7795: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7797: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7799: \$? = $ac_status" >&5 ++ echo "$as_me:7801: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9257,7 +9259,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 9260 "configure"' > conftest.$ac_ext ++ echo '#line 9262 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -10121,7 +10123,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:12562: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12564: \$? = $ac_status" >&5 ++ echo "$as_me:12566: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12661,11 +12663,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12664: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12666: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12668: \$? = $ac_status" >&5 ++ echo "$as_me:12670: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13197,7 +13199,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 13200 "configure"' > conftest.$ac_ext ++ echo '#line 13202 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -14252,11 +14254,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14255: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14257: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14259: \$? = $ac_status" >&5 ++ echo "$as_me:14261: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14356,11 +14358,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14359: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14361: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14363: \$? = $ac_status" >&5 ++ echo "$as_me:14365: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15801,7 +15803,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 15804 "configure"' > conftest.$ac_ext ++ echo '#line 15806 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -16575,11 +16577,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16578: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16580: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16582: \$? = $ac_status" >&5 ++ echo "$as_me:16584: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16843,11 +16845,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16846: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16848: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16850: \$? = $ac_status" >&5 ++ echo "$as_me:16852: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16947,11 +16949,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16950: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16952: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16954: \$? = $ac_status" >&5 ++ echo "$as_me:16956: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18412,7 +18414,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 18415 "configure"' > conftest.$ac_ext ++ echo '#line 18417 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -25032,8 +25034,141 @@ + fi + + +-ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS" + ++have_xinput=no ++{ echo "$as_me:$LINENO: checking for XListInputDevices in -lXi" >&5 ++echo $ECHO_N "checking for XListInputDevices in -lXi... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xi_XListInputDevices+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXi -lXi $x_libs $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XListInputDevices (); ++int ++main () ++{ ++return XListInputDevices (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_lib_Xi_XListInputDevices=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xi_XListInputDevices=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xi_XListInputDevices" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xi_XListInputDevices" >&6; } ++if test $ac_cv_lib_Xi_XListInputDevices = yes; then ++ { echo "$as_me:$LINENO: checking for X11/extensions/XInput.h" >&5 ++echo $ECHO_N "checking for X11/extensions/XInput.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_extensions_XInput_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_header_X11_extensions_XInput_h=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_X11_extensions_XInput_h=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XInput_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_XInput_h" >&6; } ++if test $ac_cv_header_X11_extensions_XInput_h = yes; then ++ have_xinput=yes ++ XINPUT_LIBS="-lXi" ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_XINPUT 1 ++_ACEOF ++ ++else ++ : ++fi ++ ++ ++else ++ : ++fi ++ ++ if test $have_xinput = yes; then ++ HAVE_XINPUT_TRUE= ++ HAVE_XINPUT_FALSE='#' ++else ++ HAVE_XINPUT_TRUE='#' ++ HAVE_XINPUT_FALSE= ++fi ++ ++ ++ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $XINPUT_LIBS" + + + +@@ -26496,6 +26631,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${HAVE_XINPUT_TRUE}" && test -z "${HAVE_XINPUT_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_XINPUT\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_XINPUT\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_OSS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -27296,6 +27438,8 @@ + GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim + GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim + DBUS_SYS_DIR!$DBUS_SYS_DIR$ac_delim ++HAVE_XINPUT_TRUE!$HAVE_XINPUT_TRUE$ac_delim ++HAVE_XINPUT_FALSE!$HAVE_XINPUT_FALSE$ac_delim + XF86MISC_LIBS!$XF86MISC_LIBS$ac_delim + LIBGNOMEKBD_CFLAGS!$LIBGNOMEKBD_CFLAGS$ac_delim + LIBGNOMEKBD_LIBS!$LIBGNOMEKBD_LIBS$ac_delim +@@ -27321,8 +27465,6 @@ + LIBDIR!$LIBDIR$ac_delim + LIBEXECDIR!$LIBEXECDIR$ac_delim + DEBUG_CFLAGS!$DEBUG_CFLAGS$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim +-LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -27361,6 +27503,51 @@ + _ACEOF + + ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++LIBOBJS!$LIBOBJS$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g ++CEOF$ac_eof ++_ACEOF ++ ++ + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty +@@ -27610,7 +27797,7 @@ + s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/configure.ac gnome-settings-daemon-2.21.5.2.new/configure.ac +--- gnome-settings-daemon-2.21.5.2/configure.ac 2008-01-15 19:25:24.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/configure.ac 2008-01-16 18:20:48.000000000 +0100 +@@ -135,8 +135,21 @@ + + AC_PATH_XTRA + +-ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS" ++dnl ++dnl Check for XInput, needed for gnome-settings-daemon mouse settings ++dnl ++ ++have_xinput=no ++AC_CHECK_LIB(Xi, XListInputDevices, ++ [AC_CHECK_HEADER(X11/extensions/XInput.h, ++ have_xinput=yes ++ XINPUT_LIBS="-lXi" ++ AC_DEFINE(HAVE_XINPUT, 1, [Define if XInput extension is available]), ++ :, [#include ])], : , ++ -lXi $x_libs) ++AM_CONDITIONAL(HAVE_XINPUT, [test $have_xinput = yes]) + ++ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $XINPUT_LIBS" + + dnl --------------------------------------------------------------------------- + dnl - Keyboard plugin stuff --- gnome-settings-daemon-2.21.5.2.orig/debian/patches/09_locate_pointer.patch +++ gnome-settings-daemon-2.21.5.2/debian/patches/09_locate_pointer.patch @@ -0,0 +1,18 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/mouse/gsd-mouse-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/mouse/gsd-mouse-manager.c +--- gnome-settings-daemon-2.21.5.2/plugins/mouse/gsd-mouse-manager.c 2008-01-14 18:49:29.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/plugins/mouse/gsd-mouse-manager.c 2008-01-16 15:22:22.000000000 +0100 +@@ -436,11 +436,11 @@ + XAllowEvents (gdk_x11_get_default_xdisplay (), + ReplayKeyboard, + xev->xkey.time); +- XUngrabKeyboard (gdk_x11_get_default_xdisplay (), +- xev->xkey.time); ++ /* XUngrabKeyboard (gdk_x11_get_default_xdisplay (), ++ xev->xkey.time); */ + } + +- return GDK_FILTER_REMOVE; ++ /* return GDK_FILTER_REMOVE; */ + } + return GDK_FILTER_CONTINUE; + } --- gnome-settings-daemon-2.21.5.2.orig/debian/patches/19_extra_keybindings.patch +++ gnome-settings-daemon-2.21.5.2/debian/patches/19_extra_keybindings.patch @@ -0,0 +1,39 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/data/apps_gnome_settings_daemon_keybindings.schemas.in gnome-settings-daemon-2.21.5.2.new/data/apps_gnome_settings_daemon_keybindings.schemas.in +--- gnome-settings-daemon-2.21.5.2/data/apps_gnome_settings_daemon_keybindings.schemas.in 2007-12-24 12:18:49.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/data/apps_gnome_settings_daemon_keybindings.schemas.in 2008-01-16 15:27:36.000000000 +0100 +@@ -132,6 +132,16 @@ + + + ++ ++ /schemas/apps/gnome_settings_daemon/keybindings/xrandr ++ /apps/gnome_settings_daemon/keybindings/xrandr ++ string ++ 0xd6 ++ ++ Activate connected display ++ Activate a connected display using xrandr ++ ++ + + + /schemas/apps/gnome_settings_daemon/keybindings/help +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/media-keys/actions/acme.h gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/actions/acme.h +--- gnome-settings-daemon-2.21.5.2/plugins/media-keys/actions/acme.h 2007-12-24 12:18:48.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/actions/acme.h 2008-01-16 15:25:52.000000000 +0100 +@@ -33,6 +33,7 @@ + HOME_KEY, + MEDIA_KEY, + CALCULATOR_KEY, ++ XRANDR_KEY, + SEARCH_KEY, + EMAIL_KEY, + SLEEP_KEY, +@@ -66,6 +67,7 @@ + { HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, + { MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL }, + { CALCULATOR_KEY, GCONF_BINDING_DIR "/calculator", NULL }, ++ { XRANDR_KEY, GCONF_BINDING_DIR "/xrandr", NULL }, + { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL }, + { EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL }, + { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL }, --- gnome-settings-daemon-2.21.5.2.orig/debian/patches/01_xrdb.patch +++ gnome-settings-daemon-2.21.5.2/debian/patches/01_xrdb.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/xrdb/gsd-xrdb-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/xrdb/gsd-xrdb-manager.c +--- gnome-settings-daemon-2.21.5.2/plugins/xrdb/gsd-xrdb-manager.c 2007-12-24 12:18:48.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/plugins/xrdb/gsd-xrdb-manager.c 2008-01-16 15:20:14.000000000 +0100 +@@ -41,7 +41,7 @@ + + #define GSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerPrivate)) + +-#define SYSTEM_AD_DIR DATADIR "/xrdb" ++#define SYSTEM_AD_DIR "/etc/gnome/config" + #define GENERAL_AD SYSTEM_AD_DIR "/General.ad" + #define USER_AD_DIR ".gnome2/xrdb" + #define USER_X_RESOURCES ".Xresources" --- gnome-settings-daemon-2.21.5.2.orig/debian/patches/08_extra_touchpad_options.patch +++ gnome-settings-daemon-2.21.5.2/debian/patches/08_extra_touchpad_options.patch @@ -0,0 +1,163 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/mouse/gsd-mouse-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/mouse/gsd-mouse-manager.c +--- gnome-settings-daemon-2.21.5.2/plugins/mouse/gsd-mouse-manager.c 2008-01-14 18:49:29.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/plugins/mouse/gsd-mouse-manager.c 2008-01-18 00:29:16.000000000 +0100 +@@ -57,6 +57,9 @@ + #define KEY_LOCATE_POINTER "/desktop/gnome/peripherals/mouse/locate_pointer" + #define KEY_DWELL_ENABLE "/desktop/gnome/accessibility/mouse/dwell_enable" + #define KEY_DELAY_ENABLE "/desktop/gnome/accessibility/mouse/delay_enable" ++#define KEY_TAP_TO_CLICK "/desktop/gnome/peripherals/mouse/tap_to_click" ++#define KEY_PAD_VERT_SCROLL "/desktop/gnome/peripherals/mouse/pad_vert_scroll" ++#define KEY_PAD_HORIZ_SCROLL "/desktop/gnome/peripherals/mouse/pad_horiz_scroll" + + struct GsdMouseManagerPrivate + { +@@ -395,6 +398,122 @@ + 0, 0, motion_threshold); + } + ++static int ++set_tap_to_click (gboolean state) ++{ ++ int numdevices, i; ++ int values[2]; ++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices); ++ XDeviceResolutionControl c; ++ ++ values[0] = 1; ++ values[1] = state; ++ c.control = DEVICE_RESOLUTION; ++ c.length = sizeof(XDeviceResolutionControl); ++ c.first_valuator = 0; ++ c.num_valuators = 2; ++ c.resolutions = values; ++ ++ for (i = 0; i < numdevices; i++) { ++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0) { ++ XDevice * device ; ++ gdk_error_trap_push(); ++ device = XOpenDevice(GDK_DISPLAY(), ++ devicelist[i].id); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error: Touchpad configured as core pointer."); ++ continue; ++ } ++ gdk_error_trap_push(); ++ XChangeDeviceControl (GDK_DISPLAY(), device, ++ DEVICE_RESOLUTION, &c); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error in setting tap to click"); ++ continue; ++ } ++ XCloseDevice (GDK_DISPLAY(), device); ++ } ++ } ++ return 0; ++} ++ ++static int ++set_vert_scroll (gboolean state) ++{ ++ int numdevices, i; ++ int values[2]; ++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices); ++ XDeviceResolutionControl c; ++ ++ values[0] = 2; ++ values[1] = state; ++ c.control = DEVICE_RESOLUTION; ++ c.length = sizeof(XDeviceResolutionControl); ++ c.first_valuator = 0; ++ c.num_valuators = 2; ++ c.resolutions = values; ++ ++ for (i = 0; i < numdevices; i++) { ++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0) { ++ XDevice * device ; ++ gdk_error_trap_push(); ++ device = XOpenDevice(GDK_DISPLAY(), ++ devicelist[i].id); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error: Touchpad configured as core pointer."); ++ continue; ++ } ++ gdk_error_trap_push(); ++ XChangeDeviceControl (GDK_DISPLAY(), device, ++ DEVICE_RESOLUTION, &c); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error in setting vertical scroll"); ++ continue; ++ } ++ XCloseDevice (GDK_DISPLAY(), device); ++ } ++ } ++ return 0; ++} ++ ++static int ++set_horiz_scroll (gboolean state) ++{ ++ int numdevices, i; ++ int values[2]; ++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices); ++ XDeviceResolutionControl c; ++ ++ values[0] = 3; ++ values[1] = state; ++ c.control = DEVICE_RESOLUTION; ++ c.length = sizeof(XDeviceResolutionControl); ++ c.first_valuator = 0; ++ c.num_valuators = 2; ++ c.resolutions = values; ++ ++ for (i = 0; i < numdevices; i++) { ++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0) { ++ XDevice * device ; ++ gdk_error_trap_push(); ++ device = XOpenDevice(GDK_DISPLAY(), ++ devicelist[i].id); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error: Touchpad configured as core pointer."); ++ continue; ++ } ++ gdk_error_trap_push(); ++ XChangeDeviceControl (GDK_DISPLAY(), device, ++ DEVICE_RESOLUTION, &c); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error in setting horizontal scroll"); ++ continue; ++ } ++ XCloseDevice (GDK_DISPLAY(), device); ++ } ++ } ++ return 0; ++} + + #define KEYBOARD_GROUP_SHIFT 13 + #define KEYBOARD_GROUP_MASK ((1 << 13) | (1 << 14)) +@@ -597,6 +716,15 @@ + if (entry->value->type == GCONF_VALUE_INT) { + set_motion_threshold (manager, gconf_value_get_int (entry->value)); + } ++ } else if (! strcmp (entry->key, KEY_TAP_TO_CLICK)) { ++ if (entry->value->type == GCONF_VALUE_BOOL) ++ set_tap_to_click (gconf_value_get_bool (entry->value)); ++ } else if (! strcmp (entry->key, KEY_PAD_VERT_SCROLL)) { ++ if (entry->value->type == GCONF_VALUE_BOOL) ++ set_vert_scroll (gconf_value_get_bool (entry->value)); ++ } else if (! strcmp (entry->key, KEY_PAD_HORIZ_SCROLL)) { ++ if (entry->value->type == GCONF_VALUE_BOOL) ++ set_horiz_scroll (gconf_value_get_bool (entry->value)); + } else if (! strcmp (entry->key, KEY_LOCATE_POINTER)) { + if (entry->value->type == GCONF_VALUE_BOOL) { + set_locate_pointer (manager, gconf_value_get_bool (entry->value)); +@@ -662,6 +790,10 @@ + gconf_client_get_bool (client, KEY_DWELL_ENABLE, NULL), + gconf_client_get_bool (client, KEY_DELAY_ENABLE, NULL)); + ++ set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL)); ++ set_vert_scroll (gconf_client_get_bool (client, KEY_PAD_VERT_SCROLL, NULL)); ++ set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL)); ++ + g_object_unref (client); + + return TRUE; --- gnome-settings-daemon-2.21.5.2.orig/debian/copyright +++ gnome-settings-daemon-2.21.5.2/debian/copyright @@ -0,0 +1,72 @@ +This package was debianized by Sebastien Bacher on +Wed, 16 Jan 2008 11:12:19 +0100. + +It was downloaded from http://ftp.acc.umu.se/pub/GNOME/sources/gnome-settings-daemon + +Upstream Authors: + + Jonathan Blandford + William Jon McCann + +Copyright: + + Copyright © 2001 Ximian, Inc. + Copyright (C) 2007 William Jon McCann + Copyright (C) 2000 Helix Code, Inc + Copyright © 2007 Matthias Clasen + Copyright (C) 2007 Rodrigo Moya + Copyright (C) 2007 Anders Carlsson + Copyright © 2004 Red Hat, Inc. + Copyright 2002 Sun Microsystems, Inc. + Copyright © 2005,2006 Novell, Inc. + Copyright © 2007 The GNOME Foundation + Copyright (C) 2002-2005 - Paolo Maggi + Copyright (C) 2002 Red Hat, Inc. + Copyright 1998, 2001 Tim Janik + Copyright � 2001 Udaltsoft + Copyright (C) 2001, 2002, 2003 Bastien Nocera + Copyright (C) 2003 Ross Burton + Copyright © 2001 Jonathan Blandford + +License: + + This package 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 package 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 this package; 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 `/usr/share/common-licenses/GPL'. + +eggaccelerators.h, eggaccelerators.c + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; 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 Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +The Debian packaging is (C) 2008, Sebastien Bacher and +is licensed under the GPL, see above. --- gnome-settings-daemon-2.21.5.2.orig/debian/control +++ gnome-settings-daemon-2.21.5.2/debian/control @@ -0,0 +1,21 @@ +Source: gnome-settings-daemon +Section: gnome +Priority: extra +Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers +Build-Depends: cdbs, debhelper (>= 5), dpkg-dev (>= 1.13.19), autotools-dev, libdbus-glib-1-dev (>= 0.74), libglib2.0-dev, libgtk2.0-dev, libgconf2-dev, libgnomevfs2-dev, libgnome-desktop-dev, libglade2-dev, libgnomekbd-dev (>= 2.21.4), libgstreamer-plugins-base0.10-dev, libxklavier11-dev, libx11-dev, libxml-parser-perl, gnome-pkg-tools +Standards-Version: 3.7.3 + +Package: gnome-settings-daemon +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: capplets-data (<< 1:2.21.5) +Description: GNOME settings daemon + The package contains the GNOME daemon which handles the session settings + +Package: gnome-settings-daemon-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libgnome-settings-daemon-dev +Description: Utility library for accessing gnome-settings-daemon over DBUS + The package contains what is required to access gnome-settings-daemon over DBUS --- gnome-settings-daemon-2.21.5.2.orig/debian/gnome-settings-daemon.install +++ gnome-settings-daemon-2.21.5.2/debian/gnome-settings-daemon.install @@ -0,0 +1,3 @@ +debian/tmp/etc/gconf/schemas +debian/tmp/usr/lib/gnome-settings-daemon +debian/tmp/usr/share --- gnome-settings-daemon-2.21.5.2.orig/debian/rules +++ gnome-settings-daemon-2.21.5.2/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + +binary-install/gnome-settings-daemon:: + find debian -name '*.a' -delete + find debian -name '*.la' -delete --- gnome-settings-daemon-2.21.5.2.orig/debian/gnome-settings-daemon-dev.install +++ gnome-settings-daemon-2.21.5.2/debian/gnome-settings-daemon-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig --- gnome-settings-daemon-2.21.5.2.orig/debian/changelog +++ gnome-settings-daemon-2.21.5.2/debian/changelog @@ -0,0 +1,8 @@ +gnome-settings-daemon (2.21.5.2-0ubuntu1) hardy; urgency=low + + * Upload to ubuntu + * debian/patches/90_configure_xinput_change.patch: + - use xinput for the build + + -- Sebastien Bacher Wed, 16 Jan 2008 11:12:19 +0100 + --- gnome-settings-daemon-2.21.5.2.orig/debian/control.in +++ gnome-settings-daemon-2.21.5.2/debian/control.in @@ -0,0 +1,21 @@ +Source: gnome-settings-daemon +Section: gnome +Priority: extra +Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, debhelper (>= 5), dpkg-dev (>= 1.13.19), autotools-dev, libdbus-glib-1-dev (>= 0.74), libglib2.0-dev, libgtk2.0-dev, libgconf2-dev, libgnomevfs2-dev, libgnome-desktop-dev, libglade2-dev, libgnomekbd-dev (>= 2.21.4), libgstreamer-plugins-base0.10-dev, libxklavier11-dev, libx11-dev, libxml-parser-perl, gnome-pkg-tools +Standards-Version: 3.7.3 + +Package: gnome-settings-daemon +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: capplets-data (<< 1:2.21.5) +Description: GNOME settings daemon + The package contains the GNOME daemon which handles the session settings + +Package: gnome-settings-daemon-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libgnome-settings-daemon-dev +Description: Utility library for accessing gnome-settings-daemon over DBUS + The package contains what is required to access gnome-settings-daemon over DBUS --- gnome-settings-daemon-2.21.5.2.orig/debian/compat +++ gnome-settings-daemon-2.21.5.2/debian/compat @@ -0,0 +1 @@ +5 --- gnome-settings-daemon-2.21.5.2.orig/COPYING.LIB +++ gnome-settings-daemon-2.21.5.2/COPYING.LIB @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it!