Merge branch 'irfanview-dpkg' into 'master'

irfanview split into 32 and 64 bit dpkgs

See merge request bgstack15/stackrpms!44

20 files changed, 205 insertions, 57 deletions

diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog
index ab0432a..250ac3e 100644
--- a/irfanview/debian/changelog
+++ b/irfanview/debian/changelog
@@ -1,5 +1,5 @@
-irfanview (4.52-2devuan) manual; urgency=low
+irfanview (4.52-3devuan) manual; urgency=medium
 
-  * Initial build for devuan
+  * Rebuilt into 32-bit and 64-bit pre-built binary packages.
 
- -- B Stack <bgstack15@gmail.com>  Thu, 07 Feb 2019 14:33:49 -0500
+ -- B Stack <bgstack15@gmail.com>  Thu, 26 Feb 2019 13:41:45 -0500
diff --git a/irfanview/debian/conffiles b/irfanview/debian/conffiles
deleted file mode 100644
index cab5d4e..0000000
--- a/irfanview/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/irfanview/i_view32.ini
diff --git a/irfanview/debian/control b/irfanview/debian/control
index d164814..2841854 100644
--- a/irfanview/debian/control
+++ b/irfanview/debian/control
@@ -7,9 +7,31 @@ Build-Depends: debhelper (>=11~),
 Standards-Version: 4.1.4
 Homepage: https://irfanview.info/
 
-Package: irfanview
-Architecture: any
+Package: irfanview-common
+Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends},
-	wine | wine-staging | winehq | winehq-staging | wine-stable
+Provides: irfanview
+Breaks: irfanview (<<4.52-3devuan)
+Description: common elements for irfanview
+ Basic components that are arch-independent.
+
+Package: irfanview-bin32
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends},
+	wine | wine-staging | winehq | winehq-staging | wine-stable,
+   irfanview-common
+Provides: irfanview
+Description: graphics viewer from a non-free OS
+ The 32-bit release.
+
+Package: irfanview-bin64
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends},
+	wine64 | wine-staging | winehq | winehq-staging | wine-stable,
+   irfanview-common
+Provides: irfanview, x-graphics-viewer
 Description: graphics viewer from a non-free OS
+ The 64-bit release
diff --git a/irfanview/debian/default/irfanview b/irfanview/debian/default/irfanview
deleted file mode 100644
index e972fb9..0000000
--- a/irfanview/debian/default/irfanview
+++ /dev/null
@@ -1,5 +0,0 @@
-# File: /etc/sysconfig/irfanview
-WINEARCH=win32
-WINEPREFIX=$HOME/.wine
-EXEC_NAME="i_view32.exe"
-EXEC_PATH="/usr/share/irfanview/i_view32.exe"
diff --git a/irfanview/debian/i_view64.ini b/irfanview/debian/i_view64.ini
new file mode 120000
index 0000000..1d78118
--- /dev/null
+++ b/irfanview/debian/i_view64.ini
@@ -0,0 +1 @@
+i_view32.ini
\ No newline at end of file
diff --git a/irfanview/debian/irfanview-bin32.conffiles b/irfanview/debian/irfanview-bin32.conffiles
new file mode 100644
index 0000000..42733b4
--- /dev/null
+++ b/irfanview/debian/irfanview-bin32.conffiles
@@ -0,0 +1 @@
+/usr/share/irfanview32/i_view32.ini
diff --git a/irfanview/debian/irfanview-bin32.install b/irfanview/debian/irfanview-bin32.install
new file mode 100644
index 0000000..9006490
--- /dev/null
+++ b/irfanview/debian/irfanview-bin32.install
@@ -0,0 +1,7 @@
+irfanview-bin32/i_view32.exe	usr/share/irfanview32/
+irfanview-bin32/Languages	usr/share/irfanview32/
+irfanview-bin32/Plugins		usr/share/irfanview32/
+irfanview-bin32/Toolbars	usr/share/irfanview32/
+irfanview-bin32/*.chm usr/share/irfanview32/
+debian/i_view32.ini		usr/share/irfanview32/
+debian/irfanview32		usr/bin/
diff --git a/irfanview/debian/irfanview-bin32.postinst b/irfanview/debian/irfanview-bin32.postinst
new file mode 100644
index 0000000..1d2d56b
--- /dev/null
+++ b/irfanview/debian/irfanview-bin32.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+case "$1" in
+   configure|abort-upgrade|abort-remove)
+      update-alternatives --install /usr/bin/irfanview irfanview /usr/bin/irfanview32 70
+      update-alternatives --install /usr/bin/x-graphics-viewer x-graphics-viewer /usr/bin/irfanview32 70
+      ;;
+esac
diff --git a/irfanview/debian/irfanview-bin32.prerm b/irfanview/debian/irfanview-bin32.prerm
new file mode 100644
index 0000000..3bbee7a
--- /dev/null
+++ b/irfanview/debian/irfanview-bin32.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+case "$1" in
+   remove|deconfigure)
+      update-alternatives --remove irfanview /usr/bin/irfanview32
+      update-alternatives --remove x-graphics-viewer /usr/bin/irfanview32
+      ;;
+esac
diff --git a/irfanview/debian/irfanview-bin64.conffiles b/irfanview/debian/irfanview-bin64.conffiles
new file mode 100644
index 0000000..91e9ab8
--- /dev/null
+++ b/irfanview/debian/irfanview-bin64.conffiles
@@ -0,0 +1 @@
+/usr/share/irfanview64/i_view64.ini
diff --git a/irfanview/debian/irfanview-bin64.install b/irfanview/debian/irfanview-bin64.install
new file mode 100644
index 0000000..6466985
--- /dev/null
+++ b/irfanview/debian/irfanview-bin64.install
@@ -0,0 +1,7 @@
+irfanview-bin64/i_view64.exe	usr/share/irfanview64/
+irfanview-bin64/Languages	usr/share/irfanview64/
+irfanview-bin64/Plugins		usr/share/irfanview64/
+irfanview-bin64/Toolbars	usr/share/irfanview64/
+irfanview-bin64/*.chm usr/share/irfanview64/
+debian/i_view64.ini		usr/share/irfanview64/
+debian/irfanview64		usr/bin/
diff --git a/irfanview/debian/irfanview-bin64.postinst b/irfanview/debian/irfanview-bin64.postinst
new file mode 100644
index 0000000..6caf135
--- /dev/null
+++ b/irfanview/debian/irfanview-bin64.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+case "$1" in
+   configure|abort-upgrade|abort-remove)
+      update-alternatives --install /usr/bin/irfanview irfanview /usr/bin/irfanview64 60
+      update-alternatives --install /usr/bin/x-graphics-viewer x-graphics-viewer /usr/bin/irfanview64 60
+      ;;
+esac
diff --git a/irfanview/debian/irfanview-bin64.prerm b/irfanview/debian/irfanview-bin64.prerm
new file mode 100644
index 0000000..35526da
--- /dev/null
+++ b/irfanview/debian/irfanview-bin64.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+case "$1" in
+   remove|deconfigure)
+      update-alternatives --remove irfanview /usr/bin/irfanview64
+      update-alternatives --remove x-graphics-viewer /usr/bin/irfanview64
+      ;;
+esac
diff --git a/irfanview/debian/irfanview-common.install b/irfanview/debian/irfanview-common.install
new file mode 100644
index 0000000..d5b3aca
--- /dev/null
+++ b/irfanview/debian/irfanview-common.install
@@ -0,0 +1,2 @@
+debian/irfanview.desktop	usr/share/applications/
+debian/irfanview-vlc		usr/bin/
diff --git a/irfanview/debian/irfanview-common.irfanview.docs b/irfanview/debian/irfanview-common.irfanview.docs
new file mode 100644
index 0000000..572ef46
--- /dev/null
+++ b/irfanview/debian/irfanview-common.irfanview.docs
@@ -0,0 +1,2 @@
+irfanview-bin32/Html
+irfanview-bin32/i_*.txt
diff --git a/irfanview/debian/irfanview.docs b/irfanview/debian/irfanview.docs
deleted file mode 100644
index b8de1a0..0000000
--- a/irfanview/debian/irfanview.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-Html
-i_*.txt
diff --git a/irfanview/debian/irfanview.install b/irfanview/debian/irfanview.install
deleted file mode 100644
index fa26355..0000000
--- a/irfanview/debian/irfanview.install
+++ /dev/null
@@ -1,10 +0,0 @@
-i_view32.exe	usr/share/irfanview/
-Languages	usr/share/irfanview/
-Plugins		usr/share/irfanview/
-Toolbars	usr/share/irfanview/
-*.chm usr/share/irfanview/
-debian/i_view32.ini		usr/share/irfanview/
-debian/irfanview.desktop	usr/share/applications/
-debian/default/irfanview	etc/default/
-debian/bin/irfanview		usr/bin/
-debian/irfanview-vlc		usr/bin/
diff --git a/irfanview/debian/bin/irfanview b/irfanview/debian/irfanview32
index bb2af33..66f0ee8 100755
--- a/irfanview/debian/bin/irfanview
+++ b/irfanview/debian/irfanview32
@@ -5,29 +5,20 @@
 # Title: Wrapper script for passing files to Irfanview
 # Purpose: Converts file paths to a wine format and also handles compressed files
 # History: 2016-01-29 Initial quick script written. It used a bunch of sed commands to transform paths to a wine format.
+#    2019-02-26 remove /etc/default/irfanview file
 # Usage: irfan /path/to/image /another/image/file
 # Reference:
 #    Ideas for zip expansion and winepath https://github.com/Zykr/IrfanViewLinux/blob/master/irfanview
 # Improve:
 
-IV_DEFAULT_FILE=/etc/sysconfig/irfanview
-# prepend IV_ to variables from defaults file and apply them
-if test -r "${IV_DEFAULT_FILE}" ;
-then
-   IV_tmpfile="$( mktemp )"
-   sed -r -e 's/^\s*(.*=.*)/IV_\1/;' < "${IV_DEFAULT_FILE}" > "${IV_tmpfile}"
-   source "${IV_tmpfile}"
-   rm -f "${IV_tmpfile}"
-fi
-
 # load variables
 test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine"
 test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine
 test -z "${IV_DEVTTY}" && export IV_DEVTTY=/dev/null
 test -z "${IV_EXEC_NAME}" && export IV_EXEC_NAME="i_view32.exe"
-test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview/i_view32.exe"
+test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview32/i_view32.exe"
 
-IV_VERSION="2018-09-02a"
+IV_VERSION="2019-02-26a"
 
 # Define functions
 expandword() {
diff --git a/irfanview/debian/irfanview64 b/irfanview/debian/irfanview64
new file mode 100755
index 0000000..b67e43d
--- /dev/null
+++ b/irfanview/debian/irfanview64
@@ -0,0 +1,94 @@
+#!/bin/sh
+# File: /usr/bin/irfanview64
+# Author: bgstack15@gmail.com
+# Startdate: 2016-01-29
+# Title: Wrapper script for passing files to Irfanview
+# Purpose: Converts file paths to a wine format and also handles compressed files
+# History: 2016-01-29 Initial quick script written. It used a bunch of sed commands to transform paths to a wine format.
+#    2019-02-26 remove /etc/default/irfanview file
+# Usage: irfan /path/to/image /another/image/file
+# Reference:
+#    Ideas for zip expansion and winepath https://github.com/Zykr/IrfanViewLinux/blob/master/irfanview
+# Improve:
+
+# load variables
+test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine64"
+test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine64
+test -z "${IV_DEVTTY}" && export IV_DEVTTY=/dev/null
+test -z "${IV_EXEC_NAME}" && export IV_EXEC_NAME="i_view64.exe"
+test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview64/i_view64.exe"
+
+IV_VERSION="2019-02-26a"
+
+# Define functions
+expandword() {
+   # call: expandword "${word}"
+   # if file, add it
+   # if directory, expand it
+   # if tarball, extract it and operate on the directory like normal
+   local _word="$( echo "${@}" | sed -e 'sF\/\/F\/Fg;' )"
+   if test -d "${_word}";
+   then
+      # loop through all files in the directory
+      for _newword in "${_word}"/*;
+      do
+         expandword "${_newword}";
+      done
+   elif test -f "${_word}";
+   then
+      # file exists so check if tarball
+      case "${_word}" in
+         *.tgz|*.tar.gz)
+            # extract it and expand the temporary directory
+            _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
+            echo "tmpdir ${_tmpdir}" 1>${IV_DEVTTY}
+            tar -zx -C "${_tmpdir}" -f "${_word}" 1>${IV_DEVTTY} 2>&1
+            expandword "${_tmpdir}"
+            ;;
+         *.zip)
+            _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
+            echo "tmpdir ${_tmpdir}" 1>${IV_DEVTTY}
+            echo "7za e -w${_tmpdir} ${_word}" 1>${IV_DEVTTY} 2>&1
+            ( cd "${_tmpdir}"; 7za e "${_word}" 1>${IV_DEVTTY} 2>&1; )
+            expandword "${_tmpdir}"
+            ;;
+         *)
+            # assume it is readable and add it to list of files to open
+            echo "File ${_word}" 1>${IV_DEVTTY}
+            thisfile="$( getwinepath "${_word}" )"
+            irfanfiles="${irfanfiles} \"${thisfile}\""
+            ;;
+      esac
+   fi
+}
+
+getwinepath() {
+   # call: getwinepath "$foo"
+   winepath -w "${@}"
+}
+
+# Define variables
+alltempdirs=""
+
+# prepare files
+irfanargs=
+irfanfiles=
+
+for word in "${@}";
+do
+   expandword "${word}"
+done
+irfanfiles="${irfanfiles## }"
+
+# run wine
+cd $WINEPREFIX
+echo "${irfanfiles}" | xargs echo wine "${IV_EXEC_PATH}" ${irfanargs} > ${IV_DEVTTY}
+echo "${irfanfiles}" | xargs wine "${IV_EXEC_PATH}"  ${irfanargs} &
+
+#wait $( pgrep -P $$ ${IV_EXEC_NAME} )
+# WORKHERE try wait with:
+wait %1
+for thistempdir in ${alltempdirs};
+do
+   rm -rf "${thistempdir}" 1>${IV_DEVTTY}
+done
diff --git a/irfanview/debian/rules b/irfanview/debian/rules
index e8ccb04..e4ab04c 100755
--- a/irfanview/debian/rules
+++ b/irfanview/debian/rules
@@ -8,39 +8,49 @@
 export _prefix=/usr
 export _datadir="${_prefix}/share"
 export appname=irfanview
+export appname_32=irfanview-bin32
+export appname_64=irfanview-bin64
+export appname_common=irfanview-common
+export appdir_32=irfanview32
+export appdir_64=irfanview64
 export debuilddir="debian"
 export buildroot="${debuilddir}/${appname}"
+export buildroot_common="${debuilddir}/${appname_common}"
+export buildroot_32="${debuilddir}/${appname_32}"
+export buildroot_64="${debuilddir}/${appname_64}"
 
 %:
 	dh $@
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod 0666 ${buildroot}${_datadir}/${appname}/i_view32.ini
+	chmod 0666 ${buildroot_32}${_datadir}/${appdir_32}/i_view32.ini || :
+	chmod 0666 ${buildroot_64}${_datadir}/${appdir_64}/i_view32.ini || :
 
 override_dh_auto_install:
 	dh_auto_install
+	# common
 	tar -zxf debian/irfanview-icons.tgz irfanview-circle.svg
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/16x16/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/22x22/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/24x24/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/32x32/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/48x48/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/64x64/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/96x96/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/128x128/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/256x256/apps
-	mkdir -p ${buildroot}${_datadir}/icons/hicolor/scalable/apps
-	convert irfanview-circle.svg -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 22x22 ${buildroot}${_datadir}/icons/hicolor/22x22/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 24x24 ${buildroot}${_datadir}/icons/hicolor/24x24/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 96x96 ${buildroot}${_datadir}/icons/hicolor/96x96/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 256x256 ${buildroot}${_datadir}/icons/hicolor/256x256/apps/${appname}.png
-	cp -p irfanview-circle.svg ${buildroot}${_datadir}/icons/hicolor/scalable/apps/${appname}.svg
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/16x16/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/22x22/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/24x24/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/32x32/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/48x48/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/64x64/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/96x96/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/128x128/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/256x256/apps
+	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/scalable/apps
+	convert irfanview-circle.svg -filter Lanczos -resize 16x16 ${buildroot_common}${_datadir}/icons/hicolor/16x16/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 22x22 ${buildroot_common}${_datadir}/icons/hicolor/22x22/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 24x24 ${buildroot_common}${_datadir}/icons/hicolor/24x24/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 32x32 ${buildroot_common}${_datadir}/icons/hicolor/32x32/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 48x48 ${buildroot_common}${_datadir}/icons/hicolor/48x48/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 64x64 ${buildroot_common}${_datadir}/icons/hicolor/64x64/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 96x96 ${buildroot_common}${_datadir}/icons/hicolor/96x96/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 128x128 ${buildroot_common}${_datadir}/icons/hicolor/128x128/apps/${appname}.png
+	convert irfanview-circle.svg -filter Lanczos -resize 256x256 ${buildroot_common}${_datadir}/icons/hicolor/256x256/apps/${appname}.png
+	cp -p irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/scalable/apps/${appname}.svg
 	rm -f ./irfanview-circle.svg || :
 
 override_dh_auto_clean: