[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-8-15-g3d91cc9
Mirco Bauer
meebey at meebey.net
Tue Jan 3 09:32:55 UTC 2012
The following commit has been merged in the master branch:
commit 75258434eed722fcd6635ffc58c05ba8c980a22a
Author: Mirco Bauer <meebey at meebey.net>
Date: Tue Jan 3 10:10:11 2012 +0100
Imported Upstream version 0.8.9.1
diff --git a/configure b/configure
index 231abec..ea60c2e 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.68 for smuxi 0.8.9.
+# Generated by GNU Autoconf 2.68 for smuxi 0.8.9.1.
#
# Report bugs to <http://www.smuxi.org/issues/new>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='smuxi'
PACKAGE_TARNAME='smuxi'
-PACKAGE_VERSION='0.8.9'
-PACKAGE_STRING='smuxi 0.8.9'
+PACKAGE_VERSION='0.8.9.1'
+PACKAGE_STRING='smuxi 0.8.9.1'
PACKAGE_BUGREPORT='http://www.smuxi.org/issues/new'
PACKAGE_URL=''
@@ -1497,7 +1497,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 smuxi 0.8.9 to adapt to many kinds of systems.
+\`configure' configures smuxi 0.8.9.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1567,7 +1567,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of smuxi 0.8.9:";;
+ short | recursive ) echo "Configuration of smuxi 0.8.9.1:";;
esac
cat <<\_ACEOF
@@ -1764,7 +1764,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-smuxi configure 0.8.9
+smuxi configure 0.8.9.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2042,7 +2042,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 smuxi $as_me 0.8.9, which was
+It was created by smuxi $as_me 0.8.9.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2860,7 +2860,7 @@ fi
# Define the identity of the package.
PACKAGE='smuxi'
- VERSION='0.8.9'
+ VERSION='0.8.9.1'
cat >>confdefs.h <<_ACEOF
@@ -17666,7 +17666,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 smuxi $as_me 0.8.9, which was
+This file was extended by smuxi $as_me 0.8.9.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17723,7 +17723,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="\\
-smuxi config.status 0.8.9
+smuxi config.status 0.8.9.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index d1da1be..0e6f711 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.54])
-AC_INIT([smuxi], [0.8.9], [http://www.smuxi.org/issues/new])
+AC_INIT([smuxi], [0.8.9.1], [http://www.smuxi.org/issues/new])
# using the --foreign option makes automake less strict about GNU policy
AC_CONFIG_MACRO_DIR([.])
AM_INIT_AUTOMAKE([foreign tar-ustar])
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index cc8a222..402a25f 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -129,7 +129,7 @@ install-data-yes: all
done
# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
+dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
install-exec installcheck:
diff --git a/src/Common/Defines.cs b/src/Common/Defines.cs
index 1828932..fb6789b 100644
--- a/src/Common/Defines.cs
+++ b/src/Common/Defines.cs
@@ -27,10 +27,10 @@ namespace Smuxi.Common
public static class Defines
{
public const string GitBranch = "master";
- public const string GitCommitHash = "b771b89";
+ public const string GitCommitHash = "8312f5b";
private static readonly string f_InstallPrefix = "/usr/local";
- private static readonly string f_DistVersion = "master/b771b89";
+ private static readonly string f_DistVersion = "master/8312f5b";
private static readonly string f_TwitterApiKey = "60QV2qQx9cS7y1BJDbgAA|2VgD6qQKddsF5HYQ0TrRgs3tFTnCwDONBmRlTmG658";
public static string InstallPrefix {
diff --git a/src/Frontend-STFL/Makefile.am b/src/Frontend-STFL/Makefile.am
index 5eb8bc7..b6daee1 100644
--- a/src/Frontend-STFL/Makefile.am
+++ b/src/Frontend-STFL/Makefile.am
@@ -65,7 +65,8 @@ RESOURCES = \
MainWindow.stfl
EXTRAS = \
- smuxi-frontend-stfl.in
+ smuxi-frontend-stfl.in \
+ $(ASSEMBLY_CONFIG_SOURCE)
REFERENCES = \
System \
diff --git a/src/Frontend-STFL/Makefile.in b/src/Frontend-STFL/Makefile.in
index d83c919..ad55b3b 100644
--- a/src/Frontend-STFL/Makefile.in
+++ b/src/Frontend-STFL/Makefile.in
@@ -392,7 +392,8 @@ RESOURCES = \
MainWindow.stfl
EXTRAS = \
- smuxi-frontend-stfl.in
+ smuxi-frontend-stfl.in \
+ $(ASSEMBLY_CONFIG_SOURCE)
REFERENCES = \
System \
diff --git a/src/Frontend-STFL/smuxi-frontend-stfl.exe.config b/src/Frontend-STFL/smuxi-frontend-stfl.exe.config
new file mode 100644
index 0000000..ce4f9c4
--- /dev/null
+++ b/src/Frontend-STFL/smuxi-frontend-stfl.exe.config
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <configSections>
+ <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+ </configSections>
+ <log4net>
+ <root>
+ <level value="DEBUG" />
+ <appender-ref ref="RollingFile" />
+ </root>
+ <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+ <file value="smuxi-frontend-stfl.log" />
+ <appendToFile value="true" />
+ <maximumFileSize value="10240KB" />
+ <maxSizeRollBackups value="1" />
+
+ <layout type="log4net.Layout.PatternLayout">
+ <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
+ </layout>
+ </appender>
+ </log4net>
+ <dllmap dll="stfl" target="libstfl.so.0" />
+</configuration>
--
smuxi
More information about the Pkg-cli-apps-commits
mailing list