--- qingy-0.9.7.orig/aclocal.m4 +++ qingy-0.9.7/aclocal.m4 @@ -21,7 +21,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 52 AC_PROG_LIBTOOL +# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -228,14 +228,6 @@ [pic_mode=default]) test -z "$pic_mode" && pic_mode=default -# Check if we have a version mismatch between libtool.m4 and ltmain.sh. -# -# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. -# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually -# calls AC_LIBTOOL_CONFIG and creates libtool. -# -_LT_VERSION_CHECK - # Use C for the default configuration in the libtool script tagname= AC_LIBTOOL_LANG_C_CONFIG @@ -243,41 +235,6 @@ ])# AC_LIBTOOL_SETUP -# _LT_VERSION_CHECK -# ----------------- -AC_DEFUN([_LT_VERSION_CHECK], -[AC_MSG_CHECKING([for correct ltmain.sh version]) -if test "x$ltmain" = "x" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([ - -*** @<:@Gentoo@:>@ sanity check failed! *** -*** \$ltmain is not defined, please check the patch for consistency! *** -]) -fi -gentoo_lt_version="1.5.26" -gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"` -if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([ - -*** @<:@Gentoo@:>@ sanity check failed! *** -*** libtool.m4 and ltmain.sh have a version mismatch! *** -*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** - -Please run: - - libtoolize --copy --force - -if appropriate, please contact the maintainer of this -package (or your distribution) for help. -]) -else - AC_MSG_RESULT(yes) -fi -])# _LT_VERSION_CHECK - - # _LT_AC_SYS_COMPILER # ------------------- AC_DEFUN([_LT_AC_SYS_COMPILER], @@ -1593,14 +1550,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -1611,12 +1561,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -1779,6 +1723,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -2560,7 +2516,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3567,7 +3523,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -5259,7 +5215,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -5636,6 +5592,9 @@ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5844,12 +5803,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -6280,7 +6240,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else --- qingy-0.9.7.orig/configure +++ qingy-0.9.7/configure @@ -4286,7 +4286,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -7391,67 +7391,6 @@ test -z "$pic_mode" && pic_mode=default -# Check if we have a version mismatch between libtool.m4 and ltmain.sh. -# -# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. -# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually -# calls AC_LIBTOOL_CONFIG and creates libtool. -# -{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5 -echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; } -if test "x$ltmain" = "x" ; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: - -*** [Gentoo] sanity check failed! *** -*** \$ltmain is not defined, please check the patch for consistency! *** -" >&5 -echo "$as_me: error: - -*** [Gentoo] sanity check failed! *** -*** \$ltmain is not defined, please check the patch for consistency! *** -" >&2;} - { (exit 1); exit 1; }; } -fi -gentoo_lt_version="1.5.26" -gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"` -if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: - -*** [Gentoo] sanity check failed! *** -*** libtool.m4 and ltmain.sh have a version mismatch! *** -*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** - -Please run: - - libtoolize --copy --force - -if appropriate, please contact the maintainer of this -package (or your distribution) for help. -" >&5 -echo "$as_me: error: - -*** [Gentoo] sanity check failed! *** -*** libtool.m4 and ltmain.sh have a version mismatch! *** -*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** - -Please run: - - libtoolize --copy --force - -if appropriate, please contact the maintainer of this -package (or your distribution) for help. -" >&2;} - { (exit 1); exit 1; }; } -else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -fi - - # Use C for the default configuration in the libtool script tagname= lt_save_CC="$CC" @@ -7525,11 +7464,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:7528: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7467: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7532: \$? = $ac_status" >&5 + echo "$as_me:7471: \$? = $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. @@ -7815,11 +7754,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:7818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7757: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7822: \$? = $ac_status" >&5 + echo "$as_me:7761: \$? = $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. @@ -7919,11 +7858,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:7922: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7861: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7926: \$? = $ac_status" >&5 + echo "$as_me:7865: \$? = $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 @@ -8184,12 +8123,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs=no else ld_shlibs=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -8732,7 +8672,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9270,14 +9210,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -9288,12 +9221,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -9456,6 +9383,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -10296,7 +10235,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -12688,7 +12627,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -12797,11 +12736,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:12800: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12739: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12804: \$? = $ac_status" >&5 + echo "$as_me:12743: \$? = $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. @@ -12901,11 +12840,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:12904: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12843: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12908: \$? = $ac_status" >&5 + echo "$as_me:12847: \$? = $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 @@ -12973,6 +12912,9 @@ cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -13246,14 +13188,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -13264,12 +13199,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -13432,6 +13361,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -14497,11 +14438,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:14500: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14441: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14504: \$? = $ac_status" >&5 + echo "$as_me:14445: \$? = $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. @@ -14601,11 +14542,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:14604: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14545: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14608: \$? = $ac_status" >&5 + echo "$as_me:14549: \$? = $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 @@ -14866,12 +14807,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs_F77=no else ld_shlibs_F77=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -15394,7 +15336,7 @@ link_all_deplibs_F77=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -15880,14 +15822,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -15898,12 +15833,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -16066,6 +15995,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -16821,11 +16762,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:16824: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16765: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16828: \$? = $ac_status" >&5 + echo "$as_me:16769: \$? = $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. @@ -17111,11 +17052,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:17114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17055: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17118: \$? = $ac_status" >&5 + echo "$as_me:17059: \$? = $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. @@ -17215,11 +17156,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:17218: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17159: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17222: \$? = $ac_status" >&5 + echo "$as_me:17163: \$? = $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 @@ -17480,12 +17421,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs_GCJ=no else ld_shlibs_GCJ=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -18028,7 +17970,7 @@ link_all_deplibs_GCJ=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -18514,14 +18456,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -18532,12 +18467,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -18700,6 +18629,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no --- qingy-0.9.7.orig/debian/NEWS +++ qingy-0.9.7/debian/NEWS @@ -0,0 +1,19 @@ +qingy (0.9.7-1) unstable; urgency=low + + Qingy uses the files contained in /usr/share/xsessions (.desktop files + provided by window managers) when starting the X Window System. It's also + possible to start other programs using the directory defined as x_sessions + in /etc/qingy/settings (default value: /etc/X11/Sessions). + + Prior to version 0.9.7, if the x_sessions directory didn't exist, qingy + was programmed to create it, write there some files with the data from + /usr/share/xsessions and then use them to start the window manager. + + Version 0.9.7, instead, is straightly able to use .desktop files in + /usr/share/xsessions, so if you update from a prior version, you can easily + remove the x_sessions directory. + I decided to not remove it in an automated manner as perhaps someone is + using this feature (or maybe have changed its value in the configuration + file to /etc/X11). + + -- Riccardo Stagni Mon, 14 Jul 2008 12:32:58 +0200 --- qingy-0.9.7.orig/debian/README.Debian +++ qingy-0.9.7/debian/README.Debian @@ -0,0 +1,32 @@ +qingy for Debian +---------------- + +qingy is a getty replacement, so, to use it as a login manager (that's the +reason why you installed it, I suppose), you have to replace some lines in +the inittab(5) file: + +instead of: +1:2345:respawn:/sbin/getty 38400 tty1 +2:23:respawn:/sbin/getty 38400 tty2 +3:23:respawn:/sbin/getty 38400 tty3 +4:23:respawn:/sbin/getty 38400 tty4 +5:23:respawn:/sbin/getty 38400 tty5 +6:23:respawn:/sbin/getty 38400 tty6 + +you have to use: +1:2345:respawn:/usr/sbin/qingy tty1 +2:23:respawn:/usr/sbin/qingy tty2 +3:23:respawn:/usr/sbin/qingy tty3 +4:23:respawn:/usr/sbin/qingy tty4 +5:23:respawn:/usr/sbin/qingy tty5 +6:23:respawn:/sbin/getty 38400 tty6 + +It's useful leaving at least one terminal with getty, so that in case of +problems or misconfiguration, you have at least one surely working terminal. + + +You also may want to disable any other X login manager (*dm): you could +uninstall the relative package (apt-get remove xdm) or simply disable it +with "update-rc.d xdm remove" + + -- Riccardo Stagni Thu, 10 Jul 2008 16:45:29 +0200 --- qingy-0.9.7.orig/debian/README.source +++ qingy-0.9.7/debian/README.source @@ -0,0 +1,74 @@ +Building qingy for Debian +------------------------- + +Compiled (configure) with: +./configure --disable-crypto --enable-pam --disable-gpm-lock --disable-optimizations + +I moved away from /usr/sbin some programs the user don't need to call by +hand, I have not repackaged the upstream .tar.gz. The .diff.gz is +already updated so you can just apply it and build as usual, but if you +want to recreate the package from scratch, you need to apply the +following patch and call autoreconf. + +### patch begin +diff -pruN qingy-0.9.3ds1.originale/src/DirectFB/Makefile.am qingy-0.9.3ds1/src/DirectFB/Makefile.am +--- qingy-0.9.3ds1.originale/src/DirectFB/Makefile.am 2006-09-11 07:33:16.000000000 +0200 ++++ qingy-0.9.3ds1/src/DirectFB/Makefile.am 2007-01-04 17:39:14.000000000 +0100 +@@ -3,7 +3,8 @@ + INCLUDES = -I../.. -Iobjects -I../ -I../libraries + AM_CFLAGS = @DIRECTFB_CFLAGS@ + +-sbin_PROGRAMS = qingy-DirectFB ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibexec_PROGRAMS = qingy-DirectFB + qingy_DirectFB_SOURCES = \ + objects/screensaver_module.h \ + objects/button.c objects/button.h \ +diff -pruN qingy-0.9.3ds1.originale/src/libraries/load_settings.c qingy-0.9.3ds1/src/libraries/load_settings.c +--- qingy-0.9.3ds1.originale/src/libraries/load_settings.c 2006-10-12 18:54:47.000000000 +0200 ++++ qingy-0.9.3ds1/src/libraries/load_settings.c 2007-01-04 17:03:03.000000000 +0100 +@@ -83,8 +83,8 @@ void initialize_variables(void) + screensavers_dir = NULL; + log_facilities = LOG_NONE; + log_facilities_tty = LOG_NONE; +- dfb_interface = StrApp((char**)NULL, SBINDIR, "qingy-DirectFB", (char*)NULL); +- reset_console_utility = StrApp((char**)NULL, SBINDIR, "qingy-reset-console", (char*)NULL); ++ dfb_interface = StrApp((char**)NULL, LIBEXECDIR, "qingy-DirectFB", (char*)NULL); ++ reset_console_utility = StrApp((char**)NULL, LIBEXECDIR, "qingy-reset-console", (char*)NULL); + tmp_files_dir = strdup("/var/lib/misc"); + max_loglevel = ERROR; + background = NULL; +diff -pruN qingy-0.9.3ds1.originale/src/libraries/Makefile.am qingy-0.9.3ds1/src/libraries/Makefile.am +--- qingy-0.9.3ds1.originale/src/libraries/Makefile.am 2006-07-30 11:42:31.000000000 +0200 ++++ qingy-0.9.3ds1/src/libraries/Makefile.am 2007-01-04 18:11:43.000000000 +0100 +@@ -4,7 +4,8 @@ AM_YFLAGS = -d + INCLUDES = -I../.. -I../ + BUILT_SOURCES = parse_settings.h + +-AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DLIBEXECDIR=\"$(pkglibexecdir)/\" + + if !WANT_STATIC + pkglib_LTLIBRARIES = libqingy.la +diff -pruN qingy-0.9.3ds1.originale/src/Makefile.am qingy-0.9.3ds1/src/Makefile.am +--- qingy-0.9.3ds1.originale/src/Makefile.am 2006-10-12 18:53:50.000000000 +0200 ++++ qingy-0.9.3ds1/src/Makefile.am 2007-01-04 17:39:01.000000000 +0100 +@@ -10,9 +10,11 @@ SUBDIRS += DirectFB + INCLUDES += -IDirectFB + endif + +-sbin_PROGRAMS = qingy qingy-reset-console +-qingy_SOURCES = \ +- qingy_constants.h \ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibexec_PROGRAMS = qingy-reset-console ++sbin_PROGRAMS = qingy ++qingy_SOURCES = \ ++ qingy_constants.h \ + main.c + + qingy_reset_console_SOURCES = \ +### patch end + + -- Riccardo Stagni Thu, 10 Jul 2008 16:45:29 +0200 --- qingy-0.9.7.orig/debian/changelog +++ qingy-0.9.7/debian/changelog @@ -0,0 +1,134 @@ +qingy (0.9.7-2build2) artful; urgency=medium + + * No-change rebuild against libdirectfb-1.7-7 + + -- Steve Langasek Sat, 26 Aug 2017 15:04:17 +0000 + +qingy (0.9.7-2build1) xenial; urgency=medium + + * No-change rebuild for ncurses6 transition. + + -- Matthias Klose Sun, 07 Feb 2016 09:45:12 +0000 + +qingy (0.9.7-2) unstable; urgency=low + + * Added dependency on dpkg | install-info as recommended by Policy + * Removed unneeded /usr/share/info/dir.gz from built package + (Closes: #597410, #579055) + * Added build-dependency on xinit, so configure is able to find its + path (Closes: #549943) + + -- Riccardo Stagni Tue, 19 Oct 2010 01:02:35 +0200 + +qingy (0.9.7-1) unstable; urgency=low + + The "e i disen ch'almost certainly qingy won't be released with lenny" + release. + + * New upstream release + - no longer try to create a directory in /etc/X11 (Closes: #447512) + (added debian/NEWS to explain the change) + * Removed Vcs-* fields as they are meant to contain the location of the + repository used to maintain the package (Closes: #489346) + * Fixed minor errors in package description (Closes: #489348) + (also a gnome/GNOME kde/KDE issue from lintian) + * Updated autogenerated manpage. + * Bumped standards-version to 3.8.0: + - split README.Debian, moving the build instructions in README.source + - added DEB_BUILD_OPTIONS support to debian/rules + + -- Riccardo Stagni Mon, 14 Jul 2008 13:24:23 +0200 + +qingy (0.9.6-2) unstable; urgency=low + + * Added Homepage & Vcs-* fields + * Changed debian/rules so config.{sub,guess} won't be added to the .diff.gz + * Rebuilt against libdirectfb-1.0-0 + * Updated Standards-Version to 3.7.3 (no changes needed) + * Removed useless entry "usr/bin/" from debian/dirs + + -- Riccardo Stagni Sat, 08 Dec 2007 14:46:41 +0100 + +qingy (0.9.6-1) unstable; urgency=low + + * New upstream release (Closes: #411804) + * Upstream removed the non-free font, so we don't need to repackage + * Removed the GFDL copy, since now it's included among the common licenses + * Added watchfile + * Updated help2man-generated manpage + * Modified rules to avoid lintian's debian-rules-ignores-make-clean-error + + -- Riccardo Stagni Tue, 11 Sep 2007 18:49:15 +0200 + +qingy (0.9.3ds1-1) unstable; urgency=low + + * New upstream release + * Updated manpage (and ajusted the section number) + * Moved qingy-DirectFB and qingy-reset-console in right location + (/usr/lib/qingy, not /usr/sbin) + + -- Riccardo Stagni Sun, 14 Jan 2007 15:34:51 +0100 + + +qingy (0.8.0ds1-2) unstable; urgency=low + + * Added GFDL, because isn't in /usr/share/common-licenses and the copyright + file needs to have complete information. + + -- Riccardo Stagni Wed, 9 Aug 2006 13:39:40 +0200 + + +qingy (0.8.0ds1-1) unstable; urgency=low + + * New upstream release + * debian/control: + updated standards version to 3.7.2, no changes required + + -- Riccardo Stagni Sun, 30 Jul 2006 14:42:09 +0200 + + +qingy (0.7.4ds1-2) unstable; urgency=low + + * Forgotten build-dep (libxss-dev) + * Added manpage + + -- Riccardo Stagni Thu, 27 Apr 2006 20:04:30 +0200 + + +qingy (0.7.4ds1-1) unstable; urgency=low + + * Repackaged due to a copyright issue about a font: + the (removed) matrix screensaver uses the matr.ttf font file, that + isn't freely distributable (notified to upstream) + + -- Riccardo Stagni Wed, 19 Apr 2006 19:32:53 +0200 + + +qingy (0.7.4-3) unstable; urgency=low + + * Improved debian/copyright + * Added forgotten build-dependence (x11proto-scrnsaver-dev) + + -- Riccardo Stagni Wed, 19 Apr 2006 18:50:21 +0200 + +qingy (0.7.4-2) unstable; urgency=low + + * Completed copyright file + * Fixed the description + + -- Riccardo Stagni Tue, 11 Apr 2006 22:16:16 +0200 + +qingy (0.7.4-1) unstable; urgency=low + + * New upstream release + * The author of qingy integrated my pam changes + * Added some notes in the README.Debian file + + -- Riccardo Stagni Thu, 6 Apr 2006 00:30:36 +0200 + +qingy (0.7.1-1) unstable; urgency=low + + * Initial release (Closes: #236706, #309672) + + -- Riccardo Stagni Sun, 5 Mar 2006 02:08:53 +0100 + --- qingy-0.9.7.orig/debian/compat +++ qingy-0.9.7/debian/compat @@ -0,0 +1 @@ +4 --- qingy-0.9.7.orig/debian/control +++ qingy-0.9.7/debian/control @@ -0,0 +1,38 @@ +Source: qingy +Section: admin +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Riccardo Stagni +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libdirectfb-dev, libncurses5-dev, libpam0g-dev, pkg-config, x11proto-scrnsaver-dev, libxss-dev, xinit +Standards-Version: 3.8.0 +Homepage: http://qingy.sourceforge.net/ + +Package: qingy +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libdirectfb-extra, dpkg (>= 1.15.4) | install-info +Description: framebuffer-enabled replacement for getty + qingy (Qingy Is Not GettY) is a replacement for getty that uses DirectFB to + provide a fast, nice GUI without the overhead of the X Window System. + It allows the user to log in and start the session of his choice (text + console, GNOME, KDE, WMaker, ...). + . + Main features: + - It works ;-) + - It remembers last user who logged in, with focus on password + - It also rememebers last session each user chose + - Alternatively it remembers last session on a per-tty basis + - Fully themable + - A theme will look the same on all machines, independently of + the resolution + - You can select your favourite theme, or a random one every time + - Both text and X sessions are supported + - You can start more that one X session at once + - You can even start X inside a console when X sessions are already + running + - PAM support + - Support for screen savers + - Auto log-in support + - Session locking support + - tty specific options support + - Customizable key bindings + - Text mode support. --- qingy-0.9.7.orig/debian/copyright +++ qingy-0.9.7/debian/copyright @@ -0,0 +1,74 @@ +This package was debianized by Riccardo Stagni on +Sun, 5 Mar 2006 02:08:53 +0100. + +It was downloaded from http://qingy.sourceforge.net/ + +Upstram authors: +Michele Noberasco +Paolo Gianrossi + +Copyright: +2003-2004 Michele Noberasco, Paolo Gianrossi +2005-2006 Michele Noberasco + + This program 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 program 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 program; if not, write to the + Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +Please see /usr/share/common-licenses/GPL-2 for the full license. + + +Documentation files are (C) 2003 Paolo Gianrossi + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.2 or any later version published by the Free Software + Foundation; with no Invariant Sections, no Front-Cover Texts, and + no Back-Cover Texts. A copy of the license is included in the + section entitled "GNU Free Documentation License". + +Please see /usr/share/common-licenses/GFDL-1.2 for the full license. + + +The decker.ttf comes from the directfb examples file, and it's released +under the MIT license: +Copyright (c) 2000-2002 convergence integrated media GmbH +Copyright (c) 2002 convergence GmbH + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + +Some images are from Login.App (released under GPL 2). Login.App seems to +be disappeared from the Internet, original home page was +http://largo.windowmaker.org/files/Login.app/, but it's still available +on ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/Login.app-2.1.1.tar.gz + +Remaining images are by Michele Noberasco, and are released under GPL. + --- qingy-0.9.7.orig/debian/dirs +++ qingy-0.9.7/debian/dirs @@ -0,0 +1 @@ +usr/sbin --- qingy-0.9.7.orig/debian/docs +++ qingy-0.9.7/debian/docs @@ -0,0 +1,4 @@ +NEWS +README +TODO + --- qingy-0.9.7.orig/debian/qingy.8 +++ qingy-0.9.7/debian/qingy.8 @@ -0,0 +1,52 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH QINGY "8" "July 2008" "qingy 0.9.7" "System Administration Utilities" +.SH NAME +qingy \- Framebuffer-enabled replacement for getty +.SH DESCRIPTION +usage: qinqy [options] +Options: +.HP +\fB\-t\fR, \fB\-\-text\-mode\fR +.IP +Perform a text\-mode login prompt (no graphics). +.HP +\fB\-f\fR , \fB\-\-fb\-device\fR +.IP +Use as framebuffer device. +.HP +\fB\-p\fR, \fB\-\-hide\-password\fR +.IP +Do not show password asterisks. +.HP +\fB\-l\fR, \fB\-\-hide\-lastuser\fR +.IP +Do not display last user name. +.HP +\fB\-d\fR, \fB\-\-disable\-lastuser\fR +.IP +Do not remember last user name. +.HP +\fB\-n\fR, \fB\-\-no\-shutdown\-screen\fR +.IP +Close DirectFB mode before shutting down. +This way you will see system shutdown messages. +.HP +\fB\-r\fR x, \fB\-\-resolution\fR x +.IP +Do not detect framebuffer resolution, use this one instead. +.HP +\fB\-h\fR, \fB\-\-help\fR +.IP +Print this help message. +.SH "SEE ALSO" +The full documentation for +.B qingy +is maintained as a Texinfo manual. If the +.B info +and +.B qingy +programs are properly installed at your site, the command +.IP +.B info qingy +.PP +should give you access to the complete manual. --- qingy-0.9.7.orig/debian/rules +++ qingy-0.9.7/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --disable-crypto --enable-pam --disable-gpm-lock --disable-optimizations --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=\$${exec_prefix}/lib + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/qingy.sgml > qingy.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/qingy. + $(MAKE) DESTDIR=$(CURDIR)/debian/qingy install + + # removing unneeded file, see #597410, #579055 + rm -f $(CURDIR)/debian/qingy/usr/share/info/dir + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install +# dh_installlogrotate +# dh_installpam + dh_installinfo + dh_installman debian/qingy.8 + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- qingy-0.9.7.orig/debian/watch +++ qingy-0.9.7/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://sf.net/qingy/qingy-(.+)\.tar\.bz2 + --- qingy-0.9.7.orig/media/settings +++ qingy-0.9.7/media/settings @@ -0,0 +1,141 @@ +# Directory containing X sessions +x_sessions = "/etc/X11/Sessions/" +# Directory containing text mode sessions +text_sessions = "/etc/qingy/sessions/" +# Directory where qingy should put its temporary files +temp_files_dir = "/var/lib/misc" + +# Full path to the X server +# x_server = "/usr/X11R6/bin/XFree86" +# Full path to the 'xinit' executable +xinit = "/usr/bin/xinit" + +# Parameter we should pass to the X server +x_args = "-nolisten tcp -br" + +# How verbose should qingy be? +# Possible values are debug, error +# Default value is error +log_level = error + +# Where should qingy messages be logged? +# Values can be one or more of the following: +# console, file, syslog +# Default value is console +# log_facilities = console, file +log_facilities = console + +# Offset to search for an available X server number. +# This number affects the DISPLAY env variable. +# Default is 1, setting it to 0 will make buggy OpenGL implementations +# (like the ATI one) work with qingy, but it will also make it impossible +# to start an X server from console using startx without passing it +# extra parameters. +#x_server_offset = 1 + +# Where should we start the X server? +# Accepted values are: +# qingy_tty (default) to start it in the same tty qingy is running in +# unused_tty to start it into an unused tty +x_server_tty = qingy_tty + +# Scripts that should be executed just before/after qingy GUI is fired up/shut down +#pre_gui_script = "/path/to/pre_guiscript.sh" +#post_gui_script = "/path/to/post_gui_script.sh" + +# Where are the screen savers? +screensavers_dir = "/usr/lib/qingy/screensavers" + +# How much should we wait (in minutes) before the screen saver is fired up? +# A value of 0 disables screensaver completely. +screensaver_timeout = 5 + +# How much should we wait (in minutes) before the screen enters power saving mode? +# A value of 0 disables the feature +screen_powersaving_timeout = 30 + +#screensaver "pixel" +screensaver "running_time"#="%H:%S:%M" + +# Where are the themes? +themes_dir = "/usr/share/qingy/themes" + +# What theme do you want (you can also specify 'random') +# theme = random +theme = "default" + +# Who is allowed to shut down the system? +# Allowed options are 'everyone', 'root', 'noone' +# default policy is everyone +# shutdown_policy = everyone + +# How should latest user be calculated? +# global means get latest user that logged in using qingy from whichever tty +# tty means get latest user that logged in using current tty +# none means do not get (and set) latest user +# default policy is global +#last_user_policy = global + +# How should latest user session be calculated? +# user means get last session of each user +# tty means get last session of current tty +# none means do not get (and set) latest session +# default policy is user +#last_session_policy = user + +# What happens when we press the 'sleep' button? +#sleep = "/usr/local/sbin/hibernate" + +# whether we should clear background image during dialogs (default is no)... +# this is the default setting, it gets overridden if the theme you are using +# sets the same setting differently... +# clear_background = yes + +# whether to allow session locking; if you enable this, when you try to +# switch to a qingy-controlled tty whose owner is not your current +# user, you will be asked for the password of that user before being +# allowed to continue. If you are root, of course, you can switch +# to any tty you chose to. Default setting is 'no'. +#lock_sessions = yes + +# whether to allow session timeout; if you enable this, after the amount +# of minutes specified in idle_timeout variable, idle_action will be +# performed. Allowed actions are: +# lock will lock user session asking you for your password +# logout will close your session +#idle_timeout = 30 +#idle_action = lock + +# these options are valid only if qingy is started from tty3 +#tty = 3 +#{ +# theme = "fireplace" +# screensaver "pixel" + +# # Should we auto log in? +# # Totally insecure, but very convenient ;-) +# # Note that this section must be put inside a tty=n{} block +# # Also, if you decide to use this feature, it is better +# # that you also make this settings file readable only by root +# autologin +# { +# username = "myuser" +# password = "mypassword" +# # You can also use 'session=lastsession' to automatically choose last user session +# session = "Text: emacs" +# # if set to 'no', qingy will autologin only once every system restart +# relogin = no +# } +#} + +keybindings +{ + prev_tty = "win" # switch to left tty + next_tty = "menu" # switch to right tty + poweroff = "ALT-p" # shutdown your system + reboot = "ALT-r" # restart your system + screensaver = "ALT-s" # activate screen saver + sleep = "ALT-z" # put machine to sleep +# kill = "CTRL-c" # kill qingy + text_mode = "CTRL-ESC" # Revert to text mode +} --- qingy-0.9.7.orig/src/DirectFB/Makefile.am +++ qingy-0.9.7/src/DirectFB/Makefile.am @@ -3,7 +3,8 @@ INCLUDES = -I../.. -Iobjects -I../ -I../libraries AM_CFLAGS = @DIRECTFB_CFLAGS@ -sbin_PROGRAMS = qingy-DirectFB +pkglibexecdir = $(libexecdir)/@PACKAGE@ +pkglibexec_PROGRAMS = qingy-DirectFB qingy_DirectFB_SOURCES = \ objects/screensaver_module.h \ objects/button.c objects/button.h \ --- qingy-0.9.7.orig/src/DirectFB/Makefile.in +++ qingy-0.9.7/src/DirectFB/Makefile.in @@ -32,7 +32,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -sbin_PROGRAMS = qingy-DirectFB$(EXEEXT) +pkglibexec_PROGRAMS = qingy-DirectFB$(EXEEXT) subdir = src/DirectFB DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -42,9 +42,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" -sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(sbin_PROGRAMS) +am__installdirs = "$(DESTDIR)$(pkglibexecdir)" +pkglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(pkglibexec_PROGRAMS) am_qingy_DirectFB_OBJECTS = button.$(OBJEXT) label.$(OBJEXT) \ textbox.$(OBJEXT) combobox.$(OBJEXT) utils.$(OBJEXT) \ screen_saver.$(OBJEXT) pm.$(OBJEXT) directfb_mode.$(OBJEXT) @@ -208,6 +208,7 @@ top_srcdir = @top_srcdir@ INCLUDES = -I../.. -Iobjects -I../ -I../libraries AM_CFLAGS = @DIRECTFB_CFLAGS@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ qingy_DirectFB_SOURCES = \ objects/screensaver_module.h \ objects/button.c objects/button.h \ @@ -256,30 +257,30 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-sbinPROGRAMS: $(sbin_PROGRAMS) +install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" + @list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibexecdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibexecdir)/$$f" || exit 1; \ else :; fi; \ done -uninstall-sbinPROGRAMS: +uninstall-pkglibexecPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + @list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ - rm -f "$(DESTDIR)$(sbindir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkglibexecdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkglibexecdir)/$$f"; \ done -clean-sbinPROGRAMS: - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ +clean-pkglibexecPROGRAMS: + @list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ @@ -491,7 +492,7 @@ check: check-am all-am: Makefile $(PROGRAMS) installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(pkglibexecdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -520,7 +521,7 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \ +clean-am: clean-generic clean-libtool clean-pkglibexecPROGRAMS \ mostlyclean-am distclean: distclean-am @@ -543,7 +544,7 @@ install-dvi: install-dvi-am -install-exec-am: install-sbinPROGRAMS +install-exec-am: install-pkglibexecPROGRAMS install-html: install-html-am @@ -575,23 +576,23 @@ ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-pkglibexecPROGRAMS .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-sbinPROGRAMS ctags distclean \ + clean-libtool clean-pkglibexecPROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-sbinPROGRAMS install-strip installcheck \ + install-pdf install-pdf-am install-pkglibexecPROGRAMS \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-sbinPROGRAMS + tags uninstall uninstall-am uninstall-pkglibexecPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- qingy-0.9.7.orig/src/Makefile.am +++ qingy-0.9.7/src/Makefile.am @@ -10,9 +10,11 @@ INCLUDES += -IDirectFB endif -sbin_PROGRAMS = qingy qingy-reset-console -qingy_SOURCES = \ - qingy_constants.h \ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +pkglibexec_PROGRAMS = qingy-reset-console +sbin_PROGRAMS = qingy +qingy_SOURCES = \ + qingy_constants.h \ main.c qingy_reset_console_SOURCES = \ --- qingy-0.9.7.orig/src/Makefile.in +++ qingy-0.9.7/src/Makefile.in @@ -34,8 +34,8 @@ host_triplet = @host@ @USE_DIRECTFB_TRUE@am__append_1 = DirectFB @USE_DIRECTFB_TRUE@am__append_2 = -IDirectFB -sbin_PROGRAMS = qingy$(EXEEXT) qingy-reset-console$(EXEEXT) \ - $(am__EXEEXT_1) +pkglibexec_PROGRAMS = qingy-reset-console$(EXEEXT) +sbin_PROGRAMS = qingy$(EXEEXT) $(am__EXEEXT_1) @CRYPTO_LIBGCRYPT_TRUE@am__append_3 = qingy-keygen subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -46,10 +46,11 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(sbindir)" +pkglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @CRYPTO_LIBGCRYPT_TRUE@am__EXEEXT_1 = qingy-keygen$(EXEEXT) -am__installdirs = "$(DESTDIR)$(sbindir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(sbin_PROGRAMS) +PROGRAMS = $(pkglibexec_PROGRAMS) $(sbin_PROGRAMS) am_qingy_OBJECTS = main.$(OBJEXT) qingy_OBJECTS = $(am_qingy_OBJECTS) @WANT_STATIC_FALSE@qingy_DEPENDENCIES = libraries/libqingy.la @@ -240,8 +241,9 @@ DIST_SUBDIRS = libraries DirectFB SUBDIRS = libraries $(am__append_1) INCLUDES = -I.. -Ilibraries $(am__append_2) +pkglibexecdir = $(libexecdir)/@PACKAGE@ qingy_SOURCES = \ - qingy_constants.h \ + qingy_constants.h \ main.c qingy_reset_console_SOURCES = \ @@ -297,6 +299,34 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" + @list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibexecdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibexecdir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-pkglibexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(pkglibexecdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkglibexecdir)/$$f"; \ + done + +clean-pkglibexecPROGRAMS: + @list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @@ -550,7 +580,7 @@ all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(sbindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -579,8 +609,8 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \ - mostlyclean-am +clean-am: clean-generic clean-libtool clean-pkglibexecPROGRAMS \ + clean-sbinPROGRAMS mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) @@ -602,7 +632,7 @@ install-dvi: install-dvi-recursive -install-exec-am: install-sbinPROGRAMS +install-exec-am: install-pkglibexecPROGRAMS install-sbinPROGRAMS install-html: install-html-recursive @@ -634,26 +664,27 @@ ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-pkglibexecPROGRAMS uninstall-sbinPROGRAMS .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ install-strip .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - clean-sbinPROGRAMS ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ + clean-pkglibexecPROGRAMS clean-sbinPROGRAMS ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibexecPROGRAMS install-ps install-ps-am \ install-sbinPROGRAMS install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ - uninstall-sbinPROGRAMS + uninstall-pkglibexecPROGRAMS uninstall-sbinPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- qingy-0.9.7.orig/src/libraries/Makefile.am +++ qingy-0.9.7/src/libraries/Makefile.am @@ -4,7 +4,8 @@ INCLUDES = -I../.. -I../ BUILT_SOURCES = parse_settings.h -AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" +pkglibexecdir = $(libexecdir)/@PACKAGE@ +AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DLIBEXECDIR=\"$(pkglibexecdir)/\" if !WANT_STATIC pkglib_LTLIBRARIES = libqingy.la --- qingy-0.9.7.orig/src/libraries/Makefile.in +++ qingy-0.9.7/src/libraries/Makefile.in @@ -248,7 +248,8 @@ AM_YFLAGS = -d INCLUDES = -I../.. -I../ BUILT_SOURCES = parse_settings.h -AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" +pkglibexecdir = $(libexecdir)/@PACKAGE@ +AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DLIBEXECDIR=\"$(pkglibexecdir)/\" @WANT_STATIC_FALSE@pkglib_LTLIBRARIES = libqingy.la @WANT_STATIC_TRUE@pkglib_LTLIBRARIES = @WANT_STATIC_FALSE@noinst_LTLIBRARIES = --- qingy-0.9.7.orig/src/libraries/load_settings.c +++ qingy-0.9.7/src/libraries/load_settings.c @@ -83,8 +83,8 @@ screensavers_dir = NULL; log_facilities = LOG_NONE; log_facilities_tty = LOG_NONE; - dfb_interface = StrApp((char**)NULL, SBINDIR, "qingy-DirectFB", (char*)NULL); - reset_console_utility = StrApp((char**)NULL, SBINDIR, "qingy-reset-console", (char*)NULL); + dfb_interface = StrApp((char**)NULL, LIBEXECDIR, "qingy-DirectFB", (char*)NULL); + reset_console_utility = StrApp((char**)NULL, LIBEXECDIR, "qingy-reset-console", (char*)NULL); tmp_files_dir = strdup("/var/lib/misc"); max_loglevel = ERROR; x_serv_tty_mgmt = QINGY_TTY; --- qingy-0.9.7.orig/src/libraries/session.c +++ qingy-0.9.7/src/libraries/session.c @@ -276,7 +276,7 @@ dir= opendir(dirname); if (!dir) { - WRITELOG(ERROR, "Unable to open directory \"%s\"\n", dirname); + WRITELOG(DEBUG, "Unable to open directory \"%s\"\n", dirname); if (dirname == x_sessions_directory) { if (sessions) @@ -976,7 +976,10 @@ session_name = add_escapes(mySessions->exec); - args[count] = StrApp(&(args[count]), "/usr/bin/", session_name, " -- ", (char*)NULL); + if (!strncmp(session_name, "/", 1)) + args[count] = StrApp(&(args[count]), session_name, " -- ", (char*)NULL); + else + args[count] = StrApp(&(args[count]), "/usr/bin/", session_name, " -- ", (char*)NULL); free(session_name); } @@ -1043,7 +1046,7 @@ #endif /* clean up standard input, output, error */ - freopen("/dev/null", "r", stdin); + fclose(stdin); freopen(ttyname, "w", stdout); freopen(ttyname, "w", stderr); free(ttyname);