--- ufraw-0.11.orig/configure.ac +++ ufraw-0.11/configure.ac @@ -185,12 +185,10 @@ AC_MSG_RESULT($with_exiv2) have_exiv2=no if test $with_exiv2 = yes; then - AC_CHECK_PROGS(EXIV2_CONFIG, exiv2-config, , $PATH) - if test -n "$EXIV2_CONFIG"; then - have_exiv2=yes - AC_DEFINE(HAVE_EXIV2, 1, have exiv2) - EXIV2_LIBS=`$EXIV2_CONFIG --libs` - fi + PKG_CHECK_MODULES(EXIV2, exiv2, + [ have_exiv2=yes + AC_DEFINE(HAVE_EXIV2, 1, have exiv2)], + AC_MSG_RESULT($EXIV2_PKG_ERRORS)) fi UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS" --- ufraw-0.11.orig/configure +++ ufraw-0.11/configure @@ -722,7 +722,8 @@ EXIF_CFLAGS EXIF_LIBS COMMENT_LIBEXIF -EXIV2_CONFIG +EXIV2_CFLAGS +EXIV2_LIBS WINDRES PREFIX DOSPREFIX @@ -778,7 +779,9 @@ GIMP_CFLAGS GIMP_LIBS EXIF_CFLAGS -EXIF_LIBS' +EXIF_LIBS +EXIV2_CFLAGS +EXIV2_LIBS' # Initialize some variables set by options. @@ -1395,6 +1398,9 @@ GIMP_LIBS linker flags for GIMP, overriding pkg-config EXIF_CFLAGS C compiler flags for EXIF, overriding pkg-config EXIF_LIBS linker flags for EXIF, overriding pkg-config + EXIV2_CFLAGS + C compiler flags for EXIV2, overriding pkg-config + EXIV2_LIBS linker flags for EXIV2, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -8213,57 +8219,84 @@ echo "${ECHO_T}$with_exiv2" >&6; } have_exiv2=no if test $with_exiv2 = yes; then - for ac_prog in exiv2-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_EXIV2_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for EXIV2" >&5 +echo $ECHO_N "checking for EXIV2... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$EXIV2_CFLAGS"; then + pkg_cv_EXIV2_CFLAGS="$EXIV2_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exiv2\"") >&5 + ($PKG_CONFIG --exists --print-errors "exiv2") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_EXIV2_CFLAGS=`$PKG_CONFIG --cflags "exiv2" 2>/dev/null` else - if test -n "$EXIV2_CONFIG"; then - ac_cv_prog_EXIV2_CONFIG="$EXIV2_CONFIG" # Let the user override the test. + pkg_failed=yes +fi + fi else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_EXIV2_CONFIG="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + pkg_failed=untried fi +if test -n "$PKG_CONFIG"; then + if test -n "$EXIV2_LIBS"; then + pkg_cv_EXIV2_LIBS="$EXIV2_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exiv2\"") >&5 + ($PKG_CONFIG --exists --print-errors "exiv2") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_EXIV2_LIBS=`$PKG_CONFIG --libs "exiv2" 2>/dev/null` +else + pkg_failed=yes fi -EXIV2_CONFIG=$ac_cv_prog_EXIV2_CONFIG -if test -n "$EXIV2_CONFIG"; then - { echo "$as_me:$LINENO: result: $EXIV2_CONFIG" >&5 -echo "${ECHO_T}$EXIV2_CONFIG" >&6; } + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + pkg_failed=untried fi - test -n "$EXIV2_CONFIG" && break -done - if test -n "$EXIV2_CONFIG"; then - have_exiv2=yes +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + EXIV2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exiv2"` + else + EXIV2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exiv2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EXIV2_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: result: $EXIV2_PKG_ERRORS" >&5 +echo "${ECHO_T}$EXIV2_PKG_ERRORS" >&6; } +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: result: $EXIV2_PKG_ERRORS" >&5 +echo "${ECHO_T}$EXIV2_PKG_ERRORS" >&6; } +else + EXIV2_CFLAGS=$pkg_cv_EXIV2_CFLAGS + EXIV2_LIBS=$pkg_cv_EXIV2_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + have_exiv2=yes cat >>confdefs.h <<\_ACEOF #define HAVE_EXIV2 1 _ACEOF - EXIV2_LIBS=`$EXIV2_CONFIG --libs` - fi +fi fi UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS" @@ -10734,7 +10767,8 @@ EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim EXIF_LIBS!$EXIF_LIBS$ac_delim COMMENT_LIBEXIF!$COMMENT_LIBEXIF$ac_delim -EXIV2_CONFIG!$EXIV2_CONFIG$ac_delim +EXIV2_CFLAGS!$EXIV2_CFLAGS$ac_delim +EXIV2_LIBS!$EXIV2_LIBS$ac_delim WINDRES!$WINDRES$ac_delim PREFIX!$PREFIX$ac_delim DOSPREFIX!$DOSPREFIX$ac_delim @@ -10769,7 +10803,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- ufraw-0.11.orig/config.guess +++ ufraw-0.11/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,6 +161,7 @@ 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 @@ -780,7 +781,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -950,6 +954,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1208,6 +1215,15 @@ 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.11.orig/config.sub +++ ufraw-0.11/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | 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 \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,6 +276,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -284,7 +285,7 @@ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -323,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -367,7 +368,7 @@ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -909,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -920,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1214,7 +1222,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1366,6 +1374,9 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; @@ -1406,6 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- ufraw-0.11.orig/nikon_curve.c +++ ufraw-0.11/nikon_curve.c @@ -110,7 +110,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.11.orig/ufraw_exiv2.cc +++ ufraw-0.11/ufraw_exiv2.cc @@ -201,7 +201,7 @@ } catch (Exiv2::AnyError& e) { std::cerr.rdbuf(savecerr); - ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what().c_str()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what()); return UFRAW_ERROR; } --- ufraw-0.11.orig/debian/changelog +++ ufraw-0.11/debian/changelog @@ -0,0 +1,198 @@ +ufraw (0.11-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Modify Maintainer value to match Debian-Maintainer-Field Spec + * debian/control: relax gimp dependency to make it installable (LP: #120058) + + -- Lionel Porcheron Tue, 26 Jun 2007 17:35:32 +0200 + +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-1ubuntu2) gutsy; urgency=low + + * Rebuild against latest libexiv2 + + -- Luka Renko Fri, 01 Jun 2007 18:47:30 +0200 + +ufraw (0.11-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, Ubuntu changes: + - build-depend on libexiv2-dev >= 0.12. + * debian/control: Adhere to DebianMaintainerField. + + -- Lionel Le Folgoc Sun, 29 Apr 2007 12:13:57 +0200 + +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-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - build-depend on libexiv2-dev >= 0.12 + + -- Michael Bienia Fri, 15 Dec 2006 15:27:41 +0100 + +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-1ubuntu3) feisty; urgency=low + + * Rebuild against exiv2 0.12 + + -- Jonathan Riddell Wed, 13 Dec 2006 12:12:19 +0000 + +ufraw (0.9.1-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Ubuntu Merge-o-Matic Fri, 18 Aug 2006 23:29:27 +0100 + +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-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Hubert Figuiere Mon, 14 Aug 2006 15:54:01 -0400 + +ufraw (0.9-1) unstable; urgency=low + + * New upstream release. + + -- Hubert Chan Fri, 4 Aug 2006 13:20:07 -0400 + +ufraw (0.9-0ubuntu2) edgy; urgency=low + + * Added watch file + + -- Hubert Figuiere Thu, 10 Aug 2006 16:34:34 -0400 + +ufraw (0.9-0ubuntu1) edgy; urgency=low + + * New upstream release + * Update to standard 3.7.2 + + -- Hubert Figuiere Wed, 9 Aug 2006 13:06:23 -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.8.1-0ubuntu1) edgy; urgency=low + + * New upstream release + * Fix description. Closes Malone #49854. + * Handle files from 30D (upstream change). Closes Malone #45798. + + -- Hubert Figuiere Wed, 5 Jul 2006 15:28:56 -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.11.orig/debian/compat +++ ufraw-0.11/debian/compat @@ -0,0 +1 @@ +5 --- ufraw-0.11.orig/debian/control +++ ufraw-0.11/debian/control @@ -0,0 +1,41 @@ +Source: ufraw +Section: graphics +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Hubert Chan +Build-Depends: debhelper (>= 5), libgimp2.0-dev (>= 2.2), libjpeg62-dev, liblcms-dev, libtiff4-dev | libtiff-dev, libexiv2-dev (>= 0.14), perl +Standards-Version: 3.7.2 + +Package: ufraw +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils +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}, ${misc:Depends}, gimp (>= 2.2), gimp (<< 2.4) +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.11.orig/debian/copyright +++ ufraw-0.11/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 Chan . + +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.11.orig/debian/docs +++ ufraw-0.11/debian/docs @@ -0,0 +1,3 @@ +README +TODO +MANIFEST --- ufraw-0.11.orig/debian/gimp-ufraw.dirs +++ ufraw-0.11/debian/gimp-ufraw.dirs @@ -0,0 +1 @@ +usr/lib --- ufraw-0.11.orig/debian/rules +++ ufraw-0.11/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 autom4te.cache + -rm 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.11.orig/debian/ufraw.dirs +++ ufraw-0.11/debian/ufraw.dirs @@ -0,0 +1 @@ +usr/bin --- ufraw-0.11.orig/debian/ufraw.links +++ ufraw-0.11/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.11.orig/debian/ufraw.manpages +++ ufraw-0.11/debian/ufraw.manpages @@ -0,0 +1,2 @@ +ufraw.1 +debian/nikon-curve.1 --- ufraw-0.11.orig/debian/nikon-curve.1 +++ ufraw-0.11/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).