diff --git a/ChangeLog b/ChangeLog index 7612ed2d..d792edff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +9/11/09 started 7.20.0 +- removed vips-7.x.spec.in, shouldn't really have this in SVN +- bumped version to 7.20 + 3/4/09 started 7.19.0 - version bump - tiny conv speedup diff --git a/configure.in b/configure.in index 5b3580c3..f002d381 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_MACRO_DIR(m4) # user-visible library versioning IM_MAJOR_VERSION=7 -IM_MINOR_VERSION=19 +IM_MINOR_VERSION=20 IM_MICRO_VERSION=0 IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION IM_VERSION_STRING=$IM_VERSION-`date` @@ -22,9 +22,9 @@ PACKAGE=vips # interface changes backwards compatible?: increment age # interface changes not backwards compatible?: reset age to 0 -LIBRARY_CURRENT=25 +LIBRARY_CURRENT=27 LIBRARY_REVISION=0 -LIBRARY_AGE=10 +LIBRARY_AGE=12 AM_INIT_AUTOMAKE($PACKAGE,$VERSION) @@ -494,9 +494,8 @@ AC_SUBST(PACKAGES_USED) # vips-$IM_MAJOR_VERSION.$IM_MINOR_VERSION.pc # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 AC_OUTPUT([ - vips-7.19.pc - vipsCC-7.19.pc - vips-7.19.spec + vips-7.20.pc + vipsCC-7.20.pc Makefile libvips/include/vips/version.h libvips/include/Makefile diff --git a/doc/src/refintro.tex b/doc/src/refintro.tex index 2632507e..0c2b5efa 100644 --- a/doc/src/refintro.tex +++ b/doc/src/refintro.tex @@ -1,7 +1,16 @@ \section{Introduction} \mylabel{sec:ref} -This document introduces the functions available in the VIPS image +{/bf +VIPS reference documentation is in the process of switching to gtkdoc. +Half-done manuals are distributed with VIPS, and they should be all done by +the next version. + +In the meantime, this old and slightly outdated chapter has been left +unchanged from the previous version. +} + +This chapter introduces the functions available in the VIPS image processing library. For detailed information on particular functions, refer to the UNIX on-line manual pages. Enter (for example): diff --git a/doc/src/vipsmanual.tex b/doc/src/vipsmanual.tex index f00af00c..faa41704 100644 --- a/doc/src/vipsmanual.tex +++ b/doc/src/vipsmanual.tex @@ -16,7 +16,7 @@ \fancyhead[LE,RO]{\leftmark} % left-even, right-odd \fancyhead[RE,LO]{VIPS Manual} % right-even, left-odd \fancyfoot[LE,RO]{\thepage} % left-even, right-odd -\fancyfoot[RE,LO]{January 2007} +\fancyfoot[RE,LO]{November 2009} \begin{document} @@ -27,7 +27,7 @@ \begin{center} \huge VIPS Manual\\ -\large Version 7.18\\ +\large Version 7.20\\ \vspace{0.5in} \large John Cupitt, diff --git a/libvips/colour/disp.c b/libvips/colour/disp.c index 65895dcc..d19e41d8 100644 --- a/libvips/colour/disp.c +++ b/libvips/colour/disp.c @@ -346,9 +346,6 @@ im_col_make_tables_RGB( IMAGE *im, struct im_col_display *d ) double **temp; int i, j; - printf( "im_col_make_tables_RGB: generating table for %s\n", - d->d_name ); - if( !(table = IM_NEW( im, struct im_col_tab_disp )) ) return( NULL ); diff --git a/tools/scripts/Makefile.am b/tools/scripts/Makefile.am index aee1ab20..2a08c91a 100644 --- a/tools/scripts/Makefile.am +++ b/tools/scripts/Makefile.am @@ -4,7 +4,7 @@ bin_SCRIPTS = \ batch_image_convert \ batch_rubber_sheet \ batch_crop \ - vips-7.19 + vips-7.20 noinst_SCRIPTS = post_install diff --git a/tools/scripts/vips-7.19 b/tools/scripts/vips-7.20 similarity index 100% rename from tools/scripts/vips-7.19 rename to tools/scripts/vips-7.20 diff --git a/vips-7.19.spec.in b/vips-7.19.spec.in deleted file mode 100644 index f4535861..00000000 --- a/vips-7.19.spec.in +++ /dev/null @@ -1,226 +0,0 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -Name: @PACKAGE@ -Version: @VERSION@ -Release: 1%{?dist} -Summary: Library for processing large images - -Group: System Environment/Libraries -License: LGPLv2+ -URL: http://www.vips.ecs.soton.ac.uk/ -Source0: http://www.vips.ecs.soton.ac.uk/supported/7.14/%{name}-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: libjpeg-devel libtiff-devel zlib-devel fftw-devel lcms-devel -BuildRequires: libpng-devel glib2-devel ImageMagick-devel pango-devel -BuildRequires: pkgconfig gettext -BuildRequires: libtool python-devel libxml2-devel liboil-devel -BuildRequires: OpenEXR-devel libexif-devel swig -#Requires: - - -%description -VIPS is an image processing library. It is good for very large images -(even larger than the amount of RAM in your machine), and for working -with color. It includes a C++ API, complete man pages, a command-line -interface, automatic threading and an operation database. There are -several user interfaces built on top of VIPS: for example "nip2". - -This package should be installed if you want to use a program compiled -against VIPS. - - -%package devel -Summary: Development tools for programs for processing large images -Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, pkgconfig -Requires: libjpeg-devel libtiff-devel zlib-devel fftw-devel lcms-devel -Requires: libpng-devel glib2-devel ImageMagick-devel pango-devel -Requires: libxml2-devel liboil-devel OpenEXR-devel libexif-devel - -%description devel -The %{name}-devel package contains the header files and -libraries necessary for developing programs using VIPS. It also -contains a C++ API and development man pages. - - -%package tools -Summary: Command-line tools for processing large images -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} - -%description tools -The %{name}-tools package contains command-line tools for working with VIPS. - - -%package python -Summary: Python support for the VIPS image processing library -Group: Development/Languages -Requires: %{name} = %{version}-%{release} - -%description python -The %{name}-python package contains Python support for VIPS. - - -%package doc -Summary: Documentation for VIPS image processing library -Group: Documentation -Conflicts: %{name} < %{version}-%{release}, %{name} > %{version}-%{release} - -%description doc -The %{name}-doc package contains extensive documentation about VIPS in both -HTML and PDF formats. - - -%prep -%setup -q -find . -name 'CVS' -type d -print0 | xargs -0r rm -rf -find . -name '\.svn' -type d -print0 | xargs -0r rm -rf - -# make the version string consistent for multiarch -export FAKE_BUILD_DATE=$(date -r %{SOURCE0}) -sed -i "s/\\(IM_VERSION_STRING=\\)\$IM_VERSION-\`date\`/\\1\"\$IM_VERSION-$FAKE_BUILD_DATE\"/g" \ - configure -unset FAKE_BUILD_DATE - - -%build -%configure --disable-static -make %{?_smp_mflags} LIBTOOL=libtool - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';' - -# delete doc (we will get it later with %doc) -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/vips - -# malkovich?? -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/locale/malkovich - -# locale stuff -%find_lang vips7 - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -f vips7.lang -%defattr(-,root,root,-) -%doc AUTHORS NEWS THANKS TODO COPYING ChangeLog -%{_libdir}/*.so.* -%{_datadir}/vips - - -%files devel -%defattr(-,root,root,-) -%{_includedir}/vips -%{_libdir}/*.so -%{_libdir}/pkgconfig/* -%{_mandir}/man3/* - - -%files tools -%defattr(-,root,root,-) -%{_bindir}/* -%{_mandir}/man1/* - - -%files python -%defattr(-,root,root,-) -%{python_sitearch}/* - - -%files doc -%defattr(-,root,root,-) -%doc doc/html doc/pdf - - - -%changelog -* Thu Sep 4 2008 John Cupitt - 7.16.0 -- Removed perl(XML::Parser) from BuildRequires since we no longer use - intltool - -* Sat Jul 19 2008 Jesper Friis - 7.15.0-1 -- Replaced the distributed spec file with the one in the source rpm - package from Fedora to fix issues with harcoding BuildRoot in the - installed files - -* Sat Mar 15 2008 Adam Goode - 7.14.1-1 -- New release - -* Mon Mar 10 2008 Adam Goode - 7.14.0-1 -- New release -- Remove GCC 4.3 patch (upstream) - -* Sat Feb 9 2008 Adam Goode - 7.12.5-5 -- Fix GCC 4.3 build - -* Sat Feb 9 2008 Adam Goode - 7.12.5-4 -- GCC 4.3 mass rebuild - -* Tue Oct 23 2007 Adam Goode - 7.12.5-3 -- Eliminate build differences in version.h to work on multiarch - -* Mon Oct 15 2007 Adam Goode - 7.12.5-2 -- Rebuild for OpenEXR update - -* Fri Sep 21 2007 Adam Goode - 7.12.5-1 -- New upstream release - -* Thu Aug 16 2007 Adam Goode - 7.12.4-2 -- Add Conflicts for doc -- Update doc package description - -* Thu Aug 16 2007 Adam Goode - 7.12.4-1 -- New upstream release -- Update License tag - -* Tue Jul 24 2007 Adam Goode - 7.12.2-1 -- New stable release 7.12 - -* Sat May 5 2007 Adam Goode - 7.12.0-1 -- New upstream release - -* Thu Aug 31 2006 Adam Goode - 7.10.21-1 -- New upstream release - -* Fri Jul 28 2006 Adam Goode - 7.10.20-3 -- Include results of running automake in the patch for undefined symbols -- No longer run automake or autoconf (autoconf was never actually necessary) - -* Mon Jul 24 2006 Adam Goode - 7.10.20-2 -- Eliminate undefined non-weak symbols in libvipsCC.so - -* Fri Jul 21 2006 Adam Goode - 7.10.20-1 -- New upstream release -- Updated for FC5 - -* Tue Dec 14 2004 John Cupitt 7.10.8 -- updated for 7.10.8 -- now updated from configure -- implicit deps and files - -* Wed Jul 16 2003 John Cupitt 7.8.10 -- updated for 7.8.10 -- updated %%files -- copies formatted docs to install area - -* Wed Mar 12 2003 John Cupitt 7.8.8 -- updated for 7.8.8, adding libdrfftw - -* Mon Feb 3 2003 John Cupitt 7.8.7-2 -- hack to change default install prefix to /usr/local - -* Thu Jan 30 2003 John Cupitt 7.8.7-1 -- first stab at an rpm package for vips diff --git a/vips-7.19.pc.in b/vips-7.20.pc.in similarity index 100% rename from vips-7.19.pc.in rename to vips-7.20.pc.in diff --git a/vipsCC-7.19.pc.in b/vipsCC-7.20.pc.in similarity index 100% rename from vipsCC-7.19.pc.in rename to vipsCC-7.20.pc.in