[freeimage] 01/47: Imported Debian patch 3.10.0-1
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Sep 26 22:27:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository freeimage.
commit 4245f847134bfeb75628cc5b2a7a18c1fbb25ad7
Author: Andres Mejia <mcitadel at gmail.com>
Date: Thu May 15 02:40:44 2008 -0400
Imported Debian patch 3.10.0-1
---
debian/changelog | 36 +++++
debian/compat | 1 +
debian/control | 49 +++++++
debian/copyright | 202 ++++++++++++++++++++++++++++
debian/freeimage-get-orig-source | 118 ++++++++++++++++
debian/libfreeimage-dev.install | 5 +
debian/libfreeimage3.install | 4 +
debian/patches/fix_ftbfs_amd64.patch | 24 ++++
debian/patches/makefile_modifications.patch | 92 +++++++++++++
debian/patches/series | 2 +
debian/rules | 100 ++++++++++++++
11 files changed, 633 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e103ad7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,36 @@
+freeimage (3.10.0-1) unstable; urgency=low
+
+ * New upstream release. Closes: #471242
+ * Added extra freeimage documentation in orig tarball.
+ * Added get-orig-source target.
+ * Added Homepage field in control file.
+ * Removing some unnecessary stuff from rules file.
+ * Adding some necessary build dependencies.
+ * Adding some modifications to allow for configuring various compiler flags.
+ * Fix FTBFS on amd64.
+ * Adding debug package.
+ * Added DM-Upload-Allowed: yes field.
+
+ -- Andres Mejia <mcitadel at gmail.com> Wed, 30 Apr 2008 19:04:34 -0400
+
+freeimage (3.9.3-3) unstable; urgency=low
+
+ * Removed the file FreeImage393.pdf for which sources are apparently
+ not available.
+ * Added copyright ownner to copyright file.
+
+ -- Federico Di Gregorio <fog at debian.org> Mon, 07 May 2007 15:35:21 +0200
+
+freeimage (3.9.3-2) unstable; urgency=low
+
+ * Now also build FreeImagePlus.
+ * Changed C++ to C/C++ in debian/control.
+
+ -- Federico Di Gregorio <fog at debian.org> Sun, 22 Apr 2007 21:59:14 +0200
+
+freeimage (3.9.3-1) unstable; urgency=low
+
+ * Initial release (Closes: #419696)
+
+ -- Federico Di Gregorio <fog at debian.org> Sat, 21 Apr 2007 09:36:44 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..760c44e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,49 @@
+Source: freeimage
+Priority: extra
+Maintainer: Federico Di Gregorio <fog at debian.org>
+Uploaders: Andres Mejia <mcitadel at gmail.com>
+Build-Depends: debhelper (>= 5), tofrodos, quilt
+Standards-Version: 3.7.3
+Section: libs
+DM-Upload-Allowed: yes
+Homepage: http://freeimage.sourceforge.net/
+
+Package: libfreeimage-dev
+Section: libdevel
+Architecture: any
+Depends: libfreeimage3 (= ${binary:Version})
+Description: Support library for graphics image formats (development files)
+ FreeImage is an Open Source C/C++ library project for developers who would
+ like to support popular graphics image formats like PNG, BMP, JPEG, TIFF
+ and others as needed by today's multimedia applications. FreeImage is
+ easy to use, fast, multithreading safe, and cross-platform (works both
+ with Linux, 32 bit Windows and Mac OS X).
+ .
+ This package contains the headers and static libraries needed to develop
+ programs using FreeImage.
+
+Package: libfreeimage3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Support library for graphics image formats (library)
+ FreeImage is an Open Source C/C++ library project for developers who would
+ like to support popular graphics image formats like PNG, BMP, JPEG, TIFF
+ and others as needed by today's multimedia applications. FreeImage is
+ easy to use, fast, multithreading safe, and cross-platform (works both
+ with Linux, 32 bit Windows and Mac OS X).
+ .
+ This package contains the FreeImage library.
+
+Package: libfreeimage3-dbg
+Section: libs
+Architecture: any
+Depends: libfreeimage3 (= ${binary:Version})
+Description: Support library for graphics image formats (dubugging symbols)
+ FreeImage is an Open Source C/C++ library project for developers who would
+ like to support popular graphics image formats like PNG, BMP, JPEG, TIFF
+ and others as needed by today's multimedia applications. FreeImage is
+ easy to use, fast, multithreading safe, and cross-platform (works both
+ with Linux, 32 bit Windows and Mac OS X).
+ .
+ This package contains the debugging symbols for the FreeImage library.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..0a36bc0
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,202 @@
+This package was debianized by:
+
+ Federico Di Gregorio <fog at debian.org> on Sat, 21 Apr 2007 09:36:44 +0200.
+
+It was downloaded from:
+
+ http://freeimage.sourceforge.net/
+
+Upstream Author:
+
+ Hervé Drolon at drolon at infonie.fr
+ Floris van den Berg at flvdberg at wxs.nl
+
+Copyright:
+
+ Copyright (C) 2003-2007 FreeImage Group
+
+ FreeImage is currently maintained by Harvé Drolon.
+
+ FreeImage is licensed under the GNU General Public License (GPL)
+ and the FreeImage Public License (FIPL). You can choose the license
+ that has the most advantages for you.
+
+License (FIPL):
+
+1. Definitions.
+
+1.1. "Contributor" means each entity that creates or contributes to the
+creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the Original Code, prior
+Modifications used by a Contributor, and the Modifications made by that
+particular Contributor.
+
+1.3. "Covered Code" means the Original Code or Modifications or the combination
+of the Original Code and Modifications, in each case including portions
+thereof.
+
+1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
+in the software development community for the electronic transfer of data.
+
+1.5. "Executable" means Covered Code in any form other than Source Code.
+
+1.6. "Initial Developer" means the individual or entity identified as the
+Initial Developer in the Source Code notice required by Exhibit A.
+
+1.7. "Larger Work" means a work which combines Covered Code or portions thereof
+with code not governed by the terms of this License.
+
+1.8. "License" means this document.
+
+1.9. "Modifications" means any addition to or deletion from the substance or
+structure of either the Original Code or any previous Modifications. When
+Covered Code is released as a series of files, a Modification is:
+
+A. Any addition to or deletion from the contents of a file containing Original
+Code or previous Modifications.
+
+B. Any new file that contains any part of the Original Code or previous
+Modifications.
+
+1.10. "Original Code" means Source Code of computer software code which is
+described in the Source Code notice required by Exhibit A as Original Code,
+and which, at the time of its release under this License is not already
+Covered Code governed by this License.
+
+1.11. "Source Code" means the preferred form of the Covered Code for making
+modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control
+compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
+
+1.12. "You" means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+2.1. The Initial Developer Grant.
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
+
+(a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and
+
+(b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell ("Utilize") the Original Code (or portions thereof), but solely to the extent that
+any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or
+combinations.
+
+2.2. Contributor Grant.
+Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
+
+(a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and
+
+(b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that
+may be necessary to Utilize further Modifications or combinations.
+
+3. Distribution Obligations.
+
+3.1. Application of License.
+The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or
+restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
+
+3.2. Availability of Source Code.
+Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after [...]
+
+3.3. Description of Modifications.
+You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or [...]
+
+3.4. Intellectual Property Matters
+
+(a) Third Party Claims.
+If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file [...]
+available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
+
+(b) Contributor APIs.
+If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file.
+
+3.5. Required Notices.
+You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its
+structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or
+liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+3.6. Distribution of Executable Versions.
+You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You
+describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License,
+provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemni [...]
+
+3.7. Larger Works.
+You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regu [...]
+
+5. Application of this License.
+
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code.
+
+6. Versions of the License.
+
+6.1. New Versions.
+Floris van den Berg may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
+
+6.2. Effect of New Versions.
+Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Floris van den Berg
+No one other than Floris van den Berg has the right to modify the terms applicable to Covered Code created under this License.
+
+6.3. Derivative Works.
+If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases "FreeImage", `FreeImage Public License", "FIPL", or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the FreeImage Public License. (Filling in the name [...]
+
+7. DISCLAIMER OF WARRANTY.
+
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NEC [...]
+
+8. TERMINATION.
+
+This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+9. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMME [...]
+EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+The Covered Code is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.
+
+11. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by Dutch law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or reg [...]
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based
+on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute
+responsibility on an equitable basis.
+
+EXHIBIT A.
+
+"The contents of this file are subject to the FreeImage Public License Version 1.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://home.wxs.nl/~flvdberg/freeimage-license.txt
+
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
+
+License (GPL):
+
+ This package 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 of the License, or
+ (at your option) any later version.
+
+ This package 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 package; 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 Debian packaging is (C) 2007, Federico Di Gregorio <fog at debian.org> and
+is licensed under the GPL, see above.
+
diff --git a/debian/freeimage-get-orig-source b/debian/freeimage-get-orig-source
new file mode 100644
index 0000000..b712115
--- /dev/null
+++ b/debian/freeimage-get-orig-source
@@ -0,0 +1,118 @@
+#! /bin/sh
+
+# This script is used to generate the freeimage orig tarball used for this
+# package.
+
+# Some variables to make maintaining this script easier
+FREEIMAGE_VERSION="3.10.0"
+FREEIMAGE_URL_DIR="http://downloads.sourceforge.net/freeimage"
+FREEIMAGE_TARBALL="FreeImage3100.zip"
+FREEIMAGE_TARBALL_CHECKSUM="2e57135e26bb487cc8e13ee7b7e0a595"
+FREEIMAGE_DOC="FreeImage3100.pdf"
+FREEIMAGE_DOC_CHECKSUM="8f93e322b92a267d5cc84d4d80b9a671"
+FREEIMAGE_CHINESE_DOC="FreeImage380Chinese.pdf"
+FREEIMAGE_CHINESE_DOC_CHECKSUM="8d9481a75b7b86eac8d642f8dc443cf7"
+
+USAGE="\n\
+This script is used to generate the orig tarball used in building\n\
+Debian packages for freeimage-$FREEIMAGE_VERSION.\n\
+Usage: freeimage-get-orig-source [OPTION]\n\
+\n\
+ -h, --help Display this help message.\n\
+ --keep-upstream-files Keep downloaded files.\n\
+ --keep-orig-dir Keep the generated orig directory.\n"
+
+while [ "$#" -gt "0" ]
+do
+ case "$1" in
+ --keep-upstream-files)
+ KEEP_UPSTREAM_FILES=1
+ shift
+ ;;
+ --keep-orig-dir)
+ KEEP_ORIG_DIR=1
+ shift
+ ;;
+ -h|--help|*)
+ echo >&2 "${USAGE}"
+ exit 1
+ ;;
+ esac
+done
+
+set -e
+
+# Function to download files. Takes two parameters, the directory name of the
+# url to use, and the filename of the file.
+download() {
+ local url="$1/$2"
+ if [ ! -f $2 ] ; then
+ # Download the tarball
+ wget $url
+ fi
+}
+
+# Function to verify the checksum. Takes two parameters, the file to compute the
+# checksum for and the checksum it should be.
+verify_checksum() {
+ local checksum=`md5sum $1 | cut -d ' ' -f 1`
+
+ if [ $2 != $checksum ] ; then
+ echo "Checksum verification failed. Checksum was $checksum
+ Expected checksum $2"
+ exit 1
+ else
+ echo "Checksum verified. Checksum is $2"
+ fi
+}
+
+# The rest is our main functions.
+#Download the files
+download $FREEIMAGE_URL_DIR $FREEIMAGE_TARBALL
+download $FREEIMAGE_URL_DIR $FREEIMAGE_DOC
+download $FREEIMAGE_URL_DIR $FREEIMAGE_CHINESE_DOC
+
+# Verify the checksums
+verify_checksum $FREEIMAGE_TARBALL $FREEIMAGE_TARBALL_CHECKSUM
+verify_checksum $FREEIMAGE_DOC $FREEIMAGE_DOC_CHECKSUM
+verify_checksum $FREEIMAGE_CHINESE_DOC $FREEIMAGE_CHINESE_DOC_CHECKSUM
+
+# Unpack the upstream source
+if [ ! -d FreeImage -a ! -d freeimage-$FREEIMAGE_VERSION ]; then
+ echo "Unpacking upstream source."
+ unzip -qq $FREEIMAGE_TARBALL
+ mv FreeImage freeimage-$FREEIMAGE_VERSION
+else
+ echo -n "Please remove or move FreeImage and freeimage-$FREEIMAGE_VERSION "
+ echo "directory."
+ exit 1
+fi
+
+# Move the extra documentation into the extracted directory and pack into a
+# gzipped tarball
+if [ ! -f freeimage-$FREEIMAGE_VERSION ]; then
+ echo "Creating freeimage_$FREEIMAGE_VERSION orig tarball."
+ [ -d freeimage-$FREEIMAGE_VERSION/extra.Debian ] || \
+ mkdir -p freeimage-$FREEIMAGE_VERSION/extra.Debian
+ cp -f $FREEIMAGE_DOC \
+ freeimage-$FREEIMAGE_VERSION/extra.Debian/$FREEIMAGE_DOC
+ cp -f $FREEIMAGE_CHINESE_DOC \
+ freeimage-$FREEIMAGE_VERSION/extra.Debian/$FREEIMAGE_CHINESE_DOC
+ tar -czf freeimage_$FREEIMAGE_VERSION.orig.tar.gz \
+ freeimage-$FREEIMAGE_VERSION
+else
+ echo "Please remove or move freeimage_$FREEIMAGE_VERSION.orig.tar.gz."
+ exit 1
+fi
+
+# Perform cleanup
+if [ -z "$KEEP_ORIG_DIR" ]; then
+ echo "Removing extracted directory."
+ rm -rf freeimage-$FREEIMAGE_VERSION
+fi
+if [ -z "$KEEP_UPSTREAM_FILES" ]; then
+ echo "Removing upstream files."
+ rm $FREEIMAGE_TARBALL
+ rm $FREEIMAGE_DOC
+ rm $FREEIMAGE_CHINESE_DOC
+fi
diff --git a/debian/libfreeimage-dev.install b/debian/libfreeimage-dev.install
new file mode 100644
index 0000000..0bb57a6
--- /dev/null
+++ b/debian/libfreeimage-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/libfreeimage.a
+debian/tmp/usr/lib/libfreeimage.so
+debian/tmp/usr/lib/libfreeimageplus.a
+debian/tmp/usr/lib/libfreeimageplus.so
diff --git a/debian/libfreeimage3.install b/debian/libfreeimage3.install
new file mode 100644
index 0000000..c35b120
--- /dev/null
+++ b/debian/libfreeimage3.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/libfreeimage-*.so
+debian/tmp/usr/lib/libfreeimage.so.3
+debian/tmp/usr/lib/libfreeimageplus-*.so
+debian/tmp/usr/lib/libfreeimageplus.so.3
diff --git a/debian/patches/fix_ftbfs_amd64.patch b/debian/patches/fix_ftbfs_amd64.patch
new file mode 100644
index 0000000..8d61a93
--- /dev/null
+++ b/debian/patches/fix_ftbfs_amd64.patch
@@ -0,0 +1,24 @@
+Patch that fixes several problems for building on amd64. Thanks Fedora guys.
+=====================================================================
+--- Source/FreeImage/PluginBMP.cpp~ 2007-10-21 16:50:08.000000000 +0200
++++ Source/FreeImage/PluginBMP.cpp 2008-03-12 23:14:51.000000000 +0100
+@@ -189,6 +189,8 @@
+ #endif
+ }
+
++#define MIN(a, b) ( ((a) < (b))? (a):(b) )
++
+ /**
+ Load image pixels for 4-bit RLE compressed dib
+ @param io FreeImage IO
+--- Source/Metadata/Exif.cpp~ 2007-07-17 03:28:26.000000000 +0200
++++ Source/Metadata/Exif.cpp 2008-03-13 19:19:07.000000000 +0100
+@@ -495,7 +495,7 @@
+ }
+
+ // remember that we've visited this directory so that we don't visit it again later
+- DWORD visited = (((DWORD)ifdp & 0xFFFF) << 16) | (DWORD)de;
++ DWORD visited = (((DWORD)((long)ifdp) & 0xFFFF) << 16) | (DWORD)de;
+ if(visitedIFD.find(visited) != visitedIFD.end()) {
+ continue;
+ } else {
diff --git a/debian/patches/makefile_modifications.patch b/debian/patches/makefile_modifications.patch
new file mode 100644
index 0000000..d822527
--- /dev/null
+++ b/debian/patches/makefile_modifications.patch
@@ -0,0 +1,92 @@
+Some modificatoins to the makefiles to help in build Debian packages.
+Also removed -s (strip) option so we can make debug package. With the compiler
+options we're using by default, debugging should still be possible.
+==========================================================================
+--- Makefile.fip.bak 2008-05-08 14:41:23.000000000 -0400
++++ Makefile.fip 2008-05-08 14:40:30.000000000 -0400
+@@ -4,17 +4,19 @@
+ include fipMakefile.srcs
+
+ # General configuration variables:
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ AR = ar
+
+-INCDIR = /usr/include
+-INSTALLDIR = /usr/lib
++# Include a configurable DESTDIR variable
++DESTDIR ?= /
++INCDIR = $(DESTDIR)usr/include
++INSTALLDIR = $(DESTDIR)usr/lib
+
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-COMPILERFLAGS = -O3 -fexceptions -fvisibility=hidden
++COMPILERFLAGS ?= -O3 -fexceptions -fvisibility=hidden
+ LIBRARIES = -lstdc++
+
+ MODULES = $(SRCS:.c=.o)
+@@ -56,7 +58,7 @@
+ $(AR) r $@ $(MODULES)
+
+ $(SHAREDLIB): $(MODULES)
+- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
++ $(CC) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
+
+ install:
+ install -m 644 -o root -g root $(HEADER) $(INCDIR)
+@@ -65,7 +67,6 @@
+ install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
+ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+- ldconfig
+
+ clean:
+ rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
+--- Makefile.gnu.bak 2008-05-08 14:41:22.000000000 -0400
++++ Makefile.gnu 2008-05-08 14:40:23.000000000 -0400
+@@ -4,17 +4,19 @@
+ include Makefile.srcs
+
+ # General configuration variables:
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ AR = ar
+
+-INCDIR = /usr/include
+-INSTALLDIR = /usr/lib
++# Include a configurable DESTDIR variable
++DESTDIR ?= /
++INCDIR = $(DESTDIR)usr/include
++INSTALLDIR = $(DESTDIR)usr/lib
+
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
++COMPILERFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
+ LIBRARIES = -lstdc++
+
+ MODULES = $(SRCS:.c=.o)
+@@ -55,7 +57,7 @@
+ $(AR) r $@ $(MODULES)
+
+ $(SHAREDLIB): $(MODULES)
+- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
++ $(CC) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
+
+ install:
+ install -m 644 -o root -g root $(HEADER) $(INCDIR)
+@@ -63,7 +65,6 @@
+ install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
+ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+- ldconfig
+
+ clean:
+ rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..05e2f72
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix_ftbfs_amd64.patch -p0
+makefile_modifications.patch -p0
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..165bd4d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,100 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# export DH_VERBOSE=1
+
+# Used for setting the compiler
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ DEB_OPTFLAGS += -O0 -fPIC -D_REENTRANT
+ DEB_FIP_OPTFLAGS += -O0 -fPIC -D_REENTRANT
+else
+ DEB_OPTFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -D_REENTRANT
+ DEB_FIP_OPTFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -D_REENTRANT
+endif
+
+# Setting our own compiler flags
+DEB_COMPILERFLAGS ?= -Wall -g $(DEB_OPTFLAGS)
+DEB_FIP_COMPILERFLAGS ?= -Wall -g $(DEB_FIP_OPTFLAGS)
+
+fromdos: fromdos-stamp
+fromdos-stamp:
+ dh_testdir
+ fromdos -e Makefile.gnu
+ fromdos -e Makefile.fip
+ fromdos -e Source/FreeImage/PluginBMP.cpp
+ fromdos -e Source/Metadata/Exif.cpp
+
+patch: fromdos patch-stamp
+patch-stamp:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch patch-stamp
+
+build: patch build-stamp
+build-stamp:
+ dh_testdir
+ $(MAKE) COMPILERFLAGS="$(DEB_COMPILERFLAGS)" CC=$(DEB_BUILD_GNU_TYPE)-gcc \
+ CXX=$(DEB_BUILD_GNU_TYPE)-g++
+ $(MAKE) -f Makefile.fip COMPILERFLAGS="$(DEB_FIP_COMPILERFLAGS)" \
+ CC=$(DEB_BUILD_GNU_TYPE)-gcc CXX=$(DEB_BUILD_GNU_TYPE)-g++
+ touch build-stamp
+
+clean: clean-stamp unpatch todos
+clean-stamp:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ $(MAKE) clean
+ $(MAKE) -f Makefile.fip clean
+ dh_clean
+
+unpatch:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt pop -a || test $$? = 2
+ rm -rf .pc/ patch-stamp
+
+todos:
+ dh_testdir
+ todos -e Makefile.fip
+ todos -e Makefile.gnu
+ todos -e Source/FreeImage/PluginBMP.cpp
+ todos -e Source/Metadata/Exif.cpp
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ mkdir -p debian/tmp/usr/include
+ mkdir -p debian/tmp/usr/lib
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
+ $(MAKE) -f Makefile.fip install DESTDIR=$(CURDIR)/debian/tmp/
+
+# Build architecture-independent files here.
+binary-indep:
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs extra.Debian/*
+ dh_install
+ dh_link
+ dh_strip -plibfreeimage3 --dbg-package=libfreeimage3-dbg
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs -V
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+get-orig-source:
+ $(dir $_)freeimage-get-orig-source
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git
More information about the debian-science-commits
mailing list