From fa1a270c4c6c77e379093b691eeaef982ea472eb Mon Sep 17 00:00:00 2001 From: clanmills Date: Wed, 17 May 2017 06:18:32 +0100 Subject: [PATCH] Updating website to remove mention of Commercial License. --- website/Checklist.txt | 15 ++-- website/bin/buildrelease.sh | 31 +++---- website/master/archive.html.in | 140 ++++++++++++++++---------------- website/master/download.html.in | 4 +- website/master/index.html.in | 5 +- website/var/__footer__ | 21 +---- website/var/__whatsnew-table__ | 17 +--- 7 files changed, 97 insertions(+), 136 deletions(-) diff --git a/website/Checklist.txt b/website/Checklist.txt index dda165d2..06002e1c 100644 --- a/website/Checklist.txt +++ b/website/Checklist.txt @@ -35,19 +35,19 @@ Review and update documentation Update var/__manpage__ v0.26+: - make the tags: + Make tags: $ cd doc $ make tags $ make - create trunk bundle: + Create trunk bundle: $ cd website $ rm -rf *trunk* $ bin/exiv2-buildrelease.sh trunk - inspect the logs from the buildserver - copy builds from buildserver to html/builds + Inspect the logs from the buildserver + Copy builds from buildserver to html/builds $ cd website $ bin/getbuilds.sh - build the tag tables + Build the tag tables $ cd website $ bin/tagtables.sh (Caution: cp: cannot stat ‘..//doc/templates/__Sony__’: No such file or directory) @@ -67,8 +67,9 @@ Download and test packages v0.26+ $ cd website - copy releases to html - $ svn export svn://dev.exiv2.org/svn/team/releases html + Copy releases to html + $ svn export svn://dev.exiv2.org/svn/team/releases html/releases + Copy the release to Exiv2.org $ rsync -varz html root@exiv2.org:/var/www/exiv2/ Validate uploaded webpages with W3C HTML checker diff --git a/website/bin/buildrelease.sh b/website/bin/buildrelease.sh index d6a8f3ae..daa7d3ee 100755 --- a/website/bin/buildrelease.sh +++ b/website/bin/buildrelease.sh @@ -11,6 +11,7 @@ EOF fi rel=$1 +here=$PWD ( if [ -e $rel ] ; then echo File $rel already exists, exiting... @@ -44,25 +45,19 @@ make -j4 sudo make install make -j4 samples make doc -cd test -make -cd .. -rm -f ABOUT-NLS +make tests +rm -f ABOUT-NLS rm -f .gitignore rm -rf kdevelop/ sudo make uninstall -make distclean +make distclean rm -rf test/tmp -rm -f Makefile -rm -f bootstrap.linux -rm -f msvc64\\runner.txt -# 01-Dec-2013, ahu: Include CMake files in the distribution -#find . -type f -name '*[Cc][Mm][Aa][Kk][Ee]*' | xargs rm -f +rm -f Makefile +rm -f bootstrap.linux rm -rf xmpsdk/src/.libs -rm -f config.log +rm -f config.log rm -rf website -rm -f jenkins_build.bat jenkins_build.sh -rm -f fixxml.sh +rm -f fixxml.sh echo echo ========================================================================== echo Creating source and doc packages @@ -83,18 +78,16 @@ make -j4 sudo make install make -j4 samples echo Exporting tests, this may take a while... -svn export svn://dev.exiv2.org/svn/tags/$rel/test +svn export svn://dev.exiv2.org/svn/$rel/test du -sk test/ -cd test -make -cd ../.. +make tests echo echo ========================================================================== echo Error-summary echo -grep 'Error ' exiv2-buildrelease-$rel.out | grep -v -e'BasicError ' -e'Error 1 (ignored)' +grep 'Error ' $here/exiv2-buildrelease-$rel.out | grep -v -e'BasicError ' -e'Error 1 (ignored)' -) 2>&1 | tee exiv2-buildrelease-$rel.out 2>&1 +) 2>&1 | tee $here/exiv2-buildrelease-$rel.out 2>&1 if [ -e exiv2-$rel.tar.gz ]; then ls -alt exiv2-$rel.tar.gz diff --git a/website/master/archive.html.in b/website/master/archive.html.in index 08c50b89..5a241ae3 100644 --- a/website/master/archive.html.in +++ b/website/master/archive.html.in @@ -32,490 +32,490 @@ __navbar__ Exiv2 v0.25 Source - exiv2-0.25.tar.gz + exiv2-0.25.tar.gz 5434325 21-Jun-2015 258d4831b30f75a01e0234065c6c2806 Exiv2 v0.25 Windows executable - exiv2-0.25-win.zip + exiv2-0.25-win.zip 1864291 21-Jun-2015 2a56b70e0ccc70e5fca308b7e34e4e52 Exiv2 v0.24 Source - exiv2-0.24.tar.gz + exiv2-0.24.tar.gz 4635028 02-Dec-2013 b8a23dc56a98ede85c00718a97a8d6fc Exiv2 v0.24 Windows executable - exiv2-0.24-win.zip + exiv2-0.24-win.zip 1875613 02-Dec-2013 fdb4b9f605d23546e008949b4e09d3d9 Exiv2 v0.23 Source - exiv2-0.23.tar.gz + exiv2-0.23.tar.gz 3524381 23-Apr-2012 dab67c07bb63a4386d4ea607a8e06eaf Exiv2 v0.23 Windows executable - exiv2-0.23-win.zip + exiv2-0.23-win.zip 1762504 23-Apr-2012 6966ba9862071d008797f663786d49e9 Exiv2 v0.22 Source - exiv2-0.22.tar.gz + exiv2-0.22.tar.gz 3482572 18-Sep-2011 84d7d5b1802529efca8ac3d6e6a97e3a Exiv2 v0.22 Windows executable - exiv2-0.22-win.zip + exiv2-0.22-win.zip 1677934 18-Sep-2011 20f918dce2504a3a59df2de24f785c64 Exiv2 v0.21.1 Source - exiv2-0.21.1.tar.gz + exiv2-0.21.1.tar.gz 3004521 14-Feb-2011 5c99bbcaa998f6b200b92f2bf0ac4f9e Exiv2 v0.21.1 Windows executable - exiv2-0.21.1-win.zip + exiv2-0.21.1-win.zip 1640376 14-Feb-2011 ddfdd3be4e3a64d9a6571ee7a873eeda Exiv2 v0.21 Source - exiv2-0.21.tar.gz + exiv2-0.21.tar.gz 3002066 01-Dec-2010 2caf74de59b5424996959ccea1c001fb Exiv2 v0.21 Windows executable - exiv2-0.21-win.zip + exiv2-0.21-win.zip 1639929 01-Dec-2010 6a9fc0b4cef4dbbc7820bb24791ec2d3 Exiv2 v0.20 Source - exiv2-0.20.tar.gz + exiv2-0.20.tar.gz 2941045 30-May-2010 3173d08a4313dc94b7bd1b7cdbda2093 Exiv2 v0.20 Windows executable - exiv2-0.20-win.zip + exiv2-0.20-win.zip 1604291 30-May-2010 9c572b6c50d8c484a0d61dd7f2385966 Exiv2 v0.19 Source - exiv2-0.19.tar.gz + exiv2-0.19.tar.gz 2658781 30-Dec-2009 f52fb75a2cb7512f1484deab76473e13 Exiv2 v0.19 Windows executable - exiv2-0.19-win.zip + exiv2-0.19-win.zip 1637143 30-Dec-2009 ea6f54ab7cfbfc4fdc68e2332e0e15af Exiv2 v0.18.2 Source - exiv2-0.18.2.tar.gz + exiv2-0.18.2.tar.gz 2394263 24-Jun-2009 300cc55e098d7ff7560b4c6992282c53 Exiv2 v0.18.2 Windows executable - exiv2-0.18.2-win.zip + exiv2-0.18.2-win.zip 1773751 24-Jun-2009 566dc35c684d79d0b4083f2122cae65e Exiv2 v0.18.1 Source - exiv2-0.18.1.tar.gz + exiv2-0.18.1.tar.gz 2342158 06-Apr-2009 744f06b3a2beeb2341f30b157cbd8e7e Exiv2 v0.18.1 Windows executable - exiv2-0.18.1-win.zip + exiv2-0.18.1-win.zip 1767271 06-Apr-2009 c7591a7aed7f3bee68a6372511e32521 Exiv2 v0.18 Source - exiv2-0.18.tar.gz + exiv2-0.18.tar.gz 2299215 18-Dec-2008 03044792525ae0a1b109df5a53b858fb Exiv2 v0.18 Windows executable - exiv2-0.18-win.zip + exiv2-0.18-win.zip 1602335 18-Dec-2008 3f782e5c340a54a23309e120d00c5e88 Exiv2 v0.18-pre2 Source - exiv2-0.18-pre2.tar.gz + exiv2-0.18-pre2.tar.gz 2198231 04-Nov-2008 7b52cebd0af071fe663a4a06e64d47cd Exiv2 v0.18-pre2 Windows executable - exiv2-0.18-pre2-win.zip + exiv2-0.18-pre2-win.zip 1574233 04-Nov-2008 e007e0a988fb5508605c5f0eb4930d7c Exiv2 v0.18-pre1 Source - exiv2-0.18-pre1.tar.gz + exiv2-0.18-pre1.tar.gz 1838552 11-Sep-2008 63b4bbcfe5a1c02187c795b8a67b8112 Exiv2 v0.18-pre1 Windows executable - exiv2-0.18-pre1-win.zip + exiv2-0.18-pre1-win.zip 1553504 11-Sep-2008 1b64f0ce990ba99fbd06f90126b4995a Exiv2 v0.17.1 Source - exiv2-0.17.1.tar.gz + exiv2-0.17.1.tar.gz 1807220 19-Jun-2008 52a602f4f0d9e89b7084ac795b7547ac Exiv2 v0.17.1 Windows executable - exiv2-0.17.1-win.zip + exiv2-0.17.1-win.zip 1557896 19-Jun-2008 b33ee61aef7d9fe37e75c776523bc72c Exiv2 v0.17 Source - exiv2-0.17.tar.gz + exiv2-0.17.tar.gz 1807917 06-Jun-2008 800508a2d6db7b736cced8cfeff97a4e Exiv2 v0.17 Windows executable - exiv2-0.17-win.zip + exiv2-0.17-win.zip 1557670 06-Jun-2008 78635a863842789be0ce7129205e1467 Exiv2 v0.16 Source - exiv2-0.16.tar.gz + exiv2-0.16.tar.gz 1591822 10-Jan-2008 a6e72343885d990c593bd013c6c988f1 Exiv2 v0.16 Documentation - exiv2-0.16-doc.tar.gz + exiv2-0.16-doc.tar.gz 2730508 10-Jan-2008 ad8bf4b006b6a22f5a9d50856c1b6285 Exiv2 v0.16 Windows executable - exiv2-0.16-win.zip + exiv2-0.16-win.zip 1499946 10-Jan-2008 8de2fc0f942a7fa4ade825da2743a7ca Exiv2 v0.16-pre1 Source - exiv2-0.16-pre1.tar.gz + exiv2-0.16-pre1.tar.gz 1540861 09-Nov-2007 e4d0836f92b917f6e5ff85041c8717fb Exiv2 v0.16-pre1 Documentation - exiv2-0.16-pre1-doc.tar.gz + exiv2-0.16-pre1-doc.tar.gz 2713829 09-Nov-2007 7e1b5bc79195e3d818f4c7e12866bf99 Exiv2 v0.16-pre1 Windows executable - exiv2-0.16-pre1-win.zip + exiv2-0.16-pre1-win.zip 1498744 09-Nov-2007 570d7e34404aa3315811e5a33d13f9cd Exiv2 v0.15 Source - exiv2-0.15.tar.gz + exiv2-0.15.tar.gz 1133249 10-Jul-2007 bb18d19e1d6fb255dadda456cadec00e Exiv2 v0.15 Documentation - exiv2-0.15-doc.tar.gz + exiv2-0.15-doc.tar.gz 2586720 10-Jul-2007 51adef87722e057805ad863be9cb131a Exiv2 v0.15 Windows executable - exiv2-0.15-win.zip + exiv2-0.15-win.zip 1115891 10-Jul-2007 508f9376c7c143876ef202b1308ff0dd Exiv2 v0.14 Source - exiv2-0.14.tar.gz + exiv2-0.14.tar.gz 1028225 19-Mar-2007 6f8edde77d95f49fc83329feb615bb33 Exiv2 v0.14 Documentation - exiv2-0.14-doc.tar.gz + exiv2-0.14-doc.tar.gz 1835888 20-Mar-2007 7245efe6934e8febc4466e50acd939f6 Exiv2 v0.14 Windows executable - exiv2-0.14-win.zip + exiv2-0.14-win.zip 1112164 19-Mar-2007 635019737e2b72446055b4929e8871ac Exiv2 v0.13 Source - exiv2-0.13.tar.gz + exiv2-0.13.tar.gz 2841724 03-Mar-2007 492d476e3130ac27983d93e5595d81e8 Exiv2 v0.13 Windows executable - exiv2-0.13-win.zip + exiv2-0.13-win.zip 1109773 03-Mar-2007 825d221f787ef97b5dc571f30d4cf561 Exiv2 v0.12 Source - exiv2-0.12.tar.gz + exiv2-0.12.tar.gz 2359138 27-Nov-2006 a97a4e489df7ec99458e3e33b506c3e6 Exiv2 v0.12 Windows executable - exiv2-0.12-win.zip + exiv2-0.12-win.zip 440131 01-Dec-2006 82dbfa8f4d190b26c99481b778e01a06 Exiv2 v0.11 Source - exiv2-0.11.tar.gz + exiv2-0.11.tar.gz 2380087 16-Sep-2006 269ce822946c56549d086f0c08dffc79 Exiv2 v0.11 Windows executable - exiv2-0.11-win.zip + exiv2-0.11-win.zip 407109 16-Sep-2006 cc75a88f1c447e7bff63da0de0c7c24b Exiv2 v0.10 Source - exiv2-0.10.tar.gz + exiv2-0.10.tar.gz 2053756 03-Jun-2006 5af2256fb9895d9331684e8c1865b956 Exiv2 v0.10 Windows executable - exiv2-0.10-win.zip + exiv2-0.10-win.zip 404766 03-Jun-2006 b67a0a6804bce8b85593325b02c0d2cf Exiv2 v0.9.1 Source - exiv2-0.9.1.tar.gz + exiv2-0.9.1.tar.gz 1602868 04-Feb-2006 4c6593751368f5e9235d85e0d4058e67 Exiv2 v0.9.1 Windows executable - exiv2-0.9.1-win.zip + exiv2-0.9.1-win.zip 355312 04-Feb-2006 805c81c16741f2e41e59e7dfd37fe1a2 Exiv2 v0.9 Source - exiv2-0.9.tar.gz + exiv2-0.9.tar.gz 1613781 26-Jan-2006 ee82fcba2741f5c771cb21d3eacefeef Exiv2 v0.9 Windows executable - exiv2-0.9-win.zip + exiv2-0.9-win.zip 355270 26-Jan-2006 fa54efd391e87fea0c309b65ca5f1a65 Exiv2 v0.8 Source - exiv2-0.8.tar.gz + exiv2-0.8.tar.gz 1318689 19-Nov-2005 70779ef4adb2a41732c44dcdbd535412 Exiv2 v0.8 Windows executable - exiv2-0.8-win.zip + exiv2-0.8-win.zip 338156 19-Nov-2005 bfc1787972dcc5557833b2d75be32447 Exiv2 v0.7 Source - exiv2-0.7.tar.gz + exiv2-0.7.tar.gz 1245111 15-Jun-2005 540e720b77c05ca50d5005a140e38138 Exiv2 v0.7 Windows executable - exiv2-0.7-win.zip + exiv2-0.7-win.zip 273949 15-Jun-2005 6c26bdb7a2c949c7771269ead55b53b2 Exiv2 v0.6.2 Source - exiv2-0.6.2.tar.gz + exiv2-0.6.2.tar.gz 975615 06-Mar-2005 2f41777091b2145c4799c3bed55519e3 Exiv2 v0.6.2 Windows executable - exiv2-0.6.2-win.zip + exiv2-0.6.2-win.zip 248513 06-Mar-2005 7031cc7228ac376f643601d72d919e91 Exiv2 v0.6.1 Source - exiv2-0.6.1.tar.gz + exiv2-0.6.1.tar.gz 749879 17-Jan-2005 34b702a84c3448832c07bb0c02e829bc Exiv2 v0.6.1 Windows executable - exiv2-0.6.1-win.zip + exiv2-0.6.1-win.zip 248002 17-Jan-2005 fdfc905dd8a13a43d4980a9091bb1e48 Exiv2 v0.6 Source - exiv2-0.6.tar.gz + exiv2-0.6.tar.gz 716240 12-Dec-2004 464bcf3878d65196e0a326b2e24752e9 Exiv2 v0.6 Windows executable - exiv2-0.6-win.zip + exiv2-0.6-win.zip 236965 12-Dec-2004 66088a3424b6e2fbc2a7a8887d2b1343 Exiv2 v0.5 Source - exiv2-0.5.tar.gz + exiv2-0.5.tar.gz 645739 13-Sep-2004 e9362bc1b9e5cea5b095a99af08613ee Exiv2 v0.5 Windows executable - exiv2-0.5-win.zip + exiv2-0.5-win.zip 219168 13-Sep-2004 8347281c3d7430ab48547d04a9c42a8d Exiv2 v0.4 Source - exiv2-0.4.tar.gz + exiv2-0.4.tar.gz 430893 03-Jul-2004 8b29148c36225836a1935a8b4193b060 Exiv2 v0.4 Windows executable - exiv2-0.4-win.zip + exiv2-0.4-win.zip 197304 03-Jul-2004 fa05437d78c32737f17c9c6ea8badb24 Exiv2 v0.3 Source - exiv2-0.3.tar.gz + exiv2-0.3.tar.gz 372479 10-May-2004 3ea7ecc9a37ebf75a46c6e7f0286ab55 Exiv2 v0.3 Windows executable - exiv2-0.3-win.zip + exiv2-0.3-win.zip 188242 10-May-2004 be15cbf86e3a3e91a44f1749f6eb8f1d diff --git a/website/master/download.html.in b/website/master/download.html.in index 082c3780..73572552 100644 --- a/website/master/download.html.in +++ b/website/master/download.html.in @@ -32,7 +32,7 @@ __navbar__ installation notes and further information.

- +   Download source

@@ -129,8 +129,6 @@ 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.

-

Alternatively, Exiv2 is also available with a commercial license, which allows it to be -used in closed-source projects. Contact me for more information.

Exiv2 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.

diff --git a/website/master/index.html.in b/website/master/index.html.in index 4600dfc5..e0e95a12 100644 --- a/website/master/index.html.in +++ b/website/master/index.html.in @@ -12,9 +12,8 @@ __navbar__ and a command line utility to manage image metadata. It provides fast and easy read and write access to the Exif, IPTC and XMP metadata and the ICC Profile embedded within digital images in various formats. - Exiv2 is available as free software and with a - commercial license, and is used in many projects - including KDE and Gnome Desktops, GIMP, DigiKam, Darktable and many others. + Exiv2 is available as free software and is used in many projects + including KDE and Gnome Desktops as well as many applications including GIMP, darktable, shotwell, GwenView and Luminance HDR.

  Download Exiv2 diff --git a/website/var/__footer__ b/website/var/__footer__ index 5a9bb2b2..fecc3832 100644 --- a/website/var/__footer__ +++ b/website/var/__footer__ @@ -4,28 +4,9 @@
-

Copyright © 2004 - 2017 Andreas Huggel

 - + Exiv2 v__version__
-

- - Email address - -

Last modified __last_modified__

 diff --git a/website/var/__whatsnew-table__ b/website/var/__whatsnew-table__ index 9daecb4e..04e5fca6 100644 --- a/website/var/__whatsnew-table__ +++ b/website/var/__whatsnew-table__ @@ -1,5 +1,5 @@ - + - - - -
2017-04-28
28-April-2017 Exiv2 0.26 Released
This release contains a large collection of new features, new lenses and bugfixes @@ -7,8 +7,7 @@
See the ChangeLog for the complete list of changes and new features.

Highlights of this release

-

Short Presentation: Youtube (4 minutes) -

Longer Slide Presentation: Exiv2v0-26.pdf +

Slide Presentation: Exiv2v0-26.pdf
Project history: http://dev.exiv2.org/news/2
The primary goal of Exiv2 v0.26 was to clear the back-log of issues, some of which were 10 years old! We added support for CMake with Visual Studio, a buildserver and ability for users to provide their own lens definition. Numerous features were added including ICC Profile Support. @@ -34,9 +33,7 @@

  • Robin will retire from the project at the end of 2017

    • Goals and Project Plans for v0.27

    -

    We welcome Ben, Raphael, Shridar and Troy to Team Exiv2. -
    We hope Alan, Thomas and Mahesh who will continue to contribute. -
    We say "Thank You and Best Wishes" to Andreas, Gilles and Niels who are retiring.

    +

    We welcome Ben, Raphael, Shridar and Troy to Team Exiv2. We hope Alan, Alan, Thomas, Mahesh, Gilles and Niels will continue to contribute. Andreas, Gilles and Niels have decided to retire from Exiv2 and we thank them for their outstanding contributions.

    It is intended to update the specification for Exiv2 v0.27 in consultation with Team Exiv2.
    Specification and progress reports: http://dev.exiv2.org/news/3

    @@ -397,14 +394,6 @@
    21-Aug-2006 -Duallicensing
    Exiv2 is now also available with a commercial license, i.e., for a fee, - which makes it suitable for use in closed-source projects. Contact me for details. - See this discussion in the forum for more information on the implications of this change. -
    03-Jun-2006 Exiv2 0.10 released
    Exiv2 can now read TIFF images and a number of TIFF-based RAW