Made a number of updates to the package

- Added support for i686
- Enabled launch icon generation
- Linked license information to the proper location
- Linked the "differ" program to /usr/bin/
- Specified required Java runtime version
- Set the INSTALLDIR variable in bindiff.xml
- Identified the BinDiff configuration files in the PKGBUILD
- Used the same SHA-1 checksums as the download page

3 files changed, 62 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0bdd6a49f9..5235d90c73d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,25 @@
 # Generated by mksrcinfo v8
-# Fri Jan  1 13:38:16 UTC 2016
+# Sat Mar 19 19:18:50 UTC 2016
 pkgbase = bindiff
-	pkgdesc = A comparison tool for binary files, that assists vulnerability researchers and engineers to quickly find differences and similarities in disassembled code.
+	pkgdesc = A comparison tool for binary files that assists vulnerability researchers and engineers to quickly find differences and similarities in disassembled code.
 	pkgver = 4.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.zynamics.com/bindiff.html
+	install = bindiff.install
+	arch = i686
 	arch = x86_64
-	license = unknown
-	depends = java-runtime
-	source = https://dl.google.com/dl/zynamics/bindiff420-debian8-amd64.deb
+	license = custom
+	depends = desktop-file-utils
+	depends = java-runtime>=8
+	options = !strip
+	backup = etc/opt/zynamics/BinDiff/bindiff.xml
+	backup = etc/opt/zynamics/BinDiff/config.xml
 	source = https://dl.google.com/dl/zynamics/bindiff-license-key.zip
-	sha512sums = 18f20c1a5f9fe2c305e89f960b42b21107d03775a86ba1a50f02a7bf0217dd9793ffb91c55b5f83cbb398ebb678f61a7ca7c6d9cfbd721a9482af700ea96746a
-	sha512sums = e07258362f04d250c6f00c4ca3c6e92fc2b014c63a9ad8b36d813591053c64118283724a594fbae3a4517cba112a952bcc7ab4557cd1e14ab711076fd70bcc7e
+	sha1sums = 95715a8bd7469106fc60b03f94f3cc87604e354c
+	source_i686 = https://dl.google.com/dl/zynamics/bindiff420-debian8-i386.deb
+	sha1sums_i686 = 49cdd6ae7ebe5b1813a5fcafaae9fde19005c824
+	source_x86_64 = https://dl.google.com/dl/zynamics/bindiff420-debian8-amd64.deb
+	sha1sums_x86_64 = 38fbea8070495fc8730d7c86eae03bc68fde291f
 
 pkgname = bindiff
 
diff --git a/PKGBUILD b/PKGBUILD
index 2249ea817db..3d07cd5b5f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,39 @@
 # Maintainer: David Manouchehri <manouchehri@riseup.net>
 
-pkgname="bindiff"
+pkgname=bindiff
 pkgver=4.2
-pkgrel=1
-pkgdesc="A comparison tool for binary files, that assists vulnerability researchers and engineers to quickly find differences and similarities in disassembled code."
+pkgrel=2
+pkgdesc="A comparison tool for binary files that assists vulnerability researchers and engineers to quickly find differences and similarities in disassembled code."
+arch=('i686' 'x86_64')
 url="http://www.zynamics.com/bindiff.html"
-license=('unknown')
-source=("https://dl.google.com/dl/zynamics/bindiff420-debian8-amd64.deb"
-        "https://dl.google.com/dl/zynamics/bindiff-license-key.zip")
-# https://dl.google.com/dl/zynamics/bindiff420-debian8-i386.deb
-sha512sums=('18f20c1a5f9fe2c305e89f960b42b21107d03775a86ba1a50f02a7bf0217dd9793ffb91c55b5f83cbb398ebb678f61a7ca7c6d9cfbd721a9482af700ea96746a'
-            'e07258362f04d250c6f00c4ca3c6e92fc2b014c63a9ad8b36d813591053c64118283724a594fbae3a4517cba112a952bcc7ab4557cd1e14ab711076fd70bcc7e')
-arch=('x86_64') # arch=('i686' 'x86_64')
-depends=('java-runtime')
+license=('custom')
+depends=('desktop-file-utils' 'java-runtime>=8')
+options=('!strip')
+install=${pkgname}.install
+backup=('etc/opt/zynamics/BinDiff/bindiff.xml' 'etc/opt/zynamics/BinDiff/config.xml')
+source=("https://dl.google.com/dl/zynamics/bindiff-license-key.zip")
+source_i686=("https://dl.google.com/dl/zynamics/bindiff420-debian8-i386.deb")
+source_x86_64=("https://dl.google.com/dl/zynamics/bindiff420-debian8-amd64.deb")
+sha1sums=("95715a8bd7469106fc60b03f94f3cc87604e354c")
+sha1sums_i686=('49cdd6ae7ebe5b1813a5fcafaae9fde19005c824')
+sha1sums_x86_64=('38fbea8070495fc8730d7c86eae03bc68fde291f')
 
 package() {
-  cd "${srcdir}/"
-  tar -xvf 'data.tar.xz' -C "${pkgdir}/"
+  # Extract
+  tar -xJf data.tar.xz --exclude="usr/share/lintian" -C "${pkgdir}"/
 
-  install -m 0444 'zynamics BinDiff License Key.txt' "${pkgdir}/opt/zynamics/BinDiff/bin/"
+  # Install the license key
+  install -m 0644 "zynamics BinDiff License Key.txt" "${pkgdir}/opt/zynamics/BinDiff/bin/"
 
-  mkdir -p "${pkgdir}/usr/bin/"
+  # Install links to the binaries
+  install -dm 755 "${pkgdir}/usr/bin"
   ln -s "/opt/zynamics/BinDiff/bin/bindiff.sh" "${pkgdir}/usr/bin/bindiff"
+  ln -s "/opt/zynamics/BinDiff/bin/differ" "${pkgdir}/usr/bin/differ"
 
-  printf "\033[31;1mYou will need to fetch the IDA plugins.\n"
-  printf "https://dl.google.com/dl/zynamics/bindiff420-win-pluginsonly.zip\n"
+  # Install license files
+  install -dm 755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s "/usr/share/doc/${pkgname}/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/"
+  ln -s "/opt/zynamics/BinDiff/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 
-# vim:set et sw=2 sts=2 tw=80:
\ No newline at end of file
+# vim:set et sw=2 sts=2 tw=80:
diff --git a/bindiff.install b/bindiff.install
new file mode 100644
index 00000000000..a122afd470e
--- /dev/null
+++ b/bindiff.install
@@ -0,0 +1,19 @@
+post_install() {
+  # Setup install location in config file.
+  sed -i 's/INSTALLDIR/\/opt\/zynamics\/BinDiff\//' /etc/opt/zynamics/BinDiff/bindiff.xml
+
+  # Add application launcher to desktop DB
+  update-desktop-database -q
+
+  # Notify the user about the IDA plugins
+  echo "You will need to fetch the IDA plugins:"
+  echo "https://dl.google.com/dl/zynamics/bindiff420-win-pluginsonly.zip"
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  update-desktop-database -q
+}