Imported Upstream version 1.7.3

diff --git a/ChangeLog b/ChangeLog
index db3c4f5..7f8d30f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,3 +18,10 @@
 
         1.7.2 release
 
+2012-11-27  Rafael Antognolli
+
+       * Fix license on ethumbd.c
+
+2012-12-07  Luis Felipe Strano Moraes
+
+       * Release 1.7.3

diff --git a/NEWS b/NEWS
index 4c7a064..51f84cb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
-Ethumb 1.7.2
+Ethumb 1.7.3
+
+Changes since Ethumb 1.7.2:
+-------------------------
+
+Fixes:
+       - Fix license on ethumbd.c too.
 
 Changes since Ethumb 1.7.1:
 -------------------------

diff --git a/configure b/configure
index 29d21e7..8fd1ba6 100755 (executable)
--- 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 ethumb 1.7.2.
+# Generated by GNU Autoconf 2.68 for ethumb 1.7.3.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ethumb'
 PACKAGE_TARNAME='ethumb'
-PACKAGE_VERSION='1.7.2'
-PACKAGE_STRING='ethumb 1.7.2'
+PACKAGE_VERSION='1.7.3'
+PACKAGE_STRING='ethumb 1.7.3'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1394,7 +1394,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 ethumb 1.7.2 to adapt to many kinds of systems.
+\`configure' configures ethumb 1.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1464,7 +1464,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ethumb 1.7.2:";;
+     short | recursive ) echo "Configuration of ethumb 1.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1626,7 +1626,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ethumb configure 1.7.2
+ethumb configure 1.7.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1904,7 +1904,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 ethumb $as_me 1.7.2, which was
+It was created by ethumb $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3709,7 +3709,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ethumb'
- VERSION='1.7.2'
+ VERSION='1.7.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3954,7 +3954,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 2
+#define VMIC 3
 _ACEOF
 
 
@@ -3962,7 +3962,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:2:7"
+version_info="8:3:7"
 release_info=""
 
 
@@ -15321,7 +15321,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 ethumb $as_me 1.7.2, which was
+This file was extended by ethumb $as_me 1.7.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15387,7 +15387,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="\\
-ethumb config.status 1.7.2
+ethumb config.status 1.7.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 901f3f2..1e4d499 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [2])
+m4_define([v_mic], [3])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line

diff --git a/doc/Doxyfile b/doc/Doxyfile
index 3d852e9..d5227c6 100644 (file)
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = Ethumb
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.7.2
+PROJECT_NUMBER         = 1.7.3
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/ethumb.spec b/ethumb.spec
index 3972970..7a29f4e 100644 (file)
--- a/ethumb.spec
+++ b/ethumb.spec
@@ -3,7 +3,7 @@
 
 Summary: Thumbnail Generation Library
 Name: ethumb
-Version: 1.7.2
+Version: 1.7.3
 Release: %{_rel}
 License: LGPLv2.1
 Group: System Environment/Libraries

diff --git a/src/bin/ethumb.c b/src/bin/ethumb.c
index bee2f52..12750e0 100644 (file)
--- a/src/bin/ethumb.c
+++ b/src/bin/ethumb.c
@@ -89,7 +89,7 @@ const Ecore_Getopt optdesc = {
   NULL,
   PACKAGE_VERSION,
   "(C) 2009 - ProFUSION embedded systems",
-  "LGPL v3 - GNU Lesser General Public License",
+  "LGPL v2.1 - GNU Lesser General Public License",
   "Thumbnails generator.\n"
      "\n"
      "This program uses ethumb to create thumbnails from pictures. "

diff --git a/src/bin/ethumbd.c b/src/bin/ethumbd.c
index d3ca7c3..4b1bcb3 100644 (file)
--- a/src/bin/ethumbd.c
+++ b/src/bin/ethumbd.c
@@ -3,20 +3,19 @@
  *
  * Copyright (C) 2009 by ProFUSION embedded systems
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see <http://www.gnu.org/licenses/>.
  *
  * @author Rafael Antognolli <antognolli@profusion.mobi>
  */
@@ -194,7 +193,7 @@ const Ecore_Getopt optdesc = {
   NULL,
   PACKAGE_VERSION,
   "(C) 2009 - ProFUSION embedded systems",
-  "LGPL v3 - GNU Lesser General Public License",
+  "LGPL v2.1 - GNU Lesser General Public License",
   "Ethumb daemon.\n"
   "\n"
   "ethumbd uses the Ethumb library to create thumbnails for any "

diff --git a/src/bin/ethumbd_client.c b/src/bin/ethumbd_client.c
index e236639..54b02c7 100644 (file)
--- a/src/bin/ethumbd_client.c
+++ b/src/bin/ethumbd_client.c
@@ -106,7 +106,7 @@ const Ecore_Getopt optdesc = {
   NULL,
   PACKAGE_VERSION,
   "(C) 2009 - ProFUSION embedded systems",
-  "LGPL v3 - GNU Lesser General Public License",
+  "LGPL v2.1 - GNU Lesser General Public License",
   "Thumbnails generator client using DBus and ethumbd.\n"
   "\n"
   "This program uses ethumbd server to create thumbnails from pictures. "