diff -Nru hdrmerge-0.5.0/debian/changelog hdrmerge-0.5.0/debian/changelog --- hdrmerge-0.5.0/debian/changelog 2015-06-18 03:22:12.000000000 +0000 +++ hdrmerge-0.5.0/debian/changelog 2015-10-21 09:53:14.000000000 +0000 @@ -1,4 +1,4 @@ -hdrmerge (0.5.0-1dhor~vivid) vivid; urgency=medium +hdrmerge (0.5.0-2dhor~vivid) vivid; urgency=medium * Fix dealing with images with non-ANSI file names. * Calculate response function with non-linear behavior. diff -Nru hdrmerge-0.5.0/debian/control hdrmerge-0.5.0/debian/control --- hdrmerge-0.5.0/debian/control 2015-02-20 17:29:09.000000000 +0000 +++ hdrmerge-0.5.0/debian/control 2015-10-21 09:52:56.000000000 +0000 @@ -2,8 +2,16 @@ Section: graphics Priority: optional Maintainer: Dariusz Duma -Build-Depends: debhelper (>= 8.0.0), cmake, libraw-dev, libqt4-dev, libexiv2-dev, zlib1g-dev, libalglib-dev -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 8.0.0), + cmake, + libraw-dev, + libqt4-dev, + libexiv2-dev, + zlib1g-dev, + libalglib-dev, + libssh-dev, + libcurl4-gnutls-dev +Standards-Version: 3.9.5 Homepage: #Vcs-Git: git://git.debian.org/collab-maint/hdrmerge.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/hdrmerge.git;a=summary diff -Nru hdrmerge-0.5.0/debian/hdrmerge.cron.d.ex hdrmerge-0.5.0/debian/hdrmerge.cron.d.ex --- hdrmerge-0.5.0/debian/hdrmerge.cron.d.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/hdrmerge.cron.d.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the hdrmerge package -# -0 4 * * * root [ -x /usr/bin/hdrmerge_maintenance ] && /usr/bin/hdrmerge_maintenance diff -Nru hdrmerge-0.5.0/debian/hdrmerge.default.ex hdrmerge-0.5.0/debian/hdrmerge.default.ex --- hdrmerge-0.5.0/debian/hdrmerge.default.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/hdrmerge.default.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# Defaults for hdrmerge initscript -# sourced by /etc/init.d/hdrmerge -# installed at /etc/default/hdrmerge by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff -Nru hdrmerge-0.5.0/debian/hdrmerge.desktop hdrmerge-0.5.0/debian/hdrmerge.desktop --- hdrmerge-0.5.0/debian/hdrmerge.desktop 1970-01-01 00:00:00.000000000 +0000 +++ hdrmerge-0.5.0/debian/hdrmerge.desktop 2015-03-03 01:15:56.000000000 +0000 @@ -0,0 +1,13 @@ +[Desktop Entry] +Value=1.0 +Type=Application +Name=HDRMerge +GenericName=HDR raw image merging +GenericName[es]=Mezcla de imágenes HDR raw +Comment=Merge several raw images into a single DNG raw image with high dynamic range. +Comment[es]=Mezcla varias imágenes raw en una única imagen DNG raw de alto rango dinámico. +Icon=hdrmerge +Exec=/usr/bin/hdrmerge %F +Categories=Graphics;Photography +MimeType=image/x-dcraw;image/x-adobe-dng +Terminal=false diff -Nru hdrmerge-0.5.0/debian/hdrmerge.doc-base.EX hdrmerge-0.5.0/debian/hdrmerge.doc-base.EX --- hdrmerge-0.5.0/debian/hdrmerge.doc-base.EX 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/hdrmerge.doc-base.EX 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Document: hdrmerge -Title: Debian hdrmerge Manual -Author: -Abstract: This manual describes what hdrmerge is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/hdrmerge/hdrmerge.sgml.gz - -Format: postscript -Files: /usr/share/doc/hdrmerge/hdrmerge.ps.gz - -Format: text -Files: /usr/share/doc/hdrmerge/hdrmerge.text.gz - -Format: HTML -Index: /usr/share/doc/hdrmerge/html/index.html -Files: /usr/share/doc/hdrmerge/html/*.html diff -Nru hdrmerge-0.5.0/debian/init.d.ex hdrmerge-0.5.0/debian/init.d.ex --- hdrmerge-0.5.0/debian/init.d.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/init.d.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: hdrmerge -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -# Author: Dariusz Duma - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="hdrmerge" -NAME=hdrmerge -DAEMON=/usr/sbin/hdrmerge -DAEMON_ARGS="" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # The above code will not work for interpreted scripts, use the next - # six lines below instead (Ref: #643337, start-stop-daemon(8) ) - #start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON \ - # --name $NAME --test > /dev/null \ - # || return 1 - #start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON \ - # --name $NAME -- $DAEMON_ARGS \ - # || return 2 - - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff -Nru hdrmerge-0.5.0/debian/manpage.1.ex hdrmerge-0.5.0/debian/manpage.1.ex --- hdrmerge-0.5.0/debian/manpage.1.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/manpage.1.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" (C) Copyright 2014 Dariusz Duma , -.\" -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH HDRMERGE SECTION "May 30, 2014" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -hdrmerge \- program to do something -.SH SYNOPSIS -.B hdrmerge -.RI [ options ] " files" ... -.br -.B bar -.RI [ options ] " files" ... -.SH DESCRIPTION -This manual page documents briefly the -.B hdrmerge -and -.B bar -commands. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBhdrmerge\fP is a program that... -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -For a complete description, see the Info files. -.TP -.B \-h, \-\-help -Show summary of options. -.TP -.B \-v, \-\-version -Show version of program. -.SH SEE ALSO -.BR bar (1), -.BR baz (1). -.br -The programs are documented fully by -.IR "The Rise and Fall of a Fooish Bar" , -available via the Info system. diff -Nru hdrmerge-0.5.0/debian/manpage.sgml.ex hdrmerge-0.5.0/debian/manpage.sgml.ex --- hdrmerge-0.5.0/debian/manpage.sgml.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/manpage.sgml.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - FIRSTNAME"> - SURNAME"> - - May 30, 2014"> - - SECTION"> - dhor@toxic.net.pl"> - - HDRMERGE"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; -
- - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - OPTIONS - - These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - Info files. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (and may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - -
- - diff -Nru hdrmerge-0.5.0/debian/manpage.xml.ex hdrmerge-0.5.0/debian/manpage.xml.ex --- hdrmerge-0.5.0/debian/manpage.xml.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/manpage.xml.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,291 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A typical entry -in a Makefile or Makefile.am is: - -DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl -XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0" - -manpage.1: manpage.xml - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The XSL files are in -docbook-xsl. A description of the parameters you can use can be found in the -docbook-xsl-doc-* packages. Please remember that if you create the nroff -version in one of the debian/rules file targets (such as build), you will need -to include xsltproc and docbook-xsl in your Build-Depends control field. -Alternatively use the xmlto command/package. That will also automatically -pull in xsltproc and docbook-xsl. - -Notes for using docbook2x: docbook2x-man does not automatically create the -AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as - ... . - -To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections -read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be -found in the docbook-xsl-doc-html package. - -Validation can be done using: `xmllint -''-noout -''-valid manpage.xml` - -General documentation about man-pages and man-page-formatting: -man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ - ---> - - - - - - - - - - - - - -]> - - - - &dhtitle; - &dhpackage; - - - &dhfirstname; - &dhsurname; - Wrote this manpage for the Debian system. -
- &dhemail; -
-
-
- - 2007 - &dhusername; - - - This manual page was written for the Debian system - (and may be used by others). - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU General Public License, - Version 2 or (at your option) any later version published by - the Free Software Foundation. - On Debian systems, the complete text of the GNU General Public - License can be found in - /usr/share/common-licenses/GPL. - -
- - &dhucpackage; - &dhsection; - - - &dhpackage; - program to do something - - - - &dhpackage; - - - - - - - - - this - - - - - - - - this - that - - - - - &dhpackage; - - - - - - - - - - - - - - - - - - - DESCRIPTION - This manual page documents briefly the - &dhpackage; and bar - commands. - This manual page was written for the Debian distribution - because the original program does not have a manual page. - Instead, it has documentation in the GNU - info - 1 - format; see below. - &dhpackage; is a program that... - - - OPTIONS - The program follows the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - - info - 1 - files. - - - - - - - Does this and that. - - - - - - - Show summary of options. - - - - - - - Show version of program. - - - - - - FILES - - - /etc/foo.conf - - The system-wide configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - ${HOME}/.foo.conf - - The per-user configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - - - ENVIRONMENT - - - FOO_CONF - - If used, the defined file is used as configuration - file (see also ). - - - - - - DIAGNOSTICS - The following diagnostics may be issued - on stderr: - - - Bad configuration file. Exiting. - - The configuration file seems to contain a broken configuration - line. Use the option, to get more info. - - - - - &dhpackage; provides some return codes, that can - be used in scripts: - - Code - Diagnostic - - 0 - Program exited successfully. - - - 1 - The configuration file seems to be broken. - - - - - - BUGS - The program is currently limited to only work - with the foobar library. - The upstreams BTS can be found - at . - - - SEE ALSO - - - bar - 1 - , - baz - 1 - , - foo.conf - 5 - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - info - 1 - system. - -
- diff -Nru hdrmerge-0.5.0/debian/menu.ex hdrmerge-0.5.0/debian/menu.ex --- hdrmerge-0.5.0/debian/menu.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/menu.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(hdrmerge):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ - title="hdrmerge" command="/usr/bin/hdrmerge" diff -Nru hdrmerge-0.5.0/debian/patches/desktop-english-wording.patch hdrmerge-0.5.0/debian/patches/desktop-english-wording.patch --- hdrmerge-0.5.0/debian/patches/desktop-english-wording.patch 1970-01-01 00:00:00.000000000 +0000 +++ hdrmerge-0.5.0/debian/patches/desktop-english-wording.patch 2015-03-02 23:10:05.000000000 +0000 @@ -0,0 +1,19 @@ +diff -rupN hdrmerge-0.5.0.orig/hdrmerge.desktop hdrmerge-0.5.0/hdrmerge.desktop +--- hdrmerge-0.5.0.orig/hdrmerge.desktop 2015-01-25 15:08:49.000000000 -0500 ++++ hdrmerge-0.5.0/hdrmerge.desktop 2015-03-02 18:07:33.716627014 -0500 +@@ -2,12 +2,12 @@ + Value=1.0 + Type=Application + Name=HDRMerge +-GenericName=HDR raw image merge ++GenericName=HDR raw image merging + GenericName[es]=Mezcla de imágenes HDR raw + Comment=Merge several raw images into a single DNG raw image with high dynamic range. + Comment[es]=Mezcla varias imágenes raw en una única imagen DNG raw de alto rango dinámico. +-Icon=hdrmerge-icon ++Icon=hdrmerge + Exec=@CMAKE_INSTALL_PREFIX@/bin/hdrmerge %F +-Categories=Graphics ++Categories=Graphics;Photography + MimeType=image/x-dcraw;image/x-adobe-dng + Terminal=false diff -Nru hdrmerge-0.5.0/debian/patches/LIBRAW_DECODER_FLATFIELD_for-LibRaw-0.17.patch hdrmerge-0.5.0/debian/patches/LIBRAW_DECODER_FLATFIELD_for-LibRaw-0.17.patch --- hdrmerge-0.5.0/debian/patches/LIBRAW_DECODER_FLATFIELD_for-LibRaw-0.17.patch 1970-01-01 00:00:00.000000000 +0000 +++ hdrmerge-0.5.0/debian/patches/LIBRAW_DECODER_FLATFIELD_for-LibRaw-0.17.patch 2015-09-27 16:24:45.000000000 +0000 @@ -0,0 +1,21 @@ +Description: The most recent version of LibRaw (0.17.0) no longer defines LIBRAW_DECODER_FLATFIELD, therefore compilation of ImageIO.cpp fails +Author: Pascal Mons + +diff -rupN hdrmerge-0.5.0.orig/ImageIO.cpp hdrmerge-0.5.0/ImageIO.cpp +--- hdrmerge-0.5.0.orig/ImageIO.cpp 2015-01-25 15:08:49.000000000 -0500 ++++ hdrmerge-0.5.0/ImageIO.cpp 2015-09-27 12:11:49.613723187 -0400 +@@ -39,9 +39,13 @@ Image ImageIO::loadRawImage(RawParameter + if (rawProcessor.open_file(rawParameters.fileName.toLocal8Bit().constData()) == LIBRAW_SUCCESS) { + libraw_decoder_info_t decoder_info; + rawProcessor.get_decoder_info(&decoder_info); ++ #ifdef LIBRAW_DECODER_FLATFIELD ++ // See if we can access the Bayer patterned data for this raw file + if(!decoder_info.decoder_flags & LIBRAW_DECODER_FLATFIELD) { + Log::msg(Log::DEBUG, "LibRaw decoder is not flatfield (", ios::hex, decoder_info.decoder_flags, ")."); +- } else if (d.idata.filters <= 1000 && d.idata.filters != 9) { ++ } else ++ #endif ++ if (d.idata.filters <= 1000 && d.idata.filters != 9) { + Log::msg(Log::DEBUG, "Unsupported filter array (", d.idata.filters, ")."); + } else if (rawProcessor.unpack() != LIBRAW_SUCCESS) { + Log::msg(Log::DEBUG, "LibRaw::unpack() failed."); diff -Nru hdrmerge-0.5.0/debian/patches/series hdrmerge-0.5.0/debian/patches/series --- hdrmerge-0.5.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ hdrmerge-0.5.0/debian/patches/series 2015-09-27 16:16:38.000000000 +0000 @@ -0,0 +1,2 @@ +desktop-english-wording.patch +LIBRAW_DECODER_FLATFIELD_for-LibRaw-0.17.patch diff -Nru hdrmerge-0.5.0/debian/postinst.ex hdrmerge-0.5.0/debian/postinst.ex --- hdrmerge-0.5.0/debian/postinst.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/postinst.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/sh -# postinst script for hdrmerge -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru hdrmerge-0.5.0/debian/postrm.ex hdrmerge-0.5.0/debian/postrm.ex --- hdrmerge-0.5.0/debian/postrm.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/postrm.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/sh -# postrm script for hdrmerge -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru hdrmerge-0.5.0/debian/preinst.ex hdrmerge-0.5.0/debian/preinst.ex --- hdrmerge-0.5.0/debian/preinst.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/preinst.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh -# preinst script for hdrmerge -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru hdrmerge-0.5.0/debian/prerm.ex hdrmerge-0.5.0/debian/prerm.ex --- hdrmerge-0.5.0/debian/prerm.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/prerm.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#!/bin/sh -# prerm script for hdrmerge -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru hdrmerge-0.5.0/debian/rules hdrmerge-0.5.0/debian/rules --- hdrmerge-0.5.0/debian/rules 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/rules 2015-09-27 16:00:50.000000000 +0000 @@ -4,5 +4,28 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +# Substitute CXXFLAGS from -O2 to -O3 for optimized Quad Core compilation +# http://manpages.ubuntu.com/manpages/precise/man1/dpkg-buildflags.1.html +# https://www.gnu.org/software/make/manual/hoverridetml_node/Text-Functions.html +export DEB_CFLAGS_MAINT_STRIP := -O2 +export DEB_CXXFLAGS_MAINT_STRIP := -O2 +export DEB_CFLAGS_MAINT_APPEND := -O3 +export DEB_CXXFLAGS_MAINT_APPEND := -O3 + %: - dh $@ + dh $@ --parallel + +override_dh_auto_build: + dh_auto_build -- -j4 + +override_dh_installmenu: + # install the desktop launcher + mkdir -p $(CURDIR)/debian/hdrmerge/usr/share/applications + cp $(CURDIR)/debian/hdrmerge.desktop \ + $(CURDIR)/debian/hdrmerge/usr/share/applications + mkdir -p $(CURDIR)/debian/hdrmerge/usr/share/pixmaps + cp $(CURDIR)/images/logo.png \ + $(CURDIR)/debian/hdrmerge/usr/share/pixmaps/hdrmerge.png + dh_installmenu diff -Nru hdrmerge-0.5.0/debian/watch.ex hdrmerge-0.5.0/debian/watch.ex --- hdrmerge-0.5.0/debian/watch.ex 2014-05-30 18:16:40.000000000 +0000 +++ hdrmerge-0.5.0/debian/watch.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php hdrmerge-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/hdrmerge-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/hdrmerge-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for devscripts >= 2.9 -# http://sf.net/hdrmerge/hdrmerge-(.*)\.tar\.gz - -# Uncomment to find new files on GooglePages -# http://example.googlepages.com/foo.html hdrmerge-(.*)\.tar\.gz