update to 3.1.0-1

3 files changed, 29 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cdc192c0504b..8383fc708220 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,23 @@
 pkgbase = brother-dcp7065dn
 	pkgdesc = LPR and CUPS driver for the Brother DCP7065DN
-	pkgver = 2.0.4
-	pkgrel = 2
+	pkgver = 3.1.0
+	pkgrel = 1
 	url = http://solutions.brother.com/linux/en_us/
 	install = brother-dcp7065dn.install
 	arch = i686
 	arch = x86_64
 	license = custom:brother commercial license
 	depends = cups
-	backup = usr/share/brother/Printer/DCP7065DN/inf/brDCP7065DNfunc
-	backup = usr/share/brother/Printer/DCP7065DN/inf/brDCP7065DNrc
-	source = http://www.brother.com/pub/bsc/linux/dlf/dcp7065dnlpr-2.1.0-1.i386.deb
-	source = http://www.brother.com/pub/bsc/linux/dlf/cupswrapperDCP7065DN-2.0.4-2.i386.deb
+	source = http://download.brother.com/welcome/dlf101125/brgenml1cupswrapper-3.1.0-1.i386.deb
+	source = http://download.brother.com/welcome/dlf101123/brgenml1lpr-3.1.0-1.i386.deb
 	source = cupswrapper-license.txt
 	source = lpr-license.txt
-	md5sums = 505edb3ad16df7b00513a6a66ed4b320
-	md5sums = e136add1e00e990796f2b954406da9f7
+	md5sums = 9d31b628b552959419f2f6c05e16b84a
+	md5sums = dea333f953fcce13c1239bf991524885
 	md5sums = 97ad0cffd216059e9d1d3121899d8646
 	md5sums = 5e87a3dc0f3e3438c088eda0f3565f0d
-	sha256sums = aeb6b0243b1be22aba99e162eea8abed63b146b8fd55c0dd63c6eada0c148834
-	sha256sums = b7c703cbc7829b850e5a90b30d78e52dfca8bf5b08aa00b280b67f7e07ccb759
+	sha256sums = d9e8a164b36bd1bc74cb7a90111ae1f0d2569a1d3a221db69b2064acb850a24d
+	sha256sums = 2e01bfadc82b0416f05c18ba1d3d23999672bb8db48832815a3afd2cb395bb7d
 	sha256sums = 2c6aa6a641332e5c87e971ac2a8beae13b059747bdba331bbd515914770d72d9
 	sha256sums = 9d85a8aafdaac8fac80e04234ad2acf5642bbf0b91ee582d2a89519a55f6dd67
 
diff --git a/PKGBUILD b/PKGBUILD
index 94fb8de21c31..d03063fa9acd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,30 @@
 # Maintainer: Ingo Sieverdingbeck <aur@sieverdingbeck.com>
 pkgname="brother-dcp7065dn"
-pkgver="2.0.4"
-pkgrel=2
+pkgver="3.1.0"
+pkgrel=1
 pkgdesc="LPR and CUPS driver for the Brother DCP7065DN"
 arch=('i686' 'x86_64')
 url="http://solutions.brother.com/linux/en_us/"
 license=('custom:brother commercial license')
-backup=(
-	'usr/share/brother/Printer/DCP7065DN/inf/brDCP7065DNfunc'
-	'usr/share/brother/Printer/DCP7065DN/inf/brDCP7065DNrc'
-)
 
 depends=('cups')
 install="$pkgname.install"
 source=(
-	"http://www.brother.com/pub/bsc/linux/dlf/dcp7065dnlpr-2.1.0-1.i386.deb"
-	"http://www.brother.com/pub/bsc/linux/dlf/cupswrapperDCP7065DN-$pkgver-$pkgrel.i386.deb"
+	"http://download.brother.com/welcome/dlf101125/brgenml1cupswrapper-$pkgver-$pkgrel.i386.deb"
+	"http://download.brother.com/welcome/dlf101123/brgenml1lpr-$pkgver-$pkgrel.i386.deb"
 	'cupswrapper-license.txt'
 	'lpr-license.txt'
 )
 md5sums=(
-	'505edb3ad16df7b00513a6a66ed4b320'
-	'e136add1e00e990796f2b954406da9f7'
+	'9d31b628b552959419f2f6c05e16b84a'
+	'dea333f953fcce13c1239bf991524885'
 	'97ad0cffd216059e9d1d3121899d8646'
 	'5e87a3dc0f3e3438c088eda0f3565f0d'
 )
 
 sha256sums=(
-	'aeb6b0243b1be22aba99e162eea8abed63b146b8fd55c0dd63c6eada0c148834'
-	'b7c703cbc7829b850e5a90b30d78e52dfca8bf5b08aa00b280b67f7e07ccb759'
+	'd9e8a164b36bd1bc74cb7a90111ae1f0d2569a1d3a221db69b2064acb850a24d'
+	'2e01bfadc82b0416f05c18ba1d3d23999672bb8db48832815a3afd2cb395bb7d'
 	'2c6aa6a641332e5c87e971ac2a8beae13b059747bdba331bbd515914770d72d9'
 	'9d85a8aafdaac8fac80e04234ad2acf5642bbf0b91ee582d2a89519a55f6dd67'
 )
