Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=16ae4bfdc4ad1fce5fef532faa1f23c2cfecb5d9
commit 16ae4bfdc4ad1fce5fef532faa1f23c2cfecb5d9
Author: bouleetbil <bouleet...@frogdev.info>
Date: Wed May 25 23:17:51 2011 +0200
update automake
diff --git a/ChangeLog b/ChangeLog
index 04aacd9..808bfb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-25 gaetan gourdin <bouleet...@frogdev.info>
+
+ * autogen.sh:
+ * Makefile.am:
+ * configure.ac:
+ * expansions.m4:
+ * Packages.mdproj:
+ * Makefile.include:
+ * frugalware-tweak.sln:
+
2011-04-16 gaetan gourdin <bouleet...@frogdev.info>
* Packages.mdproj:
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index b397b23..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-EXTRA_DIST = expansions.m4
-
-#Warning: This is an automatically generated file, do not edit!
-if ENABLE_DEBUG_X86
- SUBDIRS = RSS.NET frugal-irc frugal-mono-tools
-endif
-if ENABLE_RELEASE_X86
- SUBDIRS = RSS.NET frugal-irc frugal-mono-tools
-endif
-if ENABLE_RELEASE
- SUBDIRS = RSS.NET frugal-irc frugal-mono-tools
-endif
diff --git a/Makefile.include b/Makefile.include
index 55daa73..f1ba652 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -84,11 +84,13 @@ endef
# assumes that for a wrapper foo.pc its source template is foo.pc.in
# if $3 is non-empty then wrapper is marked exec
define emit-deploy-wrapper
-$($1): $2
+$($1): $2 $(top_srcdir)/config.make
mkdir -p '$$(shell dirname '$$@')'
cp '$$<' '$$@'
$(if $3,chmod +x '$$@')
+$2: $2.in $(top_srcdir)/config.make
+ sed -e "s,@prefix@,$(prefix)," -e "s,@PACKAGE@,$(PACKAGE)," -e
"s,@expanded_libdir@,$(libdir)," -e "s,@expanded_bindir@,$(bindir)," -e
"s,@expanded_datadir@,$(datadir)," < $2.in > $2
endef
# generating satellite assemblies
diff --git a/Packages.mdproj b/Packages.mdproj
index db86488..9296bb6 100644
--- a/Packages.mdproj
+++ b/Packages.mdproj
@@ -20,6 +20,6 @@
</Package>
</Packages>
</Packages>
- <ReleaseVersion>0.2.4.2</ReleaseVersion>
+ <ReleaseVersion>0.2.5</ReleaseVersion>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/RSS.NET/ChangeLog b/RSS.NET/ChangeLog
index 4a0b1bf..06bbc60 100644
--- a/RSS.NET/ChangeLog
+++ b/RSS.NET/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-25 gaetan gourdin <bouleet...@frogdev.info>
+
+ * Makefile:
+ * Makefile.am:
+ * rss.net.pc.in:
+ * RSS.NET.csproj:
+
2011-03-20 gaetan gourdin <bouleet...@frogdev.info>
* RSS.NET.csproj:
diff --git a/RSS.NET/Makefile b/RSS.NET/Makefile
index 167dd56..f9cf88a 100644
--- a/RSS.NET/Makefile
+++ b/RSS.NET/Makefile
@@ -1,40 +1,153 @@
-CSC = mcs
+EXTRA_DIST = Makefile
-FILES = RssFeed.cs \
- RssModule.cs \
- RssModuleItem.cs \
- RssReader.cs \
- RssWriter.cs \
+# Warning: This is an automatically generated file, do not edit!
+
+srcdir=.
+top_srcdir=..
+
+include $(top_srcdir)/config.make
+
+ifeq ($(CONFIG),DEBUG_X86)
+ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
+ASSEMBLY = bin/Release/RSS.NET.dll
+ASSEMBLY_MDB =
+COMPILE_TARGET = library
+PROJECT_REFERENCES =
+BUILD_DIR = bin/Release/
+
+
+endif
+
+ifeq ($(CONFIG),RELEASE_X86)
+ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
+ASSEMBLY = bin/Release/RSS.NET.dll
+ASSEMBLY_MDB =
+COMPILE_TARGET = library
+PROJECT_REFERENCES =
+BUILD_DIR = bin/Release/
+
+
+endif
+
+ifeq ($(CONFIG),RELEASE)
+ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
+ASSEMBLY = bin/Release/RSS.NET.dll
+ASSEMBLY_MDB =
+COMPILE_TARGET = library
+PROJECT_REFERENCES =
+BUILD_DIR = bin/Release/
+
+
+endif
+
+AL=al2
+SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
+
+LINUX_PKGCONFIG = \
+ $(RSS_NET_PC)
+
+
+RESGEN=resgen2
+
+RSS_NET_PC = $(BUILD_DIR)/rss.net.pc
+
+FILES = \
+ AssemblyInfo.cs \
+ RssFeed.cs \
+ RssModule.cs \
+ RssModuleItem.cs \
+ RssReader.cs \
+ RssWriter.cs \
Collections/ExceptionCollection.cs \
Collections/RssCategoryCollection.cs \
Collections/RssChannelCollection.cs \
Collections/RssFeedCollection.cs \
- Collections/RssItemCollection.cs \
- Collections/RssModuleCollection.cs \
- Collections/RssModuleItemCollection.cs \
- Collections/RssModuleItemCollectionCollection.cs \
- RssChannel/RssChannel.cs \
- RssChannel/RssCloud.cs \
- RssChannel/RssImage.cs \
- RssChannel/RssTextInput.cs \
- RssItem/RssEnclosure.cs \
- RssItem/RssGuid.cs \
- RssItem/RssItem.cs \
- RssItem/RssSource.cs \
+ Collections/RssItemCollection.cs \
+ Collections/RssModuleCollection.cs \
+ Collections/RssModuleItemCollection.cs \
+ Collections/RssModuleItemCollectionCollection.cs \
+ RssChannel/RssChannel.cs \
+ RssChannel/RssCloud.cs \
+ RssChannel/RssImage.cs \
+ RssChannel/RssTextInput.cs \
+ RssItem/RssEnclosure.cs \
+ RssItem/RssGuid.cs \
+ RssItem/RssItem.cs \
+ RssItem/RssSource.cs \
+ RssModules/RssBlogChannel.cs \
+ RssModules/RssCreativeCommon.cs \
RssModules/RssPhotoAlbum.cs \
- Shared/DBBool.cs \
- Shared/RssCategory.cs \
- Shared/RssDefault.cs \
- Shared/RssElement.cs \
- Shared/RssEnumerators.cs
-
-
-
-all:
- $(CSC) /target:library $(FILES) -o RSS.NET.dll
-
-clean:
- rm -f *.exe
- rm -f *.so
- rm -f *.dll
+ Shared/DBBool.cs \
+ Shared/RssCategory.cs \
+ Shared/RssDefault.cs \
+ Shared/RssElement.cs \
+ Shared/RssEnumerators.cs
+
+DATA_FILES =
+
+RESOURCES =
+
+EXTRAS = \
+ rss.net.pc.in
+
+REFERENCES = \
+ System \
+ System.Xml \
+ System.Data
+
+DLL_REFERENCES =
+
+CLEANFILES = $(LINUX_PKGCONFIG)
+
+#Targets
+all: $(ASSEMBLY) $(LINUX_PKGCONFIG) $(top_srcdir)/config.make
+
+include $(top_srcdir)/Makefile.include
+#include $(srcdir)/custom-hooks.make
+
+
+
+$(eval $(call emit-deploy-wrapper,RSS_NET_PC,rss.net.pc))
+
+
+$(eval $(call emit_resgen_targets))
+$(build_xamlg_list): %.xaml.g.cs: %.xaml
+ xamlg '$<'
+
+
+$(ASSEMBLY_MDB): $(ASSEMBLY)
+$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles)
$(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
$(build_satellite_assembly_list)
+ make pre-all-local-hook prefix=$(prefix)
+ mkdir -p $(shell dirname $(ASSEMBLY))
+ make $(CONFIG)_BeforeBuild
+ $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS)
-out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed)
$(build_resources_embed) $(build_references_ref)
+ make $(CONFIG)_AfterBuild
+ make post-all-local-hook prefix=$(prefix)
+
+install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
+ make pre-install-local-hook prefix=$(prefix)
+ make install-satellite-assemblies prefix=$(prefix)
+ mkdir -p '$(DESTDIR)$(libdir)/$(PACKAGE)'
+ $(call cp,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
+ $(call cp,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
+ mkdir -p '$(DESTDIR)$(libdir)/pkgconfig'
+ $(call cp,$(RSS_NET_PC),$(DESTDIR)$(libdir)/pkgconfig)
+ make post-install-local-hook prefix=$(prefix)
+
+uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
+ make pre-uninstall-local-hook prefix=$(prefix)
+ make uninstall-satellite-assemblies prefix=$(prefix)
+ $(call rm,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
+ $(call rm,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
+ $(call rm,$(RSS_NET_PC),$(DESTDIR)$(libdir)/pkgconfig)
+ make post-uninstall-local-hook prefix=$(prefix)
+
+install: install-local
+uninstall: uninstall-local
+clean: clean-local
+
+include $(top_srcdir)/rules.make
diff --git a/RSS.NET/Makefile.am b/RSS.NET/Makefile.am
deleted file mode 100644
index ac28aae..0000000
--- a/RSS.NET/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-
-EXTRA_DIST =
-
-# Warning: This is an automatically generated file, do not edit!
-
-if ENABLE_DEBUG_X86
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug
-define:DEBUG
-ASSEMBLY = bin/Debug/RSS.NET.dll
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
-COMPILE_TARGET = library
-PROJECT_REFERENCES =
-BUILD_DIR = bin/Debug/
-
-RSS_NET_DLL_MDB_SOURCE=bin/Debug/RSS.NET.dll.mdb
-RSS_NET_DLL_MDB=$(BUILD_DIR)/RSS.NET.dll.mdb
-
-endif
-
-if ENABLE_RELEASE_X86
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = bin/Release/RSS.NET.dll
-ASSEMBLY_MDB =
-COMPILE_TARGET = library
-PROJECT_REFERENCES =
-BUILD_DIR = bin/Release/
-
-RSS_NET_DLL_MDB=
-
-endif
-
-if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = bin/Release/RSS.NET.dll
-ASSEMBLY_MDB =
-COMPILE_TARGET = library
-PROJECT_REFERENCES =
-BUILD_DIR = bin/Release/
-
-RSS_NET_DLL_MDB=
-
-endif
-
-AL=al2
-SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
-
-PROGRAMFILES = \
- $(RSS_NET_DLL_MDB)
-
-LINUX_PKGCONFIG = \
- $(RSS_NET_PC)
-
-
-RESGEN=resgen2
-
-all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG)
-
-FILES = \
- AssemblyInfo.cs \
- RssFeed.cs \
- RssModule.cs \
- RssModuleItem.cs \
- RssReader.cs \
- RssWriter.cs \
- Collections/ExceptionCollection.cs \
- Collections/RssCategoryCollection.cs \
- Collections/RssChannelCollection.cs \
- Collections/RssFeedCollection.cs \
- Collections/RssItemCollection.cs \
- Collections/RssModuleCollection.cs \
- Collections/RssModuleItemCollection.cs \
- Collections/RssModuleItemCollectionCollection.cs \
- RssChannel/RssChannel.cs \
- RssChannel/RssCloud.cs \
- RssChannel/RssImage.cs \
- RssChannel/RssTextInput.cs \
- RssItem/RssEnclosure.cs \
- RssItem/RssGuid.cs \
- RssItem/RssItem.cs \
- RssItem/RssSource.cs \
- RssModules/RssBlogChannel.cs \
- RssModules/RssCreativeCommon.cs \
- RssModules/RssPhotoAlbum.cs \
- Shared/DBBool.cs \
- Shared/RssCategory.cs \
- Shared/RssDefault.cs \
- Shared/RssElement.cs \
- Shared/RssEnumerators.cs
-
-DATA_FILES =
-
-RESOURCES =
-
-EXTRAS = \
- rss.net.pc.in
-
-REFERENCES = \
- System \
- System.Xml \
- System.Data
-
-DLL_REFERENCES =
-
-CLEANFILES = $(PROGRAMFILES) $(LINUX_PKGCONFIG)
-
-include $(top_srcdir)/Makefile.include
-
-RSS_NET_PC = $(BUILD_DIR)/rss.net.pc
-
-$(eval $(call emit-deploy-wrapper,RSS_NET_PC,rss.net.pc))
-
-
-$(eval $(call emit_resgen_targets))
-$(build_xamlg_list): %.xaml.g.cs: %.xaml
- xamlg '$<'
-
-$(ASSEMBLY_MDB): $(ASSEMBLY)
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles)
$(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
$(build_satellite_assembly_list)
- mkdir -p $(shell dirname $(ASSEMBLY))
- $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS)
-out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed)
$(build_resources_embed) $(build_references_ref)
diff --git a/RSS.NET/RSS.NET.csproj b/RSS.NET/RSS.NET.csproj
index cecbb8f..a4159ab 100644
--- a/RSS.NET/RSS.NET.csproj
+++ b/RSS.NET/RSS.NET.csproj
@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Rss</RootNamespace>
<AssemblyName>RSS.NET</AssemblyName>
- <ReleaseVersion>0.2.4.2</ReleaseVersion>
+ <ReleaseVersion>0.2.5</ReleaseVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/RSS.NET/rss.net.pc.in b/RSS.NET/rss.net.pc.in
index 24e92d4..81e2c8f 100644
--- a/RSS.NET/rss.net.pc.in
+++ b/RSS.NET/rss.net.pc.in
@@ -1,6 +1,6 @@
Name: RSS.NET
Description: RSS.NET
-Version: 0.2.4
+Version: 0.2.5
Requires:
Libs: -r:@expanded_libdir@/@PACKAGE@/RSS.NET.dll
diff --git a/Traduction/ChangeLog b/Traduction/ChangeLog
index 4140e2f..73d617b 100644
--- a/Traduction/ChangeLog
+++ b/Traduction/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-25 gaetan gourdin <bouleet...@frogdev.info>
+
+ * Traduction.mdproj:
+
2011-03-20 gaetan gourdin <bouleet...@frogdev.info>
* ChangeLog:
diff --git a/Traduction/Traduction.mdproj b/Traduction/Traduction.mdproj
index 2db14d0..6165628 100644
--- a/Traduction/Traduction.mdproj
+++ b/Traduction/Traduction.mdproj
@@ -14,7 +14,7 @@
</translations>
</translations>
<packageName>i8n1</packageName>
- <ReleaseVersion>0.2.4.2</ReleaseVersion>
+ <ReleaseVersion>0.2.5</ReleaseVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</PropertyGroup>
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index edf88cf..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-
-PROJECT=frugalware-tweak
-FILE=
-CONFIGURE=configure.ac
-
-: ${AUTOCONF=autoconf}
-: ${AUTOHEADER=autoheader}
-: ${AUTOMAKE=automake}
-: ${LIBTOOLIZE=libtoolize}
-: ${ACLOCAL=aclocal}
-: ${LIBTOOL=libtool}
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-TEST_TYPE=-f
-aclocalinclude="-I . $ACLOCAL_FLAGS"
-
-DIE=0
-
-($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have autoconf installed to compile $PROJECT."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
- DIE=1
-}
-
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have automake installed to compile $PROJECT."
- echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz";
- echo "(or a newer version if it is available)"
- DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
- ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' installed to compile $PROJECT."
- echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz";
- echo "(or a newer version if it is available)"
- DIE=1
- }
-}
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-#test $TEST_TYPE $FILE || {
-# echo "You must run this script in the top-level $PROJECT directory"
-# exit 1
-#}
-
-if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
- echo "Running $LIBTOOLIZE ..."
- $LIBTOOLIZE --force --copy
-}
-
-echo "Running $ACLOCAL $aclocalinclude ..."
-$ACLOCAL $aclocalinclude
-
-echo "Running $AUTOMAKE --gnu $am_opt ..."
-$AUTOMAKE --add-missing --gnu $am_opt
-
-echo "Running $AUTOCONF ..."
-$AUTOCONF
-
-echo Running $srcdir/configure $conf_flags "$@" ...
-$srcdir/configure --enable-maintainer-mode $conf_flags "$@" \
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index d7dda64..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,81 +0,0 @@
-dnl Warning: This is an automatically generated file, do not edit!
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.54])
-AC_INIT([frugalware-tweak], [0.2.4])
-AM_INIT_AUTOMAKE([foreign])
-AM_MAINTAINER_MODE
-
-dnl pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
- AC_MSG_ERROR([You need to install pkg-config])
-fi
-
-SHAMROCK_EXPAND_LIBDIR
-SHAMROCK_EXPAND_BINDIR
-SHAMROCK_EXPAND_DATADIR
-
-AC_PROG_INSTALL
-
-AC_PATH_PROG(GMCS, gmcs, no)
-if test "x$GMCS" = "xno"; then
- AC_MSG_ERROR([gmcs Not found])
-fi
-
-
-AC_ARG_ENABLE(debug_x86,
- AC_HELP_STRING([--enable-debug_x86],
- [Use 'DEBUG_X86' Configuration [default=NO]]),
- enable_debug_x86=yes, enable_debug_x86=no)
-AM_CONDITIONAL(ENABLE_DEBUG_X86, test x$enable_debug_x86 = xyes)
-if test "x$enable_debug_x86" = "xyes" ; then
- CONFIG_REQUESTED="yes"
-fi
-AC_ARG_ENABLE(release_x86,
- AC_HELP_STRING([--enable-release_x86],
- [Use 'RELEASE_X86' Configuration [default=NO]]),
- enable_release_x86=yes, enable_release_x86=no)
-AM_CONDITIONAL(ENABLE_RELEASE_X86, test x$enable_release_x86 = xyes)
-if test "x$enable_release_x86" = "xyes" ; then
- CONFIG_REQUESTED="yes"
-fi
-AC_ARG_ENABLE(release,
- AC_HELP_STRING([--enable-release],
- [Use 'RELEASE' Configuration [default=YES]]),
- enable_release=yes, enable_release=no)
-AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes)
-if test "x$enable_release" = "xyes" ; then
- CONFIG_REQUESTED="yes"
-fi
-if test -z "$CONFIG_REQUESTED" ; then
- AM_CONDITIONAL(ENABLE_RELEASE, true)
- enable_release=yes
-fi
-
-
-dnl package checks, common for all configs
-PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
-PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
-PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
-PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net])
-PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
-PKG_CHECK_MODULES([WEBKIT_SHARP_10], [webkit-sharp-1.0])
-PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-1.0])
-PKG_CHECK_MODULES([INDICATE_GTK_SHARP_01], [indicate-gtk-sharp-0.1])
-PKG_CHECK_MODULES([INDICATE_SHARP_01], [indicate-sharp-0.1])
-
-dnl package checks, per config
-
-
-AC_CONFIG_FILES([
-RSS.NET/rss.net.pc
-RSS.NET/Makefile
-frugal-irc/frugalware-irc
-frugal-irc/Makefile
-frugal-mono-tools/frugalware-tweak
-frugal-mono-tools/Makefile
-Makefile
-
-])
-
-AC_OUTPUT
diff --git a/expansions.m4 b/expansions.m4
deleted file mode 100644
index ba62356..0000000
--- a/expansions.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-AC_DEFUN([SHAMROCK_EXPAND_LIBDIR],
-[
- expanded_libdir=`(
- case $prefix in
- NONE) prefix=$ac_default_prefix ;;
- *) ;;
- esac
- case $exec_prefix in
- NONE) exec_prefix=$prefix ;;
- *) ;;
- esac
- eval echo $libdir
- )`
- AC_SUBST(expanded_libdir)
-])
-
-AC_DEFUN([SHAMROCK_EXPAND_BINDIR],
-[
- expanded_bindir=`(
- case $prefix in
- NONE) prefix=$ac_default_prefix ;;
- *) ;;
- esac
- case $exec_prefix in
- NONE) exec_prefix=$prefix ;;
- *) ;;
- esac
- eval echo $bindir
- )`
- AC_SUBST(expanded_bindir)
-])
-
-AC_DEFUN([SHAMROCK_EXPAND_DATADIR],
-[
- case $prefix in
- NONE) prefix=$ac_default_prefix ;;
- *) ;;
- esac
-
- case $exec_prefix in
- NONE) exec_prefix=$prefix ;;
- *) ;;
- esac
-
- expanded_datadir=`(eval echo $datadir)`
- expanded_datadir=`(eval echo $expanded_datadir)`
-
- AC_SUBST(expanded_datadir)
-])
-
diff --git a/frugal-irc/ChangeLog b/frugal-irc/ChangeLog
index 2529202..125a658 100644
--- a/frugal-irc/ChangeLog
+++ b/frugal-irc/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-25 gaetan gourdin <bouleet...@frogdev.info>
+
+ * Makefile.am:
+ * frugal-irc.csproj:
+ * generated.cs:
+ * MainWindow.cs:
+
2011-03-20 gaetan gourdin <bouleet...@frogdev.info>
* frugal-irc.csproj:
diff --git a/frugal-irc/Makefile.am b/frugal-irc/Makefile.am
deleted file mode 100644
index 32347c5..0000000
--- a/frugal-irc/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-
-EXTRA_DIST =
-
-# Warning: This is an automatically generated file, do not edit!
-
-if ENABLE_DEBUG_X86
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug
"-define:DEBUG"
-ASSEMBLY = bin/Debug/frugal-irc.exe
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
-COMPILE_TARGET = winexe
-PROJECT_REFERENCES =
-BUILD_DIR = bin/Debug
-
-FRUGAL_IRC_EXE_MDB_SOURCE=bin/Debug/frugal-irc.exe.mdb
-FRUGAL_IRC_EXE_MDB=$(BUILD_DIR)/frugal-irc.exe.mdb
-
-endif
-
-if ENABLE_RELEASE_X86
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = bin/Release/frugal-irc.exe
-ASSEMBLY_MDB =
-COMPILE_TARGET = winexe
-PROJECT_REFERENCES =
-BUILD_DIR = bin/Release
-
-FRUGAL_IRC_EXE_MDB=
-
-endif
-
-if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = bin/Release/frugal-irc.exe
-ASSEMBLY_MDB =
-COMPILE_TARGET = winexe
-PROJECT_REFERENCES =
-BUILD_DIR = bin/Release
-
-FRUGAL_IRC_EXE_MDB=
-
-endif
-
-AL=al2
-SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
-
-PROGRAMFILES = \
- $(FRUGAL_IRC_EXE_MDB)
-
-BINARIES = \
- $(FRUGALWARE_IRC)
-
-
-RESGEN=resgen2
-
-all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
-
-FILES = \
- gtk-gui/generated.cs \
- MainWindow.cs \
- gtk-gui/MainWindow.cs \
- Main.cs \
- AssemblyInfo.cs \
- IconSummaryBody.cs
-
-DATA_FILES =
-
-RESOURCES = \
- gtk-gui/gui.stetic \
- ../frugal-mono-tools/Pictures/header.svg,frugalirc.header.svg \
- ../frugal-mono-tools/Pictures/fw.png,frugalirc.fw.png \
- ../frugal-mono-tools/Pictures/fw-mini.png,frugalirc.fw-mini.png \
- ../frugal-mono-tools/Pictures/systray.png,frugalirc.systray.png
-
-EXTRAS = \
- frugalware-irc.in
-
-REFERENCES = \
- System \
- Mono.Posix \
- $(GTK_SHARP_20_LIBS) \
- $(GLIB_SHARP_20_LIBS) \
- $(GLADE_SHARP_20_LIBS) \
- $(SMARTIRC4NET_LIBS) \
- $(NOTIFY_SHARP_LIBS)
-
-DLL_REFERENCES =
-
-CLEANFILES = $(PROGRAMFILES) $(BINARIES)
-
-include $(top_srcdir)/Makefile.include
-
-FRUGALWARE_IRC = $(BUILD_DIR)/frugalware-irc
-
-$(eval $(call emit-deploy-wrapper,FRUGALWARE_IRC,frugalware-irc,x))
-
-
-$(eval $(call emit_resgen_targets))
-$(build_xamlg_list): %.xaml.g.cs: %.xaml
- xamlg '$<'
-
-$(ASSEMBLY_MDB): $(ASSEMBLY)
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles)
$(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
$(build_satellite_assembly_list)
- mkdir -p $(shell dirname $(ASSEMBLY))
- $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS)
-out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed)
$(build_resources_embed) $(build_references_ref)
diff --git a/frugal-irc/frugal-irc.csproj b/frugal-irc/frugal-irc.csproj
index 19458b3..1d220d3 100644
--- a/frugal-irc/frugal-irc.csproj
+++ b/frugal-irc/frugal-irc.csproj
@@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>frugalirc</RootNamespace>
<AssemblyName>frugal-irc</AssemblyName>
- <ReleaseVersion>0.2.4.2</ReleaseVersion>
+ <ReleaseVersion>0.2.5</ReleaseVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
diff --git a/frugal-irc/gtk-gui/MainWindow.cs b/frugal-irc/gtk-gui/MainWindow.cs
index 273661c..bbad12d 100644
--- a/frugal-irc/gtk-gui/MainWindow.cs
+++ b/frugal-irc/gtk-gui/MainWindow.cs
@@ -4,41 +4,24 @@
public partial class MainWindow
{
private global::Gtk.HBox hbox1;
-
private global::Gtk.VBox vbox2;
-
private global::Gtk.VBox vbox3;
-
private global::Gtk.Entry SAI_Serveur;
-
private global::Gtk.Entry SAI_Chan;
-
private global::Gtk.HBox hbox3;
-
private global::Gtk.Entry SAI_Port;
-
private global::Gtk.Entry SAI_User;
-
private global::Gtk.Button BTN_Connect;
-
private global::Gtk.ScrolledWindow GtkScrolledWindow1;
-
private global::Gtk.TextView TXT_Messages;
-
private global::Gtk.HBox hbox2;
-
private global::Gtk.Entry SAI_Envoi;
-
private global::Gtk.Button BTN_Send;
-
private global::Gtk.VBox vbox1;
-
private global::Gtk.Image image1;
-
private global::Gtk.ScrolledWindow GtkScrolledWindow;
-
private global::Gtk.TreeView TREE_Users;
-
+
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
@@ -69,7 +52,7 @@ public partial class MainWindow
this.SAI_Serveur.IsEditable = false;
this.SAI_Serveur.InvisibleChar = 'â¢';
this.vbox3.Add (this.SAI_Serveur);
- global::Gtk.Box.BoxChild w1 =
((global::Gtk.Box.BoxChild)(this.vbox3[this.SAI_Serveur]));
+ global::Gtk.Box.BoxChild w1 =
((global::Gtk.Box.BoxChild)(this.vbox3 [this.SAI_Serveur]));
w1.Position = 0;
w1.Expand = false;
w1.Fill = false;
@@ -81,7 +64,7 @@ public partial class MainWindow
this.SAI_Chan.IsEditable = false;
this.SAI_Chan.InvisibleChar = 'â¢';
this.vbox3.Add (this.SAI_Chan);
- global::Gtk.Box.BoxChild w2 =
((global::Gtk.Box.BoxChild)(this.vbox3[this.SAI_Chan]));
+ global::Gtk.Box.BoxChild w2 =
((global::Gtk.Box.BoxChild)(this.vbox3 [this.SAI_Chan]));
w2.Position = 1;
w2.Expand = false;
w2.Fill = false;
@@ -98,7 +81,7 @@ public partial class MainWindow
this.SAI_Port.MaxLength = 4;
this.SAI_Port.InvisibleChar = 'â¢';
this.hbox3.Add (this.SAI_Port);
- global::Gtk.Box.BoxChild w3 =
((global::Gtk.Box.BoxChild)(this.hbox3[this.SAI_Port]));
+ global::Gtk.Box.BoxChild w3 =
((global::Gtk.Box.BoxChild)(this.hbox3 [this.SAI_Port]));
w3.Position = 0;
w3.Expand = false;
// Container child hbox3.Gtk.Box+BoxChild
@@ -109,7 +92,7 @@ public partial class MainWindow
this.SAI_User.IsEditable = false;
this.SAI_User.InvisibleChar = 'â¢';
this.hbox3.Add (this.SAI_User);
- global::Gtk.Box.BoxChild w4 =
((global::Gtk.Box.BoxChild)(this.hbox3[this.SAI_User]));
+ global::Gtk.Box.BoxChild w4 =
((global::Gtk.Box.BoxChild)(this.hbox3 [this.SAI_User]));
w4.Position = 1;
// Container child hbox3.Gtk.Box+BoxChild
this.BTN_Connect = new global::Gtk.Button ();
@@ -118,17 +101,17 @@ public partial class MainWindow
this.BTN_Connect.UseUnderline = true;
this.BTN_Connect.Label = global::Mono.Unix.Catalog.GetString ("Connect");
this.hbox3.Add (this.BTN_Connect);
- global::Gtk.Box.BoxChild w5 =
((global::Gtk.Box.BoxChild)(this.hbox3[this.BTN_Connect]));
+ global::Gtk.Box.BoxChild w5 =
((global::Gtk.Box.BoxChild)(this.hbox3 [this.BTN_Connect]));
w5.Position = 2;
w5.Expand = false;
w5.Fill = false;
this.vbox3.Add (this.hbox3);
- global::Gtk.Box.BoxChild w6 =
((global::Gtk.Box.BoxChild)(this.vbox3[this.hbox3]));
+ global::Gtk.Box.BoxChild w6 =
((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox3]));
w6.Position = 2;
w6.Expand = false;
w6.Fill = false;
this.vbox2.Add (this.vbox3);
- global::Gtk.Box.BoxChild w7 =
((global::Gtk.Box.BoxChild)(this.vbox2[this.vbox3]));
+ global::Gtk.Box.BoxChild w7 =
((global::Gtk.Box.BoxChild)(this.vbox2 [this.vbox3]));
w7.Position = 0;
w7.Expand = false;
w7.Fill = false;
@@ -143,7 +126,7 @@ public partial class MainWindow
this.TXT_Messages.Editable = false;
this.GtkScrolledWindow1.Add (this.TXT_Messages);
this.vbox2.Add (this.GtkScrolledWindow1);
- global::Gtk.Box.BoxChild w9 =
((global::Gtk.Box.BoxChild)(this.vbox2[this.GtkScrolledWindow1]));
+ global::Gtk.Box.BoxChild w9 =
((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow1]));
w9.Position = 1;
// Container child vbox2.Gtk.Box+BoxChild
this.hbox2 = new global::Gtk.HBox ();
@@ -156,7 +139,7 @@ public partial class MainWindow
this.SAI_Envoi.IsEditable = true;
this.SAI_Envoi.InvisibleChar = 'â¢';
this.hbox2.Add (this.SAI_Envoi);
- global::Gtk.Box.BoxChild w10 =
((global::Gtk.Box.BoxChild)(this.hbox2[this.SAI_Envoi]));
+ global::Gtk.Box.BoxChild w10 =
((global::Gtk.Box.BoxChild)(this.hbox2 [this.SAI_Envoi]));
w10.Position = 0;
// Container child hbox2.Gtk.Box+BoxChild
this.BTN_Send = new global::Gtk.Button ();
@@ -165,17 +148,17 @@ public partial class MainWindow
this.BTN_Send.UseUnderline = true;
this.BTN_Send.Label = global::Mono.Unix.Catalog.GetString ("_Send");
this.hbox2.Add (this.BTN_Send);
- global::Gtk.Box.BoxChild w11 =
((global::Gtk.Box.BoxChild)(this.hbox2[this.BTN_Send]));
+ global::Gtk.Box.BoxChild w11 =
((global::Gtk.Box.BoxChild)(this.hbox2 [this.BTN_Send]));
w11.Position = 1;
w11.Expand = false;
w11.Fill = false;
this.vbox2.Add (this.hbox2);
- global::Gtk.Box.BoxChild w12 =
((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox2]));
+ global::Gtk.Box.BoxChild w12 =
((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
w12.Position = 2;
w12.Expand = false;
w12.Fill = false;
this.hbox1.Add (this.vbox2);
- global::Gtk.Box.BoxChild w13 =
((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox2]));
+ global::Gtk.Box.BoxChild w13 =
((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2]));
w13.Position = 0;
// Container child hbox1.Gtk.Box+BoxChild
this.vbox1 = new global::Gtk.VBox ();
@@ -186,7 +169,7 @@ public partial class MainWindow
this.image1.Name = "image1";
this.image1.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("frugalirc.fw.png");
this.vbox1.Add (this.image1);
- global::Gtk.Box.BoxChild w14 =
((global::Gtk.Box.BoxChild)(this.vbox1[this.image1]));
+ global::Gtk.Box.BoxChild w14 =
((global::Gtk.Box.BoxChild)(this.vbox1 [this.image1]));
w14.Position = 0;
w14.Expand = false;
w14.Fill = false;
@@ -200,10 +183,10 @@ public partial class MainWindow
this.TREE_Users.Name = "TREE_Users";
this.GtkScrolledWindow.Add (this.TREE_Users);
this.vbox1.Add (this.GtkScrolledWindow);
- global::Gtk.Box.BoxChild w16 =
((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkScrolledWindow]));
+ global::Gtk.Box.BoxChild w16 =
((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkScrolledWindow]));
w16.Position = 1;
this.hbox1.Add (this.vbox1);
- global::Gtk.Box.BoxChild w17 =
((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox1]));
+ global::Gtk.Box.BoxChild w17 =
((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox1]));
w17.Position = 1;
w17.Expand = false;
w17.Fill = false;
diff --git a/frugal-irc/gtk-gui/generated.cs b/frugal-irc/gtk-gui/generated.cs
index 8463caa..4e5b605 100644
--- a/frugal-irc/gtk-gui/generated.cs
+++ b/frugal-irc/gtk-gui/generated.cs
@@ -5,22 +5,22 @@ namespace Stetic
internal class Gui
{
private static bool initialized;
-
- static internal void Initialize (Gtk.Widget iconRenderer)
+
+ internal static void Initialize (Gtk.Widget iconRenderer)
{
if ((Stetic.Gui.initialized == false)) {
Stetic.Gui.initialized = true;
}
}
}
-
+
internal class ActionGroups
{
public static Gtk.ActionGroup GetActionGroup (System.Type type)
{
return Stetic.ActionGroups.GetActionGroup (type.FullName);
}
-
+
public static Gtk.ActionGroup GetActionGroup (string name)
{
return null;
diff --git a/frugal-mono-tools/ChangeLog b/frugal-mono-tools/ChangeLog
index 83350ca..391d217 100644
--- a/frugal-mono-tools/ChangeLog
+++ b/frugal-mono-tools/ChangeLog
@@ -1,5 +1,12 @@
2011-05-25 gaetan gourdin <bouleet...@frogdev.info>
+ * Makefile.am:
+ * WID_Notes.cs:
+ * gui.stetic:
+ * frugal-mono-tools.csproj:
+
+2011-05-25 gaetan gourdin <bouleet...@frogdev.info>
+
* frugal-mono-tools.csproj:
2011-05-25 gaetan gourdin <bouleet...@frogdev.info>
diff --git a/frugal-mono-tools/Makefile.am b/frugal-mono-tools/Makefile.am
deleted file mode 100644
index ba52282..0000000
--- a/frugal-mono-tools/Makefile.am
+++ /dev/null
@@ -1,238 +0,0 @@
-
-EXTRA_DIST =
-
-# Warning: This is an automatically generated file, do not edit!
-
-if ENABLE_DEBUG_X86
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug
"-define:DEBUG"
-ASSEMBLY = bin/Debug/frugal-mono-tools.exe
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
-COMPILE_TARGET = winexe
-PROJECT_REFERENCES = \
- ../RSS.NET/bin/Debug/RSS.NET.dll
-BUILD_DIR = bin/Debug
-
-FRUGAL_MONO_TOOLS_EXE_MDB_SOURCE=bin/Debug/frugal-mono-tools.exe.mdb
-FRUGAL_MONO_TOOLS_EXE_MDB=$(BUILD_DIR)/frugal-mono-tools.exe.mdb
-RSS_NET_DLL_SOURCE=../RSS.NET/bin/Debug/RSS.NET.dll
-RSS_NET_DLL_MDB_SOURCE=../RSS.NET/bin/Debug/RSS.NET.dll.mdb
-RSS_NET_DLL_MDB=$(BUILD_DIR)/RSS.NET.dll.mdb
-
-endif
-
-if ENABLE_RELEASE_X86
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = bin/Release/frugal-mono-tools.exe
-ASSEMBLY_MDB =
-COMPILE_TARGET = winexe
-PROJECT_REFERENCES = \
- ../RSS.NET/bin/Release/RSS.NET.dll
-BUILD_DIR = bin/Release
-
-FRUGAL_MONO_TOOLS_EXE_MDB=
-RSS_NET_DLL_SOURCE=../RSS.NET/bin/Debug/RSS.NET.dll
-RSS_NET_DLL_MDB_SOURCE=../RSS.NET/bin/Debug/RSS.NET.dll.mdb
-RSS_NET_DLL_MDB=$(BUILD_DIR)/RSS.NET.dll.mdb
-
-endif
-
-if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = bin/Release/frugal-mono-tools.exe
-ASSEMBLY_MDB =
-COMPILE_TARGET = winexe
-PROJECT_REFERENCES = \
- ../RSS.NET/bin/Release/RSS.NET.dll
-BUILD_DIR = bin/Release
-
-FRUGAL_MONO_TOOLS_EXE_MDB=
-RSS_NET_DLL_SOURCE=../RSS.NET/bin/Release/RSS.NET.dll
-RSS_NET_DLL_MDB=
-
-endif
-
-AL=al2
-SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
-
-PROGRAMFILES = \
- $(FRUGAL_MONO_TOOLS_EXE_MDB) \
- $(RSS_NET_DLL) \
- $(RSS_NET_DLL_MDB)
-
-BINARIES = \
- $(FRUGALWARE_TWEAK)
-
-
-RESGEN=resgen2
-
-all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
-
-FILES = \
- gtk-gui/generated.cs \
- Main.cs \
- AssemblyInfo.cs \
- Debug.cs \
- FEN_Debug.cs \
- gtk-gui/frugalmonotools.FEN_Debug.cs \
- OUTILS/Outils.cs \
- PacmanG2.cs \
- Update.cs \
- IconSummaryBody.cs \
- splash.cs \
- gtk-gui/frugalmonotools.splash.cs \
- Configuration.cs \
- Service.cs \
- Services.cs \
- WebkitBrowser.cs \
- ConfSystem.cs \
- Xorg.cs \
- Fen_Menu.cs \
- gtk-gui/frugalmonotools.Fen_Menu.cs \
- WID_Pkg.cs \
- gtk-gui/frugalmonotools.WID_Pkg.cs \
- WID_Xorg.cs \
- gtk-gui/frugalmonotools.WID_Xorg.cs \
- WID_Update.cs \
- gtk-gui/frugalmonotools.WID_Update.cs \
- WID_System.cs \
- gtk-gui/frugalmonotools.WID_System.cs \
- WID_Hardware.cs \
- gtk-gui/frugalmonotools.WID_Hardware.cs \
- WID_Services.cs \
- gtk-gui/frugalmonotools.WID_Services.cs \
- WID_Network.cs \
- gtk-gui/frugalmonotools.WID_Network.cs \
- WID_LoginManager.cs \
- gtk-gui/frugalmonotools.WID_LoginManager.cs \
- WID_Support.cs \
- gtk-gui/frugalmonotools.WID_Support.cs \
- WID_News.cs \
- gtk-gui/frugalmonotools.WID_News.cs \
- WID_Config.cs \
- gtk-gui/frugalmonotools.WID_Config.cs \
- gtk-gui/frugalmonotools.WID_About.cs \
- WID_About.cs \
- WID_UpdateConf.cs \
- gtk-gui/frugalmonotools.WID_UpdateConf.cs \
- WID_Logs.cs \
- gtk-gui/frugalmonotools.WID_Logs.cs \
- WID_Grub.cs \
- gtk-gui/frugalmonotools.WID_Grub.cs \
- Grub.cs \
- DiagGrub.cs \
- gtk-gui/frugalmonotools.DiagGrub.cs \
- WID_DateTime.cs \
- gtk-gui/frugalmonotools.WID_DateTime.cs \
- Group.cs \
- User.cs \
- Groups.cs \
- Pictures/WID_Users.cs \
- gtk-gui/frugalmonotools.WID_Users.cs \
- MessageBox.cs \
- gtk-gui/frugalmonotools.MessageBox.cs \
- WID_Notes.cs \
- gtk-gui/frugalmonotools.WID_Notes.cs \
- FrugalNote.cs \
- Systemd.cs \
- Objects/Download.cs \
- Objects/Message.cs \
- Objects/Personne.cs \
- Objects/StringExtension.cs \
- Objects/XmlParser.cs \
- Twitter/IdentiObject.cs \
- Twitter/TwitterObject.cs \
- Twitter/Conf.cs \
- Twitter/GUI/TreeMessage.cs \
- Twitter/GUI/WID_Identi.cs \
- gtk-gui/frugalmonotools.WID_Identi.cs
-
-DATA_FILES =
-
-RESOURCES = \
- gtk-gui/gui.stetic \
- Pictures/fw.png,frugalmonotools.Pictures.fw.png \
- Pictures/gnomelogo.png,frugalmonotools.Pictures.gnomelogo.png \
- Pictures/header.svg,frugalmonotools.Pictures.header.svg \
- Pictures/kdelogo.png,frugalmonotools.Pictures.kdelogo.png \
- Pictures/lxdelogo.png,frugalmonotools.Pictures.lxdelogo.png \
- Pictures/splash.png,frugalmonotools.Pictures.splash.png \
- Pictures/nmlogo.png,frugalmonotools.Pictures.nmlogo.png \
- Pictures/systray.png,frugalmonotools.Pictures.systray.png \
- Pictures/systrayupdate.png,frugalmonotools.Pictures.systrayupdate.png \
- Pictures/wicdlogo.png,frugalmonotools.Pictures.wicdlogo.png \
- Pictures/xfcelogo.png,frugalmonotools.Pictures.xfcelogo.png \
- Pictures/xorglogo.png,frugalmonotools.Pictures.xorglogo.png \
- Pictures/fw-mini.png,frugalmonotools.Pictures.fw-mini.png \
- Pictures/icons/about.png,frugalmonotools.Pictures.icons.about.png \
-
Pictures/icons/configurations.png,frugalmonotools.Pictures.icons.configurations.png
\
- Pictures/icons/hardware.png,frugalmonotools.Pictures.icons.hardware.png
\
-
Pictures/icons/loginmanager.png,frugalmonotools.Pictures.icons.loginmanager.png
\
- Pictures/icons/network.png,frugalmonotools.Pictures.icons.network.png \
- Pictures/icons/news.png,frugalmonotools.Pictures.icons.news.png \
- Pictures/icons/packages.png,frugalmonotools.Pictures.icons.packages.png
\
- Pictures/icons/services.png,frugalmonotools.Pictures.icons.services.png
\
- Pictures/icons/support.png,frugalmonotools.Pictures.icons.support.png \
- Pictures/icons/system.png,frugalmonotools.Pictures.icons.system.png \
- Pictures/icons/xorg.png,frugalmonotools.Pictures.icons.xorg.png \
- Pictures/icons/update.png,frugalmonotools.Pictures.icons.update.png \
-
Pictures/icons/updateconf.png,frugalmonotools.Pictures.icons.updateconf.png \
- Pictures/Mono-powered.png,frugalmonotools.Pictures.Mono-powered.png \
- Pictures/icons/logs.png,frugalmonotools.Pictures.icons.logs.png \
- Pictures/icons/grub.png,frugalmonotools.Pictures.icons.grub.png \
- Pictures/icons/datetime.png,frugalmonotools.Pictures.icons.datetime.png
\
- Pictures/icons/users.png,frugalmonotools.Pictures.icons.users.png \
- Pictures/icons/notes.png,frugalmonotools.Pictures.icons.notes.png
-
-EXTRAS = \
- OUTILS \
- Pictures \
- Data \
- TODO \
- LICENSE \
- Pictures/systray.png \
- Pictures/systrayupdate.png \
- Data/frugal-tweak.desktop \
- frugalware-tweak.in
-
-REFERENCES = \
- System \
- $(GTK_SHARP_20_LIBS) \
- $(GLIB_SHARP_20_LIBS) \
- $(GLADE_SHARP_20_LIBS) \
- System.Xml \
- Mono.Posix \
- $(WEBKIT_SHARP_10_LIBS) \
- $(NOTIFY_SHARP_LIBS) \
- System.ServiceProcess \
- $(DBUS_SHARP_10_LIBS) \
- System.Web \
- System.Web.Services \
- $(INDICATE_GTK_SHARP_01_LIBS) \
- $(INDICATE_SHARP_01_LIBS)
-
-DLL_REFERENCES =
-
-CLEANFILES = $(PROGRAMFILES) $(BINARIES)
-
-include $(top_srcdir)/Makefile.include
-
-RSS_NET_DLL = $(BUILD_DIR)/RSS.NET.dll
-FRUGALWARE_TWEAK = $(BUILD_DIR)/frugalware-tweak
-
-$(eval $(call emit-deploy-target,RSS_NET_DLL))
-$(eval $(call emit-deploy-target,RSS_NET_DLL_MDB))
-$(eval $(call emit-deploy-wrapper,FRUGALWARE_TWEAK,frugalware-tweak,x))
-
-
-$(eval $(call emit_resgen_targets))
-$(build_xamlg_list): %.xaml.g.cs: %.xaml
- xamlg '$<'
-
-$(ASSEMBLY_MDB): $(ASSEMBLY)
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles)
$(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
$(build_satellite_assembly_list)
- mkdir -p $(shell dirname $(ASSEMBLY))
- $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS)
-out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed)
$(build_resources_embed) $(build_references_ref)
diff --git a/frugal-mono-tools/WID_Notes.cs b/frugal-mono-tools/WID_Notes.cs
index 12ebeef..150b216 100644
--- a/frugal-mono-tools/WID_Notes.cs
+++ b/frugal-mono-tools/WID_Notes.cs
@@ -75,11 +75,6 @@ namespace frugalmonotools
string NoteDecrypte =
frugalmonotools.Crypto.DecryptStringAES(NoteCrypte,MainClass.configuration.Get_NoteLogin()+MainClass.configuration.Get_NotePass());
TXT_Note.Buffer.Text = NoteDecrypte;
}
-
-
-
-
-
}
}
diff --git a/frugal-mono-tools/frugal-mono-tools.csproj
b/frugal-mono-tools/frugal-mono-tools.csproj
index 5f1e462..680f8eb 100644
--- a/frugal-mono-tools/frugal-mono-tools.csproj
+++ b/frugal-mono-tools/frugal-mono-tools.csproj
@@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>frugalmonotools</RootNamespace>
<AssemblyName>frugal-mono-tools</AssemblyName>
- <ReleaseVersion>0.2.4.2</ReleaseVersion>
+ <ReleaseVersion>0.2.5</ReleaseVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
diff --git a/frugal-mono-tools/gtk-gui/gui.stetic
b/frugal-mono-tools/gtk-gui/gui.stetic
index 6c9f93c..d7d07d1 100644
--- a/frugal-mono-tools/gtk-gui/gui.stetic
+++ b/frugal-mono-tools/gtk-gui/gui.stetic
@@ -8,7 +8,7 @@
<widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
<widget-library name="webkit-sharp, Version=1.1.15.0, Culture=neutral,
PublicKeyToken=eaa1d335d2e19745" />
<widget-library name="notify-sharp, Version=0.4.0.0, Culture=neutral,
PublicKeyToken=2df29c54e245917a" />
- <widget-library name="../bin/Debug/frugal-mono-tools.exe" internal="true"
/>
+ <widget-library name="../bin/Release/frugal-mono-tools.exe"
internal="true" />
</import>
<icon-factory>
<icon-set id="iconeFwCC">
diff --git a/frugalware-tweak.sln b/frugalware-tweak.sln
index f5d3d58..297f4d4 100644
--- a/frugalware-tweak.sln
+++ b/frugalware-tweak.sln
@@ -21,8 +21,8 @@ Global
{069FB0B9-80D4-4093-88F3-116B09B0E09F}.Debug|x86.ActiveCfg = Debug|Any CPU
{069FB0B9-80D4-4093-88F3-116B09B0E09F}.Release|Any CPU.ActiveCfg = Release|Any
CPU
{069FB0B9-80D4-4093-88F3-116B09B0E09F}.Release|x86.ActiveCfg = Release|Any CPU
- {4E7A55B1-C72A-480A-90CA-6EAF97259A63}.Debug|x86.ActiveCfg =
Debug|x86
- {4E7A55B1-C72A-480A-90CA-6EAF97259A63}.Debug|x86.Build.0 =
Debug|x86
+ {4E7A55B1-C72A-480A-90CA-6EAF97259A63}.Debug|x86.ActiveCfg =
Release|x86
+ {4E7A55B1-C72A-480A-90CA-6EAF97259A63}.Debug|x86.Build.0 =
Release|x86
{4E7A55B1-C72A-480A-90CA-6EAF97259A63}.Release|Any CPU.ActiveCfg = Release|x86
{4E7A55B1-C72A-480A-90CA-6EAF97259A63}.Release|Any CPU.Build.0 = Release|x86
{4E7A55B1-C72A-480A-90CA-6EAF97259A63}.Release|x86.ActiveCfg = Release|x86
@@ -30,14 +30,14 @@ Global
{8CC36C0E-5E0E-4B46-A124-2CE460C48FF7}.Debug|x86.ActiveCfg = Debug|Any CPU
{8CC36C0E-5E0E-4B46-A124-2CE460C48FF7}.Release|Any CPU.ActiveCfg = Release|Any
CPU
{8CC36C0E-5E0E-4B46-A124-2CE460C48FF7}.Release|x86.ActiveCfg = Release|Any CPU
- {8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Debug|x86.ActiveCfg =
Debug|Any CPU
- {8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Debug|x86.Build.0 =
Debug|Any CPU
+ {8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Debug|x86.ActiveCfg =
Release|Any CPU
+ {8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Debug|x86.Build.0 =
Release|Any CPU
{8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Release|Any CPU.ActiveCfg = Release|Any
CPU
{8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Release|Any CPU.Build.0 = Release|Any CPU
{8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Release|x86.ActiveCfg = Release|Any CPU
{8E5D43C6-79EE-44A7-8AFF-B0A9FB518BC2}.Release|x86.Build.0 = Release|Any CPU
- {E1F59443-629D-4EB7-A6AA-6ED8821FE6D6}.Debug|x86.ActiveCfg =
Debug|x86
- {E1F59443-629D-4EB7-A6AA-6ED8821FE6D6}.Debug|x86.Build.0 =
Debug|x86
+ {E1F59443-629D-4EB7-A6AA-6ED8821FE6D6}.Debug|x86.ActiveCfg =
Release|x86
+ {E1F59443-629D-4EB7-A6AA-6ED8821FE6D6}.Debug|x86.Build.0 =
Release|x86
{E1F59443-629D-4EB7-A6AA-6ED8821FE6D6}.Release|Any CPU.ActiveCfg = Release|Any
CPU
{E1F59443-629D-4EB7-A6AA-6ED8821FE6D6}.Release|Any CPU.Build.0 = Release|Any CPU
{E1F59443-629D-4EB7-A6AA-6ED8821FE6D6}.Release|x86.ActiveCfg = Release|x86
@@ -56,6 +56,6 @@ Global
$0.StandardHeader = $4
$4.Text = @/*\r\n * Copyright (C) 2010 by Gaetan Gourdin
<bouleet...@frogdev.info>\r\n *\r\n * This program is free software; you can
redistribute it and/or modify\r\n * it under the terms of the GNU General
Public License as published by\r\n * the Free Software Foundation; either
version 2 of the License, or\r\n * (at your option) any later version.\r\n
*\r\n * This program is distributed in the hope that it will be useful,\r\n *
but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n *
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n * GNU
General Public License for more details.\r\n *\r\n * You should have received
a copy of the GNU General Public License\r\n * along with this program; if
not, write to the Free Software\r\n * Foundation, Inc., 59 Temple Place -
Suite 330, Boston, MA 02111-1307, USA.\r\n */
$4.IncludeInNewFiles = True
- version = 0.2.4.2
+ version = 0.2.5
EndGlobalSection
EndGlobal
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
