academic/bibus: Updated for version 1.5.1

5 files changed, 166 insertions, 131 deletions

diff --git a/academic/bibus/Makefile.patch b/academic/bibus/Makefile.patch
index 085e76c77406..286c23dba848 100644
--- a/academic/bibus/Makefile.patch
+++ b/academic/bibus/Makefile.patch
@@ -1,104 +1,123 @@
-14a15
-> docdir = $(prefix)/$(docdir)
-17,18c18,19
-< 	install -d $(datadir)/bibus
-< 	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
----
-> 	install -d $(PKGDIR)/$(datadir)/bibus
-> 	install -m644 *.py MySQL_Bibus.ini $(PKGDIR)/$(datadir)/bibus/
-21c22
-< 		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
----
-> 		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(PKGDIR)/$(datadir)/bibus/'{}' ';' ; \
-23c24
-< 	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
----
-> 	install -m644 Setup/UnoConnectionListener.odg -D $(PKGDIR)/$(datadir)/bibus/Setup/UnoConnectionListener.odg
-27c28
-< 			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
----
-> 			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(PKGDIR)/$(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
-31c32
-< 	install -m644 bibus.config -D $(sysconfdir)/bibus.config
----
-> 	install -m644 bibus.config -D $(PKGDIR)/$(sysconfdir)/bibus.config
-33c34
-< 	install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1
----
-> 	install -m644 Setup/bibus.1 -D $(PKGDIR)/$(man1dir)/bibus.1
-36,37c37,38
-< 	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
-< 	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
----
-> 	install -m644 Pixmaps/bibus.png -D $(PKGDIR)/$(datadir)/icons/hicolor/48x48/apps/bibus.png
-> 	install -m644 Setup/bibus.desktop -D $(PKGDIR)/$(datadir)/applications/bibus.desktop
-43,45c44,46
-< 	install -d $(bindir)
-< 	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
-< 	chmod 755 $(datadir)/bibus/bibusStart.py
----
-> 	install -d $(PKGDIR)/$(bindir)
-> 	ln -sf $(datadir)/bibus/bibusStart.py $(PKGDIR)/$(bindir)/bibus
-> 	chmod 755 $(PKGDIR)/$(datadir)/bibus/bibusStart.py
-48,49c49,50
-< 	install -m755 -d $(datadir)/doc/bibus
-< 	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
----
-> 	install -m755 -d $(PKGDIR)/$(docdir)
-> 	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(PKGDIR)/$(docdir)
-52,60c53,61
-< 	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
-< 	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
-< 	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
-< 	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
-< 	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
-< 	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
-< 	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
-< 	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
-< 	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
----
-> 	echo '[PATH]' > $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'python = $(python)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'oopath = $(oopath)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'ooure = $(ooure)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'oobasis = $(oobasis)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'docdir = $(docdir)/html' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'licence = $(docdir)/copying' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'localedir = $(datadir)/locale' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-> 	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
-66c67
-< 	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
----
-> 	find html/en/* -type f -exec install -m644 '{}' -D $(PKGDIR)/$(docdir)/'{}' ';'
-71,72c72,73
-< 	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
-< 	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
----
-> 	$(python) -c "import compileall ; compileall.compile_dir('$(PKGDIR)/$(datadir)/bibus')"
-> 	$(python) -O -c "import compileall ; compileall.compile_dir('$(PKGDIR)/$(datadir)/bibus')"
-86,97c87,98
-< 	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
-< 		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
-< 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
-< 	# end uninstaller
----
-> #	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
-> #		echo "#!/bin/sh" > $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #		echo "rm -rf $(datadir)/bibus" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #		echo "rm $(bindir)/bibus" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
-> #		echo "rm $(man1dir)/bibus.1" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #		echo "rm -rf $(docdir)" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #		echo "rm $(datadir)/applications/bibus.desktop" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
-> #	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
-> #	# end uninstaller
+diff -Nur bibus-1.5.1.orig/Makefile bibus-1.5.1/Makefile
+--- bibus-1.5.1.orig/Makefile	2009-11-22 09:18:33.000000000 -0600
++++ bibus-1.5.1/Makefile	2010-01-01 01:25:31.731964448 -0600
+@@ -12,64 +12,65 @@
+ sysconfdir = /etc
+ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
++docdir = $(prefix)/$(docdir)
+ 
+ define install-files
+-	install -d $(datadir)/bibus
+-	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
++	install -d $(PKGDIR)/$(datadir)/bibus
++	install -m644 *.py MySQL_Bibus.ini $(PKGDIR)/$(datadir)/bibus/
+ 	#
+ 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \
+-		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
++		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(PKGDIR)/$(datadir)/bibus/'{}' ';' ; \
+ 	done
+-	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
++	install -m644 Setup/UnoConnectionListener.odg -D $(PKGDIR)/$(datadir)/bibus/Setup/UnoConnectionListener.odg
+ 	# locale files. We look for all the directory in locale/
+ 	for dir in $(wildcard locale/*); do \
+ 		if [ -d $$dir ] && [ $$dir != "locale/CVS" ]; then \
+-			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
++			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(PKGDIR)/$(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
+ 		fi; \
+ 	done
+ 	# bibus.config in /etc
+-	install -m644 bibus.config -D $(sysconfdir)/bibus.config
++	install -m644 bibus.config -D $(PKGDIR)/$(sysconfdir)/bibus.config
+ 	# man page
+-	install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1
++	install -m644 Setup/bibus.1 -D $(PKGDIR)/$(man1dir)/bibus.1
+ 
+ 	# freedesktop icon and shortcut
+-	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
+-	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
++	install -m644 Pixmaps/bibus.png -D $(PKGDIR)/$(datadir)/icons/hicolor/48x48/apps/bibus.png
++	install -m644 Setup/bibus.desktop -D $(PKGDIR)/$(datadir)/applications/bibus.desktop
+ 	# The following lines are presumably not needed since icons/desktop are in standard locations
+ 	#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
+ 	#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
+ 
+ 	# bibus command
+-	install -d $(bindir)
+-	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
+-	chmod 755 $(datadir)/bibus/bibusStart.py
++	install -d $(PKGDIR)/$(bindir)
++	ln -sf $(datadir)/bibus/bibusStart.py $(PKGDIR)/$(bindir)/bibus
++	chmod 755 $(PKGDIR)/$(datadir)/bibus/bibusStart.py
+ 
+ 	# basic doc files
+-	install -m755 -d $(datadir)/doc/bibus
+-	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
++	install -m755 -d $(PKGDIR)/$(docdir)
++	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(PKGDIR)/$(docdir)
+ 
+ 	# generating bibus.cfg file
+-	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
+-	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
+-	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
+-	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
+-	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
++	echo '[PATH]' > $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'python = $(python)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'oopath = $(oopath)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'ooure = $(ooure)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'oobasis = $(oobasis)' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'docdir = $(docdir)/html' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'licence = $(docdir)/copying' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'localedir = $(datadir)/locale' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
++	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(PKGDIR)/$(datadir)/bibus/bibus.cfg
+ endef
+ 
+ define install-doc-en
+ 	# copying docs in from Docs/html/en/ for bibus-doc-en
+ 	cd Docs;\
+-	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
++	find html/en/* -type f -exec install -m644 '{}' -D $(PKGDIR)/$(docdir)/'{}' ';'
+ endef
+ 
+ define compile
+ 	# compile recursively all the python files located in $(datadir)/bibus
+-	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
+-	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
++	$(python) -c "import compileall ; compileall.compile_dir('$(PKGDIR)/$(datadir)/bibus')"
++	$(python) -O -c "import compileall ; compileall.compile_dir('$(PKGDIR)/$(datadir)/bibus')"
+ endef
+ 
+ install-files:
+@@ -83,15 +84,15 @@
+ 	$(install-doc-en)
+ 	$(compile)
+ 
+-	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
+-		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
+-	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
+-	# end uninstaller
++#	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
++#		echo "#!/bin/sh" > $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#		echo "rm -rf $(datadir)/bibus" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#		echo "rm $(bindir)/bibus" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
++#		echo "rm $(man1dir)/bibus.1" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#		echo "rm -rf $(docdir)" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#		echo "rm $(datadir)/applications/bibus.desktop" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(PKGDIR)/$(datadir)/bibus/Setup/uninstall.sh
++#	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
++#	# end uninstaller
diff --git a/academic/bibus/README b/academic/bibus/README
index 64d184a39d0e..9afec2e1654c 100644
--- a/academic/bibus/README
+++ b/academic/bibus/README
@@ -1,9 +1,8 @@
-bibus (bibliographic database)
+Bibus is a bibliographic and reference management software.  As with other 
+such tools, Bibus allows one to search, edit, and sort bibliographic records.
+In addition, Bibus contains features that makes it unique among open source 
+and even commercial bibliographic databases.
 
-Bibus is a bibliographic and reference management software. As
-with other such tools, Bibus allows one to search, edit, and sort
-bibliographic records. In addition, Bibus contains features that
-makes it unique among open source and even commercial bibliographic
-databases.
+This is built to work with the openoffice.org package on SlackBuilds.org.
 
-bibus requires wxPython, also available on slackbuilds.org
+This requires wxPython.
diff --git a/academic/bibus/bibus.SlackBuild b/academic/bibus/bibus.SlackBuild
index 82f18651172f..35f9bff78549 100644
--- a/academic/bibus/bibus.SlackBuild
+++ b/academic/bibus/bibus.SlackBuild
@@ -8,7 +8,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=bibus
-VERSION=${VERSION:-1.4.3.2}
+VERSION=${VERSION:-1.5.1}
 ARCH=${ARCH:-noarch}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,8 +18,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRC_VERSION=${SRC_VERSION:-1.4.3}
-
 set -e 
 
 rm -rf $PKG
@@ -27,7 +25,6 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM-$SRC_VERSION $PRGNAM-$VERSION 
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -36,18 +33,21 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-#patch the makefile to install to PKGDIR
-patch Makefile < $CWD/Makefile.patch
+# Patch the Makefile to install to PKGDIR
+patch -p1 < $CWD/Makefile.patch
+
+make \
+  PKGDIR=$PKG \
+  DESTDIR=/usr \
+  mandir=/usr/man \
+  sysconfdir=/etc \
+  docdir=/usr/doc/$PRGNAM-$VERSION \
+  oopath=/opt/openoffice.org3/program \
+  ooure=/opt/openoffice.org3/basis-link/ure-link/lib \
+  oobasis=/opt/openoffice.org3/basis-link/program
 
-# Compile the application and install it into the $PKG directory
-make PKGDIR=$PKG \
-DESTDIR=/usr \
-mandir=/usr/man \
-sysconfdir=/etc \
-docdir=/usr/doc/$PRGNAM-$VERSION \
-oopath=/opt/openoffice.org3/program \
-ooure=/opt/openoffice.org3/basis-link/ure-link/lib \
-oobasis=/opt/openoffice.org3/basis-link/program
+# Don't clobber the config file
+mv $PKG/etc/bibus.config $PKG/etc/bibus.config.new
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -63,4 +63,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/bibus/bibus.info b/academic/bibus/bibus.info
index 959ba5df557a..195102a5e939 100644
--- a/academic/bibus/bibus.info
+++ b/academic/bibus/bibus.info
@@ -1,8 +1,10 @@
 PRGNAM="bibus"
-VERSION="1.4.3.2"
+VERSION="1.5.1"
 HOMEPAGE="http://bibus-biblio.sourceforge.net/"
-DOWNLOAD="http://softlayer.dl.sourceforge.net/sourceforge/bibus-biblio/bibus-1.4.3.2.tar.gz"
-MD5SUM="f762149c98a83d4b05d08e8cf92ef851"
+DOWNLOAD="http://softlayer.dl.sourceforge.net/project/bibus-biblio/bibus-biblio/bibus-1.5.1/bibus-1.5.1.tar.gz"
+MD5SUM="20c24f083deb3aabf426581dd4ec278f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="David Miller"
 EMAIL="dave@frop.net"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/academic/bibus/doinst.sh b/academic/bibus/doinst.sh
index 1f8ff67dedb2..288875df8ecd 100644
--- a/academic/bibus/doinst.sh
+++ b/academic/bibus/doinst.sh
@@ -1,3 +1,18 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/bibus.config.new
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi