Commit 5a91057b authored by Mathieu Malaterre's avatar Mathieu Malaterre

Import Debian changes 1.3.0-1

jpegoptim (1.3.0-1) unstable; urgency=low

  * New upstream 1.3.0. Optimize progressive JPEGs
parents 8172200e 82dd7c52
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
675 Mass Ave, Cambridge, MA 02139, USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
......@@ -16,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
......@@ -56,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
......@@ -111,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
......@@ -169,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
......@@ -226,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
......@@ -256,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
......@@ -278,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Programs
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
......@@ -292,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -304,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
You should have received a copy of the GNU 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.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
jpegoptim
=========
Copyright (C) 1996-2011 Timo Kokkonen <tjko@iki.fi>
Copyright (C) 1996-2013 Timo Kokkonen <tjko@iki.fi>
This program is free software; you can redistribute it
......@@ -16,6 +16,6 @@ PURPOSE. See the GNU General Public License for more
details.
You should have received a copy of the GNU General Public
License along with this program; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
02139, USA.
Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301 USA.
......@@ -3,7 +3,7 @@
#
# Makefile for jpegoptim
#
Version = 1.2.5
Version = 1.3.0
PKGNAME = jpegoptim
SHELL = /bin/sh
......@@ -32,7 +32,7 @@ mandir = $(prefix)/share/man
CC = @CC@
XCPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@ $(XCPPFLAGS) $(DEFS) -Wall
CFLAGS = @CFLAGS@ $(XCPPFLAGS) $(DEFS)
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
STRIP = strip
......
Jpegoptim v1.2.5 Copyright (c) Timo Kokkonen, 1996-2013.
Jpegoptim v1.3.0 Copyright (c) Timo Kokkonen, 1996-2013.
REQUIREMENTS
......@@ -17,8 +17,8 @@ INSTALLATION
tar file, make nesessary changes to the Makefile, and then
compile the program. You may wanna do something like this:
zcat jpegoptim-1.2.5.tar.gz | tar xf -
cd jpegoptim-1.2.5
zcat jpegoptim-1.3.0.tar.gz | tar xf -
cd jpegoptim-1.3.0
./configure
make
make strip
......@@ -26,8 +26,16 @@ INSTALLATION
HISTORY
v1.2.5 - safer temp file handling (if mkstemps() available),
patch to make "quiet mode" (-q) be quiet by Mathieu Malaterre
v1.3.0 - support for progressive jpegs added (fixes long standing
"bug" of progressive jpegs becoming non-progressive during
optimization),
new options --all-normal & --all-progressive for
converting jpegs to non-progressive & progressive,
new -S / --size option to set target size for output
file (enables lossy optimization),
updated GPL/Copyrights language (thanks to Nicolas Vieville)
v1.2.5 - safer temp file handling (if mkstemps() available),
patch to make "quiet mode" (-q) be quiet by Mathieu Malaterre
v1.2.4 - new -T / --treshold option by Matteo Croce,
minor fixes (potential memory leaks),
merged some patches from Debian jpegoptim package (1.2.3-2)
......@@ -58,5 +66,5 @@ LATEST VERSION
Timo <tjko@iki.fi>
30-Jan-2013 $Id$
14-Mar-2013 $Id$
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -3345,6 +3345,51 @@ exit 1
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for round in -lm" >&5
$as_echo_n "checking for round in -lm... " >&6; }
if test "${ac_cv_lib_m_round+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char round ();
int
main ()
{
return round ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_m_round=yes
else
ac_cv_lib_m_round=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_round" >&5
$as_echo "$ac_cv_lib_m_round" >&6; }
if test "x$ac_cv_lib_m_round" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
LIBS="-lm $LIBS"
fi
ac_ext=c
......@@ -3744,7 +3789,7 @@ fi
done
for ac_header in unistd.h getopt.h string.h libgen.h
for ac_header in unistd.h getopt.h string.h libgen.h math.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
......
......@@ -36,11 +36,12 @@ echo "Cannot find libjpeg or you have too old version (v6 or later required)."
exit 1
])
AC_CHECK_LIB(m, round)
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h getopt.h string.h libgen.h)
AC_CHECK_HEADERS(unistd.h getopt.h string.h libgen.h math.h)
AC_CHECK_HEADERS(jpeglib.h,,[
echo "Cannot find jpeglib.h You need libjpeg v6 (or later)."
exit 1
......
jpegoptim (1.3.0-1) unstable; urgency=low
* New upstream 1.3.0. Optimize progressive JPEGs
-- Mathieu Malaterre <malat@debian.org> Mon, 01 Apr 2013 09:53:17 +0200
jpegoptim (1.2.5-1) unstable; urgency=low
* New upstream 1.2.5. Closes: #699449, #606726, #675348
......
.TH JPEGOPTIM 1 "30 Sep 2009"
.TH JPEGOPTIM 1 "14 Mar 2013"
.UC 4
.SH NAME
jpegoptim \- utility to optimize/compress JPEG/JFIF files.
......@@ -43,19 +43,28 @@ file.
.B -h, --help
Displays short usage information and exits.
.TP 0.6i
.B -m[0..100], --max=[0..100]
.B -m<quality>, --max=<quality>
Sets the maximum image quality factor (disables lossless optimization
mode, which is by default enabled). This option will reduce quality
of those source files that were saved using higher quality setting.
While files
that already have lower quality setting will be compressed using the
lossless optimization method.
Valid values for quality parameter are: 0 - 100
.TP 0.6i
.B -n, --noaction
Don't really optimize files, just print results.
.TP 0.6i
.B -T[0..100], --threshold=[0..100]
.B -S<size>, --size=<size>
Try to optimize file to given size (disables lossless
optimizaiont mode). Target size is specified either in
kilobytes (1 - n) or as percentage (1% - 99%) of the original file size.
.TP 0.6i
.B -T<treshold>, --threshold=<treshold>
Keep the file unchanged if the compression gain is lower than the threshold (%).
Valid values for treshold are: 0 - 100
.TP 0.6i
.B -o, --overwrite
Overwrite target file even if it exists (when using -d option).
......@@ -72,6 +81,15 @@ Print totals after processing all files.
.B -v, --verbose
Enables verbose mode (positively chatty).
.TP 0.6i
.B --all-normal
Force all output files to be non-progressive. Can be used to convert
all input files to progressive JPEGs when used with --force option.
.TP 0.6i
.B --all-progressive
Force all output files to be progressive. Can be used to convert
all input files to normal (non-progressive) JPEGs when used with --force option.
.TP 0.6i
.B --strip-all
Strip all (Comment & Exif) markers from output file. (NOTE! by default
......@@ -93,7 +111,9 @@ Strip ICC profiles from output file.
.SH BUGS
When optimizing progressive jpeg, result will be a normal jpeg.
When using --size option, resulting file is not always exactly the
requested size. Workaround is to re-run jpegoptim on the same file again
which often will result file closer to target size.
.SH "SEE ALSO"
jpeginfo(1)
......@@ -102,7 +122,7 @@ jpeginfo(1)
Timo Kokkonen <tjko@iki.fi>
.SH COPYING
Copyright (C) 1996,2002,2009 Timo Kokkonen
Copyright (C) 1996-2013 Timo Kokkonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -114,4 +134,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
This diff is collapsed.
Summary: Utility for optimizing/compressing JPEG files.
Name: jpegoptim
Version: 1.2.5
Version: 1.3.0
Release: 1
License: GPL
Group: Applications/Multimedia
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment