--- flphoto-1.3.1.orig/debian/control +++ flphoto-1.3.1/debian/control @@ -0,0 +1,47 @@ +Source: flphoto +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>> 5), cdbs, libfltk1.1-dev, libcups2-dev, cups, autotools-dev, libgphoto2-dev, libjpeg-dev, libpng-dev, libz-dev, libxext-dev, perl +Standards-Version: 3.8.3 +Homepage: http://www.easysw.com/~mike/flphoto/ + +Package: flphoto +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Image manager with great printing functionality + flPhoto is a basic image management and display program based on the + FLTK toolkit and is provided under the terms of the GNU General + Public License. It can read, write, and display digital camera EXIF + information and supports the following image file formats: + . + * AVI (first frame only) + * BMP + * JPEG + * PhotoCD + * PNG + * Various camera RAW formats + . + flPhoto organizes image files into albums which can be: + . + * Printed + * Viewed as a slideshow + * Exported to web pages + . + Images can be imported individually, by directory, or from digital + cameras using the gPhoto library. + . + Image files can be transformed and touched-up; the following image + operations are available: + . + * Crop + * Rotate + * Scale + * Auto-Correct + * Adjust Brightness and Contrast + * Remove Red Eye + * Sharpen + * Blur + . + Questions about flPhoto should be directed to flphoto at easysw dot + com or the FLTK mailing lists and newsgroups. --- flphoto-1.3.1.orig/debian/docs +++ flphoto-1.3.1/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- flphoto-1.3.1.orig/debian/compat +++ flphoto-1.3.1/debian/compat @@ -0,0 +1 @@ +5 --- flphoto-1.3.1.orig/debian/rules +++ flphoto-1.3.1/debian/rules @@ -0,0 +1,127 @@ +#!/usr/bin/make -f +# debian/rules file for flphoto +# GNU copyright 1997 to 1999 by Joey Hess. +# Copyright (c) 2008 by Till Kamppeter + +PACKAGE=flphoto + +# DebHelper control +export DH_ALWAYS_EXCLUDE=CVS:.cvsignore +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# FOR AUTOCONF 2.52 AND NEWER ONLY +CONFFLAGS = +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) +else + CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +DEBUGFLAGS=-g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEBUGFLAGS += -O0 +else + DEBUGFLAGS += -O2 +endif + +configure: + +configure-stamp: configure + dh_testdir + # Add here commands to configure the package. + + ln -sf /usr/share/misc/config.sub . + ln -sf /usr/share/misc/config.guess . + rm -f config.cache + + ./configure $(CONFFLAGS) CXXFLAGS="-Wall -pipe $(DEBUGFLAGS)" -C \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info + # ./configure does not make correct entries for libjpeg and libpng in + # config.h + perl -p -i -e 's/(\/\*\s*|)\#undef\s*HAVE_LIBJPEG(\s*\*\/|)/\#define HAVE_LIBJPEG 1/' config.h + perl -p -i -e 's/(\/\*\s*|)\#undef\s*HAVE_LIBPNG(\s*\*\/|)/\#define HAVE_LIBPNG 1/' config.h + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean:: configure + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + rm -f flphoto.list + rm -f config.sub config.guess + + # Fix permissions + if [ -r debian/executable.files ] ; then \ + find -type d -print0 | xargs -0 -r chmod 755 ;\ + find -type f ! -name 'rules' -print0 | xargs -0 -r chmod 644 ;\ + xargs -t -r chmod +x < debian/executable.files ;\ + fi + + # Final static cleanups + if [ -r debian/deletable.files ] ; then \ + xargs -t -r rm -f < debian/deletable.files ;\ + fi + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp. + $(MAKE) install DESTDIR=$(CURDIR)/debian/flphoto + rm -f $(CURDIR)/debian/flphoto/usr/share/doc/flphoto/COPYING + install -d $(CURDIR)/debian/flphoto/usr/share/icons + install -m 644 doc/flphoto.png $(CURDIR)/debian/flphoto/usr/share/icons + install -d $(CURDIR)/debian/flphoto/usr/share/applications/ + install -m 644 flphoto.desktop $(CURDIR)/debian/flphoto/usr/share/applications/ + install -d $(CURDIR)/debian/flphoto/usr/share/mimelnk/application/ + install -m 644 x-flphoto.desktop $(CURDIR)/debian/flphoto/usr/share/mimelnk/application/ + +# 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_installdocs + dh_installmenu + dh_installchangelogs CHANGES + dh_link + dh_strip + dh_compress + dh_fixperms + # You may want to make some executables suid here. + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- flphoto-1.3.1.orig/debian/copyright +++ flphoto-1.3.1/debian/copyright @@ -0,0 +1,118 @@ + +This package was debianized by Till Kamppeter . + +Upstream sources are at: http://www.easysw.com/~mike/flphoto/ + +The Debian/Ubuntu packaging of flPhoto is: + Copyright (c) 2008 by Till Kamppeter + and distributed under the GPL version 2 or later. + +Changes: + No changes between this Debian/Ubuntu package and the upstream version. + +Upstream Author: + Michael R Sweet + +Copyright: + Copyright 2002-2006 by Michael Sweet (If not otherwise + stated) + Copyright 1997-2005 by Easy Software Products (Internationalization library) + Copyright 1999 by Aladdin Enterprises (MD5 code) + Copyright 1997-2006 by Dave Coffin (RAW image file decoder) + Copyright 1998-2005 by Bill Spitzak and others. (FLTK headers) + Copyright 1991-1997 by Thomas G. Lane. (Lossless JPEG rotating/cropping) + + Most files of the package are licensed under the GPL version 2 or later: + + 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; either version 2, or (at your option) any + later version. + + The GPL may be found in /usr/share/common-licenses/GPL on a Debian or + Ubuntu system. + + + The following files are licensed under other licenses: + + + flstring.h is licensed under the LGPL version 2 or later: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + The LGPL may be found in /usr/share/common-licenses/LGPL on a Debian or + Ubuntu system. + + + md5.h is published under the following license, which qualifies it as free + software (can be modified and redistributed): + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + + jpegint.h, transupp.[ch] are taken from libjpeg-progs which is + published under the following license, which qualifies it as free + software (can be modified and redistributed): + + In plain English: + + 1. We don't promise that this software works. (But if you find any bugs, + please let us know!) + 2. You can use this software for whatever you want. You don't have to pay us. + 3. You may not pretend that you wrote this software. If you use it in a + program, you must acknowledge somewhere in your documentation that + you've used the IJG code. + + In legalese: + + The authors make NO WARRANTY or representation, either express or implied, + with respect to this software, its quality, accuracy, merchantability, or + fitness for a particular purpose. This software is provided "AS IS", and you, + its user, assume the entire risk as to its quality and accuracy. + + This software is copyright (C) 1991-1998, Thomas G. Lane. + All Rights Reserved except as specified below. + + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject to these + conditions: + (1) If any part of the source code for this software is distributed, then this + README file must be included, with this copyright and no-warranty notice + unaltered; and any additions, deletions, or changes to the original files + must be clearly indicated in accompanying documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the work of + the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user accepts + full responsibility for any undesirable consequences; the authors accept + NO LIABILITY for damages of any kind. + + These conditions apply to any software derived from or based on the IJG code, + not just to the unmodified library. If you use our work, you ought to + acknowledge us. + + Permission is NOT granted for the use of any IJG author's name or company name + in advertising or publicity relating to this software or products derived from + it. This software may be referred to only as "the Independent JPEG Group's + software". + + We specifically permit and encourage the use of this software as the basis of + commercial products, provided that all warranty or liability claims are + assumed by the product vendor. --- flphoto-1.3.1.orig/debian/dirs +++ flphoto-1.3.1/debian/dirs @@ -0,0 +1,7 @@ +usr/bin +usr/share/doc +usr/share/man/man1 +usr/share/locale +usr/share/icons +usr/share/applications +usr/share/mimelnk/application --- flphoto-1.3.1.orig/debian/watch +++ flphoto-1.3.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/fltk/flphoto-(.*)-source\.tar\.(?:gz|bz2) --- flphoto-1.3.1.orig/debian/changelog +++ flphoto-1.3.1/debian/changelog @@ -0,0 +1,31 @@ +flphoto (1.3.1-0ubuntu4) lucid; urgency=low + + * Replace x11proto-xext-dev build-dependency with libxext-dev + to fix FTBFS + * Fix watch file + * Add {$misc:Depends} to Depends + * Bump Standards-Version to 3.8.3 + + -- Ilya Barygin Sat, 16 Jan 2010 14:25:35 +0300 + +flphoto (1.3.1-0ubuntu3) karmic; urgency=low + + * No-change rebuild against libgssapi-krb5-2 + + -- Steve Langasek Thu, 10 Sep 2009 00:01:32 +0000 + +flphoto (1.3.1-0ubuntu2) intrepid; urgency=low + + * debian/control: The CUPS package was renamed from "cupsys" to "cups", + adapted Build Depends appropriately. + * debian/control, debian/rules: Added infrastructure for patches + * debian/patches/01-missing-includes-for-mkdir.patch: Added missing "#include" + lines for "mkdir()" calls. + + -- Till Kamppeter Wed, 8 Oct 2008 10:18:40 +0200 + +flphoto (1.3.1-0ubuntu1) hardy; urgency=low + + * Initial Release (LP: #183243). + + -- Till Kamppeter Mon, 14 Jan 2008 11:25:40 +0000 --- flphoto-1.3.1.orig/debian/patches/01-missing-includes-for-mkdir.patch +++ flphoto-1.3.1/debian/patches/01-missing-includes-for-mkdir.patch @@ -0,0 +1,48 @@ +diff -Nur -x '*.orig' -x '*~' flphoto-1.3.1/camera.cxx flphoto-1.3.1.new/camera.cxx +--- flphoto-1.3.1/camera.cxx 2006-07-18 03:11:22.000000000 +0200 ++++ flphoto-1.3.1.new/camera.cxx 2008-10-08 10:34:59.000000000 +0200 +@@ -49,6 +49,8 @@ + #include "Fl_Print_Dialog.H" + #include + #include ++#include ++#include + + #ifdef HAVE_LIBGPHOTO2 + # include +diff -Nur -x '*.orig' -x '*~' flphoto-1.3.1/directory.cxx flphoto-1.3.1.new/directory.cxx +--- flphoto-1.3.1/directory.cxx 2006-11-11 06:56:04.000000000 +0100 ++++ flphoto-1.3.1.new/directory.cxx 2008-10-08 10:35:27.000000000 +0200 +@@ -28,6 +28,8 @@ + #include + #include + #include ++#include ++#include + + #if defined(WIN32) && !defined(__CYGWIN__) + # include +diff -Nur -x '*.orig' -x '*~' flphoto-1.3.1/export.cxx flphoto-1.3.1.new/export.cxx +--- flphoto-1.3.1/export.cxx 2006-11-18 04:24:41.000000000 +0100 ++++ flphoto-1.3.1.new/export.cxx 2008-10-08 10:35:53.000000000 +0200 +@@ -36,6 +36,8 @@ + #include + #include + #include ++#include ++#include + + #if defined(WIN32) && !defined(__CYGWIN__) + # include +diff -Nur -x '*.orig' -x '*~' flphoto-1.3.1/Fl_Image_Browser.cxx flphoto-1.3.1.new/Fl_Image_Browser.cxx +--- flphoto-1.3.1/Fl_Image_Browser.cxx 2006-11-15 05:06:09.000000000 +0100 ++++ flphoto-1.3.1.new/Fl_Image_Browser.cxx 2008-10-08 10:36:41.000000000 +0200 +@@ -46,6 +46,8 @@ + #include + #include + #include ++#include ++#include + + #if defined(WIN32) && !defined(__CYGWIN__) + # include