diff -u openexr-1.6.1/debian/compat openexr-1.6.1/debian/compat --- openexr-1.6.1/debian/compat +++ openexr-1.6.1/debian/compat @@ -1 +1 @@ -5 +7 reverted: --- openexr-1.6.1/debian/openexr.docs +++ openexr-1.6.1.orig/debian/openexr.docs @@ -1,3 +0,0 @@ -AUTHORS -NEWS -README diff -u openexr-1.6.1/debian/openexr.install openexr-1.6.1/debian/openexr.install --- openexr-1.6.1/debian/openexr.install +++ openexr-1.6.1/debian/openexr.install @@ -5,2 +5,4 @@ usr/bin/exrstdattr + +# The openexr package contains libopenexr6's documentation: ../../doc/*.pdf usr/share/doc/libopenexr6/pdf diff -u openexr-1.6.1/debian/control openexr-1.6.1/debian/control --- openexr-1.6.1/debian/control +++ openexr-1.6.1/debian/control @@ -2,19 +2,18 @@ Section: graphics Priority: optional Maintainer: Ubuntu Core Developers -XSBC-Original-Maintainer: Adeodato Simó -Build-Depends: autotools-dev, cdbs, debhelper, dh-buildinfo, quilt, libilmbase-dev, zlib1g-dev -Standards-Version: 3.7.3 -Uploaders: Andrew Lau +XSBC-Original-Maintainer: Debian PhotoTools Maintainers +Uploaders: Cyril Brulebois +Build-Depends: autotools-dev, debhelper (>= 7.0.50), dh-buildinfo, quilt, libilmbase-dev, zlib1g-dev +Standards-Version: 3.8.1 Homepage: http://www.openexr.com -Vcs-Git: git://git.debian.org/git/collab-maint/openexr.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/openexr.git -XS-X-Collab-Maint: commit-branch upload-15 +Vcs-Git: git://git.debian.org/git/pkg-phototools/openexr.git +Vcs-Browser: http://git.debian.org/?p=pkg-phototools/openexr.git Package: openexr Section: graphics Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: exrtools Description: viewer and docs for the OpenEXR image format OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -44,7 +43,7 @@ Package: libopenexr-dev Section: libdevel Architecture: any -Depends: libopenexr6 (= ${binary:Version}), libilmbase-dev, ${shlibs:Depends} +Depends: libopenexr6 (= ${binary:Version}), libilmbase-dev, ${shlibs:Depends}, ${misc:Depends} Description: development files for the OpenEXR image library OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. @@ -69,7 +68,7 @@ Package: libopenexr6 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: runtime files for the OpenEXR image library OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. diff -u openexr-1.6.1/debian/libopenexr-dev.install openexr-1.6.1/debian/libopenexr-dev.install --- openexr-1.6.1/debian/libopenexr-dev.install +++ openexr-1.6.1/debian/libopenexr-dev.install @@ -5,4 +5,6 @@ usr/lib/pkgconfig/* usr/share/aclocal/* + +# The libopenexr-dev package contains libopenexr6's examples: ../../IlmImfExamples/*.cpp usr/share/doc/libopenexr6/examples ../../IlmImfExamples/*.h usr/share/doc/libopenexr6/examples diff -u openexr-1.6.1/debian/changelog openexr-1.6.1/debian/changelog --- openexr-1.6.1/debian/changelog +++ openexr-1.6.1/debian/changelog @@ -1,3 +1,48 @@ +openexr (1.6.1-4ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #372112) + - Added hppa to NO_MAKE_CHECK_ARCHES + - This change can be dropped when the kernel for the HPPA buildds is + updated with the latest NTPL fixes + + -- Michael Casadevall Tue, 05 May 2009 05:22:14 -0400 + +openexr (1.6.1-4) unstable; urgency=low + + * Adopt the package within pkg-phototools (Closes: #494877): + - Thanks to Adeodato Simó et al. for having taken care of it until + now! + - Set Maintainer to the group. + - Set Uploaders to myself. + - Update Vcs-{Git,Browser}. + - Remove XS-X-Collab-Maint field, no longer relevant. Patches are + still welcome, though! + * Switch to debhelper 7: + - Bump debian/compat to 7. + - Version the B-D on debhelper: >= 7.0.50 to allow the use of + overrides. + - Specify some overrides to tweak as needed for the build: + - dh_auto_configure: pass the --with-openexr flag to configure + script. + - dh_auto_test: don't run “check” on arm and ia64 for now, and + bypass dh_auto_test due to bad target detection. + - dh_compress: no longer compress .h/.cpp examples. + - dh_link: needed since libopenexr-dev's and openexr's /us/s/d + directories are symlinks to libopenexr6's one. + - dh_makeshlibs: keep on using -V. + - dh_installdeb: add a call to dh_buildinfo to keep on storing the + versions of packages installed during the build. + - Specify some targets: + - build and clean to handle patching/unpatching and + updating/cleaning config.{guess,sub}. + * Now compress PDF documentation. Any sane PDF viewer should be able to + handle decompression. + * Remove .gitignore file. + * Add ${misc:Depends} to all binaries. + * Bump Standards-Version from 3.7.3 to 3.8.1 (no changes needed). + + -- Cyril Brulebois Sat, 11 Apr 2009 22:00:04 +0200 + openexr (1.6.1-3ubuntu1) intrepid; urgency=low * Disabled test suite on HPPA to resolve FTBFS @@ -206,0 +252 @@ + diff -u openexr-1.6.1/debian/rules openexr-1.6.1/debian/rules --- openexr-1.6.1/debian/rules +++ openexr-1.6.1/debian/rules @@ -2,40 +2,73 @@ +# +# © 2009 Cyril Brulebois + + +##### INCLUDE +# + +include /usr/share/quilt/quilt.make + + +##### VARIABLES +# -# ==================================================================== -# debian/rules for OpenEXR -# Common Debian Build System: (C) 2002 Colin Walters +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +NO_MAKE_CHECK_ARCHS := arm ia64 hppa + + +##### OVERRIDES # -# Author: Andrew Lau -# $Id: rules 2 2005-02-02 01:31:02Z netsnipe $ -# ==================================================================== - -# CDBS Classes & Rules -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/class/autotools.mk - -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) - -# Compilation options -DEB_CONFIGURE_EXTRA_FLAGS := --with-openexr-prefix=/usr - -# Run tests -NO_MAKE_CHECK_ARCHES := arm ia64 hppa -ifeq (,$(filter $(DEB_BUILD_ARCH),$(NO_MAKE_CHECK_ARCHES))) - DEB_MAKE_CHECK_TARGET := check + +# Need to pass an extra flag: +override_dh_auto_configure: + dh_auto_configure -- --with-openexr-prefix=/usr + +# Need to disable the test suite on some architectures (additionally, +# use 'make check' rather than 'make test'): +override_dh_auto_test: +ifeq (,$(filter $(DEB_BUILD_ARCH),$(NO_MAKE_CHECK_ARCHS))) +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + $(MAKE) check +endif endif -# Debhelper Arguments -DEB_COMPRESS_EXCLUDE = .pdf -DEB_DH_INSTALL_ARGS := --exclude="examples/" --sourcedir=debian/tmp -DEB_DH_MAKESHLIBS_ARGS := -V -DEB_DH_SHLIBDEPS_ARGS := -L libopenexr6 -l debian/libopenexr6/usr/lib - -# Disable redundant documentation copies -DEB_INSTALL_DOCS_openexr := --no-act -DEB_INSTALL_CHANGELOGS_openexr := --no-act -DEB_INSTALL_DOCS_libopenexr-dev := --no-act -DEB_INSTALL_CHANGELOGS_libopenexr-dev := --no-act +# No need to compress .h/.cpp files: +override_dh_compress: + dh_compress -X.h -X.cpp + +# Need to remove the directories, since they're getting replaced with +# symlinks: +override_dh_link: + rm -rf debian/libopenexr-dev/usr/share/doc/libopenexr-dev + rm -rf debian/openexr/usr/share/doc/openexr + dh_link + +# Need to pass an extra parameter: +override_dh_makeshlibs: + dh_makeshlibs -V -# Record build-time version information -binary-post-install/libopenexr6:: +# Need to remember package versions: +override_dh_installdeb: dh_buildinfo -plibopenexr6 + dh_installdeb + + +##### TARGETS +# + +# Need to patch: +build: $(QUILT_STAMPFN) build-stamp +build-stamp: + cp /usr/share/misc/config.guess . + cp /usr/share/misc/config.sub . + dh build + touch $@ + +# Need to unpatch: +clean: unpatch + dh $@ + rm -f config.guess config.sub + +# Everything else: +%: + dh $@ reverted: --- openexr-1.6.1/debian/openexr.doc-base.tech_intro +++ openexr-1.6.1.orig/debian/openexr.doc-base.tech_intro @@ -1,9 +0,0 @@ -Document: openexr-tech_intro -Title: Technical Introduction to OpenEXR -Author: Lucas Digital Ltd. LLC. -Abstract: This document presents a brief overview of OpenEXR and explains - concepts that are specific to this format. -Section: Apps/Graphics - -Format: PDF -Files: /usr/share/doc/libopenexr6/pdf/TechnicalIntroduction.pdf reverted: --- openexr-1.6.1/debian/openexr.doc-base.IlmImf +++ openexr-1.6.1.orig/debian/openexr.doc-base.IlmImf @@ -1,9 +0,0 @@ -Document: openexr-IlmImf -Title: Reading and Writing OpenEXR Image Files with the IlmImf Library -Author: Lucas Digital Ltd. LLC. -Abstract: This document shows how to write C++ code that reads and writes - OpenEXR image files. -Section: Apps/Programming - -Format: PDF -Files: /usr/share/doc/libopenexr6/pdf/ReadingAndWritingImageFiles.pdf only in patch2: unchanged: --- openexr-1.6.1.orig/debian/libopenexr6.docs +++ openexr-1.6.1/debian/libopenexr6.docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README only in patch2: unchanged: --- openexr-1.6.1.orig/debian/disabled/README +++ openexr-1.6.1/debian/disabled/README @@ -0,0 +1,7 @@ +Until now, doc-base files weren't considered because some CDBS variables +were disabling dh_installdocs. + +Now that cdbs is no longer used, dh_installdoc tries to consider those +files but given the underscore and the uppercase characters, things are +going bad. That will be checked later, and those files will be put back +in place once a proper solution is found. only in patch2: unchanged: --- openexr-1.6.1.orig/debian/disabled/openexr.doc-base.IlmImf +++ openexr-1.6.1/debian/disabled/openexr.doc-base.IlmImf @@ -0,0 +1,9 @@ +Document: openexr-IlmImf +Title: Reading and Writing OpenEXR Image Files with the IlmImf Library +Author: Lucas Digital Ltd. LLC. +Abstract: This document shows how to write C++ code that reads and writes + OpenEXR image files. +Section: Programming + +Format: PDF +Files: /usr/share/doc/libopenexr6/pdf/ReadingAndWritingImageFiles.pdf.gz only in patch2: unchanged: --- openexr-1.6.1.orig/debian/disabled/openexr.doc-base.tech_intro +++ openexr-1.6.1/debian/disabled/openexr.doc-base.tech_intro @@ -0,0 +1,9 @@ +Document: openexr-tech_intro +Title: Technical Introduction to OpenEXR +Author: Lucas Digital Ltd. LLC. +Abstract: This document presents a brief overview of OpenEXR and explains + concepts that are specific to this format. +Section: Graphics + +Format: PDF +Files: /usr/share/doc/libopenexr6/pdf/TechnicalIntroduction.pdf.gz