Commit c0281b7c authored by Mathieu Malaterre's avatar Mathieu Malaterre

Import Debian changes 1.3.1-1

jpegoptim (1.3.1-1) unstable; urgency=low

  * New upstream. Closes: #708630, #727906
  * Bump Std-Vers to 3.9.5, no changes needed
parents 5a91057b 99b53448
Makefile
config.h
config.status
config.log
jpegoptim
*.o
*.jpg
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Makefile for jpegoptim # Makefile for jpegoptim
# #
Version = 1.3.0 Version = 1.3.1
PKGNAME = jpegoptim PKGNAME = jpegoptim
SHELL = /bin/sh SHELL = /bin/sh
...@@ -77,18 +77,18 @@ archive: ...@@ -77,18 +77,18 @@ archive:
install: all install.dirs install.man install: all install.dirs install.man
$(INSTALL) -m 755 $(PKGNAME) $(INSTALL_ROOT)/$(bindir)/$(PKGNAME) $(INSTALL) -m 755 $(PKGNAME) $(DESTDIR)/$(bindir)/$(PKGNAME)
printable.man: printable.man:
groff -Tps -mandoc ./$(PKGNAME).1 >$(PKGNAME).ps groff -Tps -mandoc ./$(PKGNAME).1 >$(PKGNAME).ps
groff -Tascii -mandoc ./$(PKGNAME).1 | tee $(PKGNAME).prn | sed 's/.//g' >$(PKGNAME).txt groff -Tascii -mandoc ./$(PKGNAME).1 | tee $(PKGNAME).prn | sed 's/.//g' >$(PKGNAME).txt
install.man: install.dirs install.man: install.dirs
$(INSTALL) -m 644 $(PKGNAME).1 $(INSTALL_ROOT)/$(mandir)/man1/$(PKGNAME).1 $(INSTALL) -m 644 $(PKGNAME).1 $(DESTDIR)/$(mandir)/man1/$(PKGNAME).1
install.dirs: install.dirs:
$(INSTALL) -d -m 755 $(INSTALL_ROOT)/$(mandir)/man1 $(INSTALL) -d -m 755 $(DESTDIR)/$(mandir)/man1
$(INSTALL) -d -m 755 $(INSTALL_ROOT)/$(bindir) $(INSTALL) -d -m 755 $(DESTDIR)/$(bindir)
# a tradition ! # a tradition !
love: love:
......
Jpegoptim v1.3.0 Copyright (c) Timo Kokkonen, 1996-2013. Jpegoptim v1.3.1 Copyright (c) Timo Kokkonen, 1996-2014.
REQUIREMENTS REQUIREMENTS
...@@ -14,11 +14,11 @@ TESTED PLATFORMS ...@@ -14,11 +14,11 @@ TESTED PLATFORMS
INSTALLATION INSTALLATION
Installation should be very straightforward, just unpack the Installation should be very straightforward, just unpack the
tar file, make nesessary changes to the Makefile, and then tar file, make necessary changes to the Makefile, and then
compile the program. You may wanna do something like this: compile the program. You may wanna do something like this:
zcat jpegoptim-1.3.0.tar.gz | tar xf - zcat jpegoptim-1.3.1.tar.gz | tar xf -
cd jpegoptim-1.3.0 cd jpegoptim-1.3.1
./configure ./configure
make make
make strip make strip
...@@ -26,6 +26,13 @@ INSTALLATION ...@@ -26,6 +26,13 @@ INSTALLATION
HISTORY HISTORY
v1.3.1 - XMP marker support and new --csv option (by Matteo Croce),
use DESTDIR instead of INSTALL_ROOT (by Samuli Suominen),
changes to make compiling under Win32 and Win64
easier (thanks to Javier Gutiérrez),
preserve permissions of files being optimized,
skip symlinks (and other special files),
other minor fixes
v1.3.0 - support for progressive jpegs added (fixes long standing v1.3.0 - support for progressive jpegs added (fixes long standing
"bug" of progressive jpegs becoming non-progressive during "bug" of progressive jpegs becoming non-progressive during
optimization), optimization),
...@@ -36,7 +43,7 @@ HISTORY ...@@ -36,7 +43,7 @@ HISTORY
updated GPL/Copyrights language (thanks to Nicolas Vieville) updated GPL/Copyrights language (thanks to Nicolas Vieville)
v1.2.5 - safer temp file handling (if mkstemps() available), v1.2.5 - safer temp file handling (if mkstemps() available),
patch to make "quiet mode" (-q) be quiet by Mathieu Malaterre patch to make "quiet mode" (-q) be quiet by Mathieu Malaterre
v1.2.4 - new -T / --treshold option by Matteo Croce, v1.2.4 - new -T / --threshold option by Matteo Croce,
minor fixes (potential memory leaks), minor fixes (potential memory leaks),
merged some patches from Debian jpegoptim package (1.2.3-2) merged some patches from Debian jpegoptim package (1.2.3-2)
v1.2.3 - IPTC marker support by Dustin Ward, v1.2.3 - IPTC marker support by Dustin Ward,
...@@ -66,5 +73,5 @@ LATEST VERSION ...@@ -66,5 +73,5 @@ LATEST VERSION
Timo <tjko@iki.fi> Timo <tjko@iki.fi>
14-Mar-2013 $Id$ 24-Mar-2014 $Id$
This diff is collapsed.
...@@ -3,7 +3,7 @@ dnl ...@@ -3,7 +3,7 @@ dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(jpegoptim.c) AC_INIT(jpegoptim.c)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR(aux) AC_CONFIG_AUX_DIR(tools)
AC_CANONICAL_HOST AC_CANONICAL_HOST
......
jpegoptim (1.3.1-1) unstable; urgency=low
* New upstream. Closes: #708630, #727906
* Bump Std-Vers to 3.9.5, no changes needed
-- Mathieu Malaterre <malat@debian.org> Fri, 25 Apr 2014 16:39:14 +0200
jpegoptim (1.3.0-1) unstable; urgency=low jpegoptim (1.3.0-1) unstable; urgency=low
* New upstream 1.3.0. Optimize progressive JPEGs * New upstream 1.3.0. Optimize progressive JPEGs
......
...@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, libjpeg-dev ...@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, libjpeg-dev
Homepage: http://github.com/tjko/jpegoptim Homepage: http://github.com/tjko/jpegoptim
Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/jpegoptim/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/jpegoptim/trunk/
Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/jpegoptim/trunk Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/jpegoptim/trunk
Standards-Version: 3.9.4 Standards-Version: 3.9.5
Package: jpegoptim Package: jpegoptim
Architecture: any Architecture: any
......
.TH JPEGOPTIM 1 "14 Mar 2013" .TH JPEGOPTIM 1 "24 Mar 2014"
.UC 4 .UC 4
.SH NAME .SH NAME
jpegoptim \- utility to optimize/compress JPEG/JFIF files. jpegoptim \- utility to optimize/compress JPEG/JFIF files.
...@@ -19,6 +19,14 @@ optimization, which is based on optimizing the Huffman tables. And ...@@ -19,6 +19,14 @@ optimization, which is based on optimizing the Huffman tables. And
so called "lossy" optimization where in addition to optimizing Huffman so called "lossy" optimization where in addition to optimizing Huffman
tables user can specify upperlimit for image quality. tables user can specify upperlimit for image quality.
NOTE! By default jpegoptim modifies the input files (if they are optimized),
to preserve original files use option \fB\-d\fR to specify alternate directory for saving the optimized files to.
Only normal files are optimized (symbolic links and special files are skipped).
Also, any other hard links to the file being optimized (as created using
.BR link (2))
are unaffected.
.SH OPTIONS .SH OPTIONS
.PP .PP
...@@ -58,13 +66,16 @@ Don't really optimize files, just print results. ...@@ -58,13 +66,16 @@ Don't really optimize files, just print results.
.TP 0.6i .TP 0.6i
.B -S<size>, --size=<size> .B -S<size>, --size=<size>
Try to optimize file to given size (disables lossless Try to optimize file to given size (disables lossless
optimizaiont mode). Target size is specified either in optimization mode). Target size is specified either in
kilobytes (1 - n) or as percentage (1% - 99%) of the original file size. kilobytes (1 - n) or as percentage (1% - 99%) of the original file size.
.TP 0.6i .TP 0.6i
.B -T<treshold>, --threshold=<treshold> .B -T<threshold>, --threshold=<threshold>
Keep the file unchanged if the compression gain is lower than the threshold (%). Keep the file unchanged if the compression gain is lower than the threshold (%).
Valid values for treshold are: 0 - 100 Valid values for threshold are: 0 - 100
.TP 0.6i
.B -b, --csv
Print progress info in CSV format.
.TP 0.6i .TP 0.6i
.B -o, --overwrite .B -o, --overwrite
Overwrite target file even if it exists (when using -d option). Overwrite target file even if it exists (when using -d option).
...@@ -91,7 +102,7 @@ Force all output files to be progressive. Can be used to convert ...@@ -91,7 +102,7 @@ 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. all input files to normal (non-progressive) JPEGs when used with --force option.
.TP 0.6i .TP 0.6i
.B --strip-all .B -s, --strip-all
Strip all (Comment & Exif) markers from output file. (NOTE! by default Strip all (Comment & Exif) markers from output file. (NOTE! by default
only Comment & Exif markers are kept, everything else is discarded) only Comment & Exif markers are kept, everything else is discarded)
.TP 0.6i .TP 0.6i
...@@ -106,6 +117,9 @@ Strip IPTC markers from output file. ...@@ -106,6 +117,9 @@ Strip IPTC markers from output file.
.TP 0.6i .TP 0.6i
.B --strip-icc .B --strip-icc
Strip ICC profiles from output file. Strip ICC profiles from output file.
.TP 0.6i
.B --strip-xmp
Strip XMP profiles from output file.
...@@ -122,7 +136,7 @@ jpeginfo(1) ...@@ -122,7 +136,7 @@ jpeginfo(1)
Timo Kokkonen <tjko@iki.fi> Timo Kokkonen <tjko@iki.fi>
.SH COPYING .SH COPYING
Copyright (C) 1996-2013 Timo Kokkonen Copyright (C) 1996-2014 Timo Kokkonen
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
......
This diff is collapsed.
...@@ -31,7 +31,7 @@ make ...@@ -31,7 +31,7 @@ make
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install INSTALL_ROOT=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
......
This diff is collapsed.
This diff is collapsed.
#!/bin/sh #!/bin/sh
# install - install a program, script, or datafile # install - install a program, script, or datafile
scriptversion=2009-04-28.21; # UTC scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was # This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the # later released in X11R6 (xc/config/util/install.sh) with the
...@@ -156,6 +156,10 @@ while test $# -ne 0; do ...@@ -156,6 +156,10 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;; -s) stripcmd=$stripprog;;
-t) dst_arg=$2 -t) dst_arg=$2
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;; shift;;
-T) no_target_directory=true;; -T) no_target_directory=true;;
...@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ...@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi fi
shift # arg shift # arg
dst_arg=$arg dst_arg=$arg
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
done done
fi fi
...@@ -200,7 +208,11 @@ if test $# -eq 0; then ...@@ -200,7 +208,11 @@ if test $# -eq 0; then
fi fi
if test -z "$dir_arg"; then if test -z "$dir_arg"; then
trap '(exit $?); exit' 1 2 13 15 do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes. # Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps. # However, 'strip' requires both read and write access to temps.
...@@ -228,9 +240,9 @@ fi ...@@ -228,9 +240,9 @@ fi
for src for src
do do
# Protect names starting with `-'. # Protect names problematic for `test' and other utilities.
case $src in case $src in
-*) src=./$src;; -* | [=\(\)!]) src=./$src;;
esac esac
if test -n "$dir_arg"; then if test -n "$dir_arg"; then
...@@ -252,12 +264,7 @@ do ...@@ -252,12 +264,7 @@ do
echo "$0: no destination specified." >&2 echo "$0: no destination specified." >&2
exit 1 exit 1
fi fi
dst=$dst_arg dst=$dst_arg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work # If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored. # if double slashes aren't ignored.
...@@ -385,7 +392,7 @@ do ...@@ -385,7 +392,7 @@ do
case $dstdir in case $dstdir in
/*) prefix='/';; /*) prefix='/';;
-*) prefix='./';; [-=\(\)!]*) prefix='./';;
*) prefix='';; *) prefix='';;
esac esac
...@@ -403,7 +410,7 @@ do ...@@ -403,7 +410,7 @@ do
for d for d
do do
test -z "$d" && continue test X"$d" = X && continue
prefix=$prefix$d prefix=$prefix$d
if test -d "$prefix"; then if test -d "$prefix"; then
......
/* win32_compat.h
*
* compatibility stuff for Windows
*/
#ifndef _WIN32_COMPAT_H
#define _WIN32_COMPAT_H 1
#ifdef __cplusplus
extern "C" {
#endif
#include <process.h>
#include <errno.h>
#include <io.h> /* _findfirst and _findnext set errno iff they return -1 */
#include <fcntl.h>
#include <sys/utime.h>
#define snprintf _snprintf
#define lstat _stat
#define realpath(N,R) _fullpath((R),(N),MAXPATHLEN)
#define ftruncate(fildes,length) open(fildes, O_TRUNC|O_WRONLY)
#define round(x) ((int) (x))
#define getuid(x) 0
#define geteuid() 0
#define chown(outfname,st_uid,st_gid) 0
#define S_ISREG(x) 1
#ifndef HOST_TYPE
#if _WIN64
#define HOST_TYPE "Win64"
#else if WIN32
#define HOST_TYPE "Win32"
#endif
#endif
#ifdef __cplusplus
}
#endif
#endif /* _WIN32_COMPAT_H */
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