--- ufraw-0.15.orig/config.guess +++ ufraw-0.15/config.guess @@ -161,7 +161,6 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -781,7 +780,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -1225,15 +1224,6 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; --- ufraw-0.15.orig/config.sub +++ ufraw-0.15/config.sub @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -957,9 +957,6 @@ basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1258,7 +1255,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1453,9 +1450,6 @@ m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; --- ufraw-0.15.orig/nikon_curve.c +++ ufraw-0.15/nikon_curve.c @@ -111,7 +111,7 @@ printf("NOTE: If a resolution is not specified, a default one will be used.\n"); printf(" If the -o option is not specified, default files will be used.\n\n"); printf("Example:\n"); - printf("NikonCurveGenerator -sr 65536 -or 256 curveFile -o exportFile\n"); + printf("%s -sr 65536 -or 256 curveFile -o exportFile\n", args[0]); //signal that processing cannot occur return NC_ERROR; --- ufraw-0.15.orig/ufraw_conf.c +++ ufraw-0.15/ufraw_conf.c @@ -108,10 +108,8 @@ FALSE, /* silent */ #ifdef WIN32 "gimp-win-remote gimp-2.4.exe", /* remoteGimpCommand */ -#elif HAVE_GIMP_2_6 - "gimp", /* remoteGimpCommand */ #else - "gimp-remote", /* remoteGimpCommand */ + "gimp", /* remoteGimpCommand */ #endif /* EXIF data */ --- ufraw-0.15.orig/debian/changelog +++ ufraw-0.15/debian/changelog @@ -0,0 +1,182 @@ +ufraw (0.15-1) experimental; urgency=low + + * New upstream version. (closes: #510483) + * Canon 450D is supported. (closes: #504539) + * Includes Canon XSi white balance presets. (closes: #509165) + + -- Hubert Chathi Sat, 03 Jan 2009 18:42:12 -0500 + +ufraw (0.14.1-3) experimental; urgency=low + + * Really drop upper limit on gimp dependency. (closes: #504259) + * Default to using gimp rather than gimp-remote, since gimp 2.4 already + has the -remote functionality. (closes: 504260) + + -- Hubert Chathi Sat, 20 Dec 2008 19:24:12 -0500 + +ufraw (0.14.1-2) experimental; urgency=low + + * Really drop gconf2 dependency. (closes: #456233) + * Drop upper limit on gimp dependency. (closes: #504259) + + -- Hubert Chathi Fri, 14 Nov 2008 23:41:35 -0500 + +ufraw (0.14.1-1) experimental; urgency=low + + * New upstream version. (closes: #502398) + * ufraw-batch returns non-zero on error. (closes: #478570) + * updated man page. (closes: #478582) + * uses newer dcraw. (closes: #499665) + * not confused any more by hugin TIFFs. (closes: #500457) + * Drop dependency on gconf2. (closes: #456233) + * Move homepage to homepage field. + * Various cleanups to debian/rules clean target. + * Bump standards version to 3.8.0 (no other changes needed). + + -- Hubert Chathi Tue, 28 Oct 2008 19:36:35 -0400 + +ufraw (0.13-1) unstable; urgency=low + + * New upstream version. (close: #451084) + + -- Hubert Chathi Tue, 11 Dec 2007 13:02:32 -0500 + +ufraw (0.12.1-1) unstable; urgency=low + + * New upstream version. (closes: #436179) + * add build-depends on zlib, libbz2, and libgtkimageview + * Update dependency -- works with gimp 2.4. (closes: #440477) + * Add fix for newer libgtkimageview. (upstream bug #1785426) + + -- Hubert Chan Thu, 13 Sep 2007 03:45:36 -0400 + +ufraw (0.11-2) unstable; urgency=low + + * Use pkg-config instead of exiv2-config. (closes: #427385) + * Update to latest exiv2. + + -- Hubert Chan Tue, 19 Jun 2007 21:09:48 -0400 + +ufraw (0.11-1) unstable; urgency=low + + * New upstream release. + * Use upstream's install process to properly install everything. + + -- Hubert Chan Wed, 4 Apr 2007 13:06:52 -0400 + +ufraw (0.10-1) unstable; urgency=low + + * New upstream release. + * Update maintainer address. + * Install mime info. + + -- Hubert Chan Sun, 29 Oct 2006 15:16:29 -0500 + +ufraw (0.9.1-2) unstable; urgency=low + + * Rebuild against new libexiv2. + - libexiv2 package is now properly versioned. (closes: #387348) + + -- Hubert Chan Tue, 26 Sep 2006 01:43:08 -0400 + +ufraw (0.9.1-1) unstable; urgency=low + + * New upstream release. + * Compile nikon-curve. + + -- Hubert Chan Wed, 16 Aug 2006 21:16:11 -0600 + +ufraw (0.9-1) unstable; urgency=low + + * New upstream release. + + -- Hubert Chan Fri, 4 Aug 2006 13:20:07 -0400 + +ufraw (0.8.1-2) unstable; urgency=low + + * Rebuild against new libexiv2. + * Register .desktop file. + + -- Hubert Chan Wed, 21 Jun 2006 15:34:52 -0400 + +ufraw (0.8.1-1) unstable; urgency=low + + * New upstream release. (closes: #361009) + - no longer use -mcpu=powerpc flag (closes: #361060) + * New maintainer. (Thanks to Matthias for his maintainership.) + * Remove unneeded -fno-loop-optimize flag on powerpc, since default compiler + is now GCC 4. + * Build-depend on libexiv-dev, and configure with --with-exiv2. + (closes: #341471) + - drop build-depend on libexif, because it seems to be buggy. + * Build-depend on Perl, to build manpage. + * Complete copyright information. + * Bump standards version to 3.7.2. (no changes) + * Bump debhelper compatibility level to 5. + * Install readme files in all packages. + * Change package description as per upstream's request. + + -- Hubert Chan Wed, 14 Jun 2006 00:19:48 -0400 + +ufraw (0.5+cvs20051021-1) unstable; urgency=medium + + * Merge with current Upstream. + * Fix for interpolation errors (black pixels). + + -- Matthias Urlichs Tue, 25 Oct 2005 22:15:50 +0200 + +ufraw (0.5+cvs20051013-1) unstable; urgency=low + + * Updated to current CVS, including dcraw 7.77 and new interpolation + algorithm. + + -- Matthias Urlichs Tue, 18 Oct 2005 09:35:43 +0200 + +ufraw (0.4+cvs20050818-1) unstable; urgency=low + + * Updated to current CVS, including dcraw 7.50. + + -- Matthias Urlichs Fri, 19 Aug 2005 11:04:04 +0200 + +ufraw (0.4+cvs20050714-2) unstable; urgency=low + + * Add standalone version. + - Depend on current libexif. + + -- Matthias Urlichs Fri, 19 Aug 2005 10:17:15 +0200 + +ufraw (0.4+cvs20050714-1) unstable; urgency=low + + * Import Upstream CVS. + - Various UTF-8 fixes. + + -- Matthias Urlichs Thu, 14 Jul 2005 23:18:35 +0200 + +ufraw (0.4-1) unstable; urgency=low + + * New Upstream version. + - Closes:#294195 + + -- Matthias Urlichs Sun, 13 Feb 2005 16:33:49 +0100 + +ufraw (0.2-3) unstable; urgency=low + + * Conflicts: with gimp-dcraw for usability reasons. + + -- Matthias Urlichs Sun, 16 Jan 2005 13:41:56 +0100 + +ufraw (0.2-2) unstable; urgency=low + + * Rebuild against gimp-2.2. + + -- Matthias Urlichs Wed, 22 Dec 2004 09:14:48 +0100 + +ufraw (0.2-1) unstable; urgency=low + + * Initial Release. + Closes:#283385 + * updated to latest dcraw version + + -- Matthias Urlichs Sun, 28 Nov 2004 17:27:03 +0100 + + --- ufraw-0.15.orig/debian/compat +++ ufraw-0.15/debian/compat @@ -0,0 +1 @@ +5 --- ufraw-0.15.orig/debian/control +++ ufraw-0.15/debian/control @@ -0,0 +1,38 @@ +Source: ufraw +Section: graphics +Priority: optional +Maintainer: Hubert Chathi +Build-Depends: debhelper (>= 5), libgimp2.0-dev (>= 2.2), libjpeg62-dev, liblcms-dev, libtiff4-dev | libtiff-dev, libexiv2-dev (>= 0.14), perl, libbz2-dev, zlib1g-dev, libgtkimageview-dev +Standards-Version: 3.8.0 + +Package: ufraw +Architecture: any +Depends: ${shlibs:Depends}, desktop-file-utils, ${misc:Depends} +Description: standalone importer for raw camera images + This is a standalone tool to import raw data from high-end digital cameras. + . + The Unidentified Flying Raw (UFRaw) is a utility for converting and + manipulating raw images from digital cameras. It can be used as a + stand-alone tool or as a Gimp plug-in, and images can be batch + processed using the command-line interface. UFRaw reads most existing + raw formats using Dave Coffin's raw conversion utility DCRaw, and it + supports basic color management using Little CMS, allowing the user to + apply color profiles. +Homepage: http://ufraw.sourceforge.net/ + +Package: gimp-ufraw +Architecture: any +Depends: ${shlibs:Depends}, gimp (>= 2.2), ${misc:Depends} +Conflicts: gimp-dcraw +Description: gimp importer for raw camera images + This is a graphical tool to import raw data from high-end digital cameras + into the Gimp. + . + The Unidentified Flying Raw (UFRaw) is a utility for converting and + manipulating raw images from digital cameras. It can be used as a + stand-alone tool or as a Gimp plug-in, and images can be batch + processed using the command-line interface. UFRaw reads most existing + raw formats using Dave Coffin's raw conversion utility DCRaw, and it + supports basic color management using Little CMS, allowing the user to + apply color profiles. +Homepage: http://ufraw.sourceforge.net/ --- ufraw-0.15.orig/debian/copyright +++ ufraw-0.15/debian/copyright @@ -0,0 +1,70 @@ +The Debian package has been created by Matthias Urlichs +on Sun, 28 Nov 2004 17:27:03 +0100. + +The current Debian maintainer is Hubert Chathi . + +The original source was been downloaded from: http://ufraw.sourceforge.net/ + +Upstream Authors: + +UFRaw was written by Udi Fuchs, +and contains code by Pawel T. Jochym , +Dave Coffin (http://www.cybercom.net/~dcoffin/), +and Shawn Freeman. It also contains code from liblcms. + +License: + +The original source was released under the GPL version 2. + + 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 + the Free Software Foundation, version 2 of the License. + + 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. + + 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 St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The file dcraw.c, written by Dave Coffin, is released under the following +license: + + Attention! Some parts of this program are restricted under the + terms of the GNU General Public License. Such code is enclosed + in "BEGIN GPL BLOCK" and "END GPL BLOCK" declarations. + Any code not declared GPL is free for all uses. + + Starting in Revision 1.237, the code to support Foveon cameras + is under GPL. + + To lawfully redistribute dcraw.c, you must either (a) include + full source code for all executable files containing restricted + functions, (b) remove these functions, re-implement them, or + copy them from an earlier, non-GPL Revision of dcraw.c, or (c) + purchase a license from the author. + +The portions taken from liblcms is released under the MIT license: + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. --- ufraw-0.15.orig/debian/docs +++ ufraw-0.15/debian/docs @@ -0,0 +1,3 @@ +README +TODO +MANIFEST --- ufraw-0.15.orig/debian/gimp-ufraw.dirs +++ ufraw-0.15/debian/gimp-ufraw.dirs @@ -0,0 +1 @@ +usr/lib --- ufraw-0.15.orig/debian/rules +++ ufraw-0.15/debian/rules @@ -0,0 +1,110 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +endif + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + #test -r /usr/share/misc/config.sub && \ + # cp -f /usr/share/misc/config.sub config.sub || \ + # test -r config.sub + #test -r /usr/share/misc/config.guess && \ + # cp -f /usr/share/misc/config.guess config.guess || \ + # test -r config.guess + #mkdir -p m4 + #test -r /usr/share/aclocal/libgcrypt.m4 && \ + # cp -f /usr/share/aclocal/libgcrypt.m4 m4 || \ + # test -r m4/libgcrypt.m4 + + #touch NEWS AUTHORS ChangeLog + # if test -f ltmain.sh ; then touch ltmain.sh; else libtoolize -c --force --automake; mv l*.m4 m4; fi + #if test -f aclocal.m4 ; then touch aclocal.m4; else aclocal-1.9 -I m4; fi + #if test -f config.h.in ; then touch config.h.in; else autoheader2.50; fi + #if test -f Makefile.in ; then find . -name Makefile.in -exec touch {} \; ;\ + # else automake-1.9 --gnu --copy --add-missing; fi + + #if test -f configure ; then touch configure; else autoconf2.50 -I . ; fi + + #-$(MAKE) distclean + + rm -f autom4te.cache + rm -f config.log + + dh_clean + +config: config-stamp +config-stamp: configure + dh_testdir + chmod +x configure + CFLAGS="$(CFLAGS)" \ + ./configure --enable-maintainer-mode \ + --prefix=/usr --libexecdir=/usr/lib/ \ + --with-exiv2 --enable-extras --enable-mime + touch config-stamp + +build: build-stamp +build-stamp: config + dh_testdir + + $(MAKE) + + touch build-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + +# install in ufraw, and move gimp plugin to gimp-ufraw package + $(MAKE) install DESTDIR=$(CURDIR)/debian/ufraw + mv $(CURDIR)/debian/ufraw/usr/lib/gimp $(CURDIR)/debian/gimp-ufraw/usr/lib +# remove the dcraw binary, since it's in the dcraw package + rm $(CURDIR)/debian/ufraw/usr/bin/dcraw + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs -n -A + dh_installexamples + dh_install +# dh_installmenu +# dh_installdebconf + dh_installmime +# dh_gconf +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_desktop -pufraw + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: config build clean binary-indep binary-arch binary install --- ufraw-0.15.orig/debian/ufraw.dirs +++ ufraw-0.15/debian/ufraw.dirs @@ -0,0 +1 @@ +usr/bin --- ufraw-0.15.orig/debian/ufraw.links +++ ufraw-0.15/debian/ufraw.links @@ -0,0 +1 @@ +usr/share/man/man1/ufraw.1 usr/share/man/man1/ufraw-batch.1 \ No newline at end of file --- ufraw-0.15.orig/debian/ufraw.manpages +++ ufraw-0.15/debian/ufraw.manpages @@ -0,0 +1,2 @@ +ufraw.1 +debian/nikon-curve.1 --- ufraw-0.15.orig/debian/ufraw.postinst +++ ufraw-0.15/debian/ufraw.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e +# register ufraw.schemas if gconf2 is installed +if [ "$1" = "configure" ] && which gconf-schemas >/dev/null 2>&1; then + gconf-schemas --register ufraw.schemas +fi + +#DEBHELPER# --- ufraw-0.15.orig/debian/ufraw.postrm +++ ufraw-0.15/debian/ufraw.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +# remove schema files +# make sure this is synced with /usr/share/debhelper/autoscripts/postrm-gconf +if [ "$1" = purge ]; then + OLD_DIR=/etc/gconf/schemas + SCHEMA_FILES="ufraw.schemas" + if [ -d $OLD_DIR ]; then + for SCHEMA in $SCHEMA_FILES; do + rm -f $OLD_DIR/$SCHEMA + done + rmdir -p --ignore-fail-on-non-empty $OLD_DIR + fi +fi + +#DEBHELPER# --- ufraw-0.15.orig/debian/ufraw.prerm +++ ufraw-0.15/debian/ufraw.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# unregister ufraw.schemas if gconf2 is installed +if ([ "$1" = remove ] || [ "$1" = upgrade ]) && which gconf-schemas >/dev/null 2>&1; then + gconf-schemas --unregister ufraw.schemas +fi + +#DEBHELPER# --- ufraw-0.15.orig/debian/nikon-curve.1 +++ ufraw-0.15/debian/nikon-curve.1 @@ -0,0 +1,42 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH NIKON-CURVE 1 "16 Aug 2006" +.\" Please adjust this date whenever revising the manpage. +.SH NAME +nikon-curve \- generate interpolation data from Nikon tone curves +.SH SYNOPSIS +\fB nikon-curve\fR [ \fIoptions and input file\fP ] +.SH DESCRIPTION +\fBnikon-curve\fP reads in a Nikon NTC/NCV or NEF file, interprets its tone +curve, and writes out a simple ASCII file containing a table of interpolation +values. +.SH OPTIONS +A summary of options is included below. +.TP +.B \-h +Show summary of options. +.TP +.B \-o +Specify output file. +.TP +.B \-sr +Specify sampling resolution. Default is 65536. +.TP +.B \-or +Specify output resolution. Default is 256. +.TP +.B \-nef +Specify an NEF file to get tone curve data from. +.PP +The \-or and \-sr options are ignored for NEF files. +.PP +NOTE: If a resolution is not specified, a default one will be used. +If the -o option is not specified, default files will be used. +.SH EXAMPLE +.RS +nikon-curve -sr 65536 -or 256 curveFile -o exportFile +.RE +.SH AUTHOR +nikon-curve was written by Shawn Freeman and Udi Fuchs. +.PP +This manual page was written by Hubert Chan , +for the Debian project (but may be used by others).