diff --git a/RELNOTES b/RELNOTES index d61f56e..de5d55a 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,4 @@ -firetools (0.9.71) baseline; urgency=low +firetools (0.9.72) baseline; urgency=low * modif: move hardcoded apps recognized by default in uiapps file * modif: remove sandbox edit dialog and replace it with uiapps file * feature: added uiapps file for default and user apps configuration diff --git a/configure b/configure index 366f1e5..41e9645 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for firetools 0.9.71. +# Generated by GNU Autoconf 2.69 for firetools 0.9.72. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='firetools' PACKAGE_TARNAME='firetools' -PACKAGE_VERSION='0.9.71' -PACKAGE_STRING='firetools 0.9.71' +PACKAGE_VERSION='0.9.72' +PACKAGE_STRING='firetools 0.9.72' PACKAGE_BUGREPORT='netblue30@yahoo.com' PACKAGE_URL='http://firejail.wordpress.com' @@ -1251,7 +1251,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures firetools 0.9.71 to adapt to many kinds of systems. +\`configure' configures firetools 0.9.72 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1313,7 +1313,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of firetools 0.9.71:";; + short | recursive ) echo "Configuration of firetools 0.9.72:";; esac cat <<\_ACEOF @@ -1407,7 +1407,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -firetools configure 0.9.71 +firetools configure 0.9.72 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1747,7 +1747,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by firetools $as_me 0.9.71, which was +It was created by firetools $as_me 0.9.72, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4517,7 +4517,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by firetools $as_me 0.9.71, which was +This file was extended by firetools $as_me 0.9.72, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4571,7 +4571,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -firetools config.status 0.9.71 +firetools config.status 0.9.72 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 98a84c8..0056e97 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.68]) -AC_INIT(firetools, 0.9.71, netblue30@yahoo.com, , http://firejail.wordpress.com) +AC_INIT(firetools, 0.9.72, netblue30@yahoo.com, , http://firejail.wordpress.com) AC_CONFIG_SRCDIR([src/firetools/main.cpp]) #AC_CONFIG_HEADERS([config.h]) diff --git a/mkdeb.sh b/mkdeb.sh index f1744c5..470f225 100755 --- a/mkdeb.sh +++ b/mkdeb.sh @@ -5,9 +5,8 @@ TOP=$(pwd) CODE_ARCHIVE="$1-$2.tar.xz" CODE_DIR="$1-$2" -INSTALL_DIR=$TOP -INSTALL_DIR+="/debian" -DEBIAN_CTRL_DIR=$TOP +INSTALL_DIR="$TOP/debian" +DEBIAN_CTRL_DIR="$TOP/debian/DEBIAN" DEBIAN_CTRL_DIR+="/debian/DEBIAN" echo "*****************************************" @@ -30,7 +29,7 @@ SIZE=$(du -s debian/usr) echo "install size $SIZE" echo "*****************************************" -INSTALL_DIR+="/usr" +INSTALL_DIR="$TOP/debian/usr" mv "$INSTALL_DIR/share/doc/firetools/RELNOTES" "$INSTALL_DIR/share/doc/firetools/changelog.Debian" gzip -9 -n "$INSTALL_DIR/share/doc/firetools/changelog.Debian" diff --git a/src/firetools/applications.cpp b/src/firetools/applications.cpp index 6f199e2..3e44aa0 100644 --- a/src/firetools/applications.cpp +++ b/src/firetools/applications.cpp @@ -216,7 +216,6 @@ int applications_init(const char *fname) { errExit("asprintf"); } -printf("#%s3\n", newfname); FILE *fp = fopen((newfname)? newfname: fname, "r"); if (!fp) return 0; diff --git a/src/fstats/stats_dialog.cpp b/src/fstats/stats_dialog.cpp index 1af23f8..32c39c4 100644 --- a/src/fstats/stats_dialog.cpp +++ b/src/fstats/stats_dialog.cpp @@ -1348,14 +1348,9 @@ void StatsDialog::anchorClicked(const QUrl & link) { QProcess *process = new QProcess(); QStringList arguments; - arguments << "--nofiretools"; +// arguments << "--nofiretools"; process->startDetached(QString("firejail-ui"), arguments); } -// else if (linkstr == "launcher") { -// // start firejail-ui as a separate process -// int rv = system("firetools &"); -// (void) rv; -// } else { // linstr == "home" pid_ = linkstr.toInt(); pid_initialized_ = false;