@@ -55,29 +51,14 @@ prepare() {
 # setup cups-directories
 	install -d $srcdir/usr/share/cups/model
 	install -d $srcdir/usr/lib/cups/filter
-#  go to the cupswrapper directory and find the source file from wich to generate a ppd- and wrapper-file
-	cd `find . -type d -name 'cupswrapper'`
-	if [ -f cupswrapper* ]; then
-		_wrapper_source=`ls cupswrapper*`
-		sed -i '/^\/etc\/init.d\/cups/d' $_wrapper_source
-		sed -i '/^sleep/d' $_wrapper_source
-		sed -i '/^lpadmin/d' $_wrapper_source
-		sed -i 's|/usr|$srcdir/usr|g' $_wrapper_source
-		sed -i 's|/opt|$srcdir/opt|g' $_wrapper_source
-		sed -i 's|/model/Brother|/model|g' $_wrapper_source
-		sed -i 's|lpinfo|echo|g' $_wrapper_source
-		export srcdir=$srcdir
-		./$_wrapper_source
-		sed -i 's|$srcdir||' $srcdir/usr/lib/cups/filter/*lpdwrapper*
-		sed -i "s|$srcdir||" $srcdir/usr/lib/cups/filter/*lpdwrapper*
-		rm $_wrapper_source
-	fi
-#  /etc/printcap is managed by cups
-	rm `find $srcdir -type f -name 'setupPrintcap*'`
+        #link LPD wrapper to cups/filter
+        ln -s /opt/brother/Printers/BrGenML1/cupswrapper/brother_lpdwrapper_BrGenML1 $srcdir/usr/lib/cups/filter
+        #link PPD file to cups/model
+        ln -s /opt/brother/Printers/BrGenML1/cupswrapper/brother-BrGenML1-cups-en.ppd $srcdir/usr/share/cups/model
 }
 package() {
 	cp -R $srcdir/usr $pkgdir
-	if [ -d $srcdir/opt ]; then cp -R $srcdir/opt $pkgdir; fi
+	cp -R $srcdir/opt $pkgdir
 	install -m 644 -D cupswrapper-license.txt $pkgdir/usr/share/licenses/${pkgname}/cupswrapper-licence.txt
 	install -m 644 -D lpr-license.txt $pkgdir/usr/share/licenses/${pkgname}/lpr-licence.txt
 }
diff --git a/brother-dcp7065dn.install b/brother-dcp7065dn.install
index 3ddb04120f84..20b1db9b886c 100644
--- a/brother-dcp7065dn.install
+++ b/brother-dcp7065dn.install
@@ -1,9 +1,13 @@
 post_install() {
-	post_upgrade;
+  echo "Maybe you have to restart CUPS to use the added driver"
 }
 
 post_upgrade() {
-echo "Restart CUPS to load the new files"
-echo "You can now register your new printer using the web interface at:"
-echo "  http://localhost:631/"
+  echo "Maybe you have to restart CUPS to use the changed driver"
+  echo ""
+  echo "When upgrading from 2.0.4 to 3.1.0 the driver name changes from"
+  echo "'Brother DCP7065DN for CUPS' to 'Brother BrGenML1 for CUPS'"
+  echo ""
+  echo "To make use of the updated driver, edit your printer in the CUPS"
+  echo "webinterface and select the new driver"
 }