Dear Maintainer, would the changes in attached patch be acceptable? It changes these files: - debian/control: change dependency to "binutils" to "binutils:i386 | binutils:amd64" (user probably wants to stay with binutils:amd64 when installing flashplugin-nonfree:i386) - debian/rules: change "arch_wget=" line to include architecture from build system - update-flashplugin-nonfree: move variable arch_wget globally and replace all other occurences of "dpkg --print-architecture" by "$arch_wget".
Tested successfully: - built i386 and amd64 package - either package will install the plugin of its architecture when installed on amd64 Kind regards, Bernhard
diff -Nurp flashplugin-nonfree-3.5.orig/debian/control flashplugin-nonfree-3.5/debian/control --- flashplugin-nonfree-3.5.orig/debian/control 2013-12-08 20:31:30.000000000 +0100 +++ flashplugin-nonfree-3.5/debian/control 2014-07-03 19:10:26.000000000 +0200 @@ -8,7 +8,7 @@ Homepage: http://wiki.debian.org/FlashPl Package: flashplugin-nonfree Architecture: i386 amd64 -Depends: debconf | debconf-2.0, wget, gnupg, libatk1.0-0, libcairo2, libfontconfig1, libfreetype6, libgcc1, libglib2.0-0, libgtk2.0-0 (>= 2.14), libnspr4, libnss3, libpango1.0-0, libstdc++6, libx11-6, libxext6, libxt6, libcurl3-gnutls, binutils, ${misc:Depends}, ${shlibs:Depends} +Depends: debconf | debconf-2.0, wget, gnupg, libatk1.0-0, libcairo2, libfontconfig1, libfreetype6, libgcc1, libglib2.0-0, libgtk2.0-0 (>= 2.14), libnspr4, libnss3, libpango1.0-0, libstdc++6, libx11-6, libxext6, libxt6, libcurl3-gnutls, binutils:i386 | binutils:amd64, ${misc:Depends}, ${shlibs:Depends} Suggests: iceweasel, konqueror-nsplugins, ttf-mscorefonts-installer, fonts-dejavu, ttf-xfree86-nonfree, flashplugin-nonfree-extrasound [i386], hal Conflicts: flashplugin (<< 6), xfs (<< 1:1.0.1-5), flashplayer-mozilla, libflash-mozplugin Replaces: flashplugin (<< 6) diff -Nurp flashplugin-nonfree-3.5.orig/debian/rules flashplugin-nonfree-3.5/debian/rules --- flashplugin-nonfree-3.5.orig/debian/rules 2013-12-08 20:44:00.000000000 +0100 +++ flashplugin-nonfree-3.5/debian/rules 2014-07-03 20:35:05.000000000 +0200 @@ -5,6 +5,9 @@ %: dh $@ +override_dh_auto_build: + sed "{s/^arch_wget=.*/arch_wget=$$(dpkg --print-architecture)/g}" -i update-flashplugin-nonfree + publish-checksums: for a in i386 amd64 ; do gpg --default-key 3B5821CC --armor --clearsign < fp10.sha512.$$a.txt > fp10.sha512.$$a.pgp.asc ; done scp fp10.sha512.*.pgp.asc ba...@ravel.debian.org:/home/bartm/public_html/flashplugin-nonfree diff -Nurp flashplugin-nonfree-3.5.orig/update-flashplugin-nonfree flashplugin-nonfree-3.5/update-flashplugin-nonfree --- flashplugin-nonfree-3.5.orig/update-flashplugin-nonfree 2014-06-22 19:11:52.000000000 +0200 +++ flashplugin-nonfree-3.5/update-flashplugin-nonfree 2014-07-03 20:47:57.157668210 +0200 @@ -176,9 +176,6 @@ get_installed_version() { get_upstream_version() { - arch_wget=i686 - [ `dpkg --print-architecture` != "amd64" ] || arch_wget=x86_64 - upstream="" if [ -f $cachedir/get-upstream-version.pl ] @@ -249,6 +246,11 @@ remove_extrafiles() { rm -f /var/lib/flashplugin-nonfree/extrafiles.md5sums } +#following line is changed by debian/rules when packaging +arch_wget= +[ "$arch_wget" != "" ] || arch_wget=`dpkg --print-architecture` +[ "$arch_wget" != "i386" ] || arch_wget=i686 + case "$ACTION" in --install) @@ -277,7 +279,7 @@ case "$ACTION" in [ "$verbose" != "yes" ] || echo "wgetoptions=$wgetoptions" downloadfile=fp.$upstream.sha512.i386.pgp.asc - [ `dpkg --print-architecture` != "amd64" ] || downloadfile=fp.$upstream.sha512.amd64.pgp.asc + [ "$arch_wget" != "amd64" ] || downloadfile=fp.$upstream.sha512.amd64.pgp.asc downloadurl=http://people.debian.org/~bartm/flashplugin-nonfree/D5C0FC14/$downloadfile [ "$verbose" != "yes" ] || echo "downloading $downloadurl ..." @@ -288,7 +290,7 @@ case "$ACTION" in if [ ! -e $downloadfile ] then downloadfile=fp10.sha512.i386.pgp.asc - [ `dpkg --print-architecture` != "amd64" ] || downloadfile=fp10.sha512.amd64.pgp.asc + [ "$arch_wget" != "amd64" ] || downloadfile=fp10.sha512.amd64.pgp.asc downloadurl=http://people.debian.org/~bartm/flashplugin-nonfree/D5C0FC14/$downloadfile [ "$verbose" != "yes" ] || echo "downloading $downloadurl ..."
