fixed it

3 files changed, 35 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d0b14134e02..78406feab9aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = brother-dcp-9022cdw
 	pkgdesc = LPR and CUPS driver for the Brother DCP-9022CDW
 	pkgver = 1.1.3
-	pkgrel = 3
+	pkgrel = 4
 	url = http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/index.html
 	install = brother-dcp-9022cdw.install
 	arch = i686
 	arch = x86_64
 	license = unknown
 	depends = tcsh
-	depends = deb2targz
 	depends = perl
 	depends = a2ps
 	depends = lib32-glibc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..7f97a6eff873
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+
+# Created by https://www.gitignore.io/api/archlinuxpackages
+
+### ArchLinuxPackages ###
+*.tar
+*.tar.*
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+pkg/
+src/
+
+
+# End of https://www.gitignore.io/api/archlinuxpackages
diff --git a/PKGBUILD b/PKGBUILD
index 0f9646b07cea..629c4c73dc4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _model="9022cdw"
 pkgname="brother-dcp-$_model"
 pkgver="1.1.3"
-pkgrel=3
+pkgrel=4
 _lprver="1.1.3-0"
 _wrpver="1.1.4-0"
 pkgdesc="LPR and CUPS driver for the Brother DCP-9022CDW"
@@ -12,25 +12,26 @@ arch=('i686' 'x86_64')
 license=('unknown')
 install="brother-dcp-${_model}.install"
 if [[ "$CARCH" == "x86_64" ]] ; then
-    depends=('tcsh' 'deb2targz' 'perl' 'a2ps' 'lib32-glibc')
+    depends=('tcsh' 'perl' 'a2ps' 'lib32-glibc')
 elif [[ "$CARCH" == "i686" ]] ; then
-    depends=('tcsh' 'deb2targz' 'perl' 'a2ps')
+    depends=('tcsh' 'perl' 'a2ps')
 fi
 source=("http://download.brother.com/welcome/dlf101612/dcp${_model}lpr-${_lprver}.i386.deb"
         "http://download.brother.com/welcome/dlf101613/dcp${_model}cupswrapper-${_wrpver}.i386.deb")
 sha256sums=('8db48cda7e8f38f6a9fe0279f67e6d286a300f41e7982d1be275113542ec5027'
             '5b44c91152236079ebfd15f5b0e1e8f515d114a395cf77459387ba9358c8a7fa')
 package() {
-    deb2targz *.deb >/dev/null
-    rm -f *.deb
     cd $srcdir
-    mkdir dcp${_model}
-    for i in *.tar.gz ; do
-        tar xfz $i -C dcp${_model}
-    done
-    cd dcp${_model}/opt/brother/Printers/dcp${_model}
+    # extract both packages
+    ar x dcp${_model}lpr-${_lprver}.i386.deb
+    tar xf data.tar.gz
+    ar x dcp${_model}cupswrapper-${_wrpver}.i386.deb
+    tar xf data.tar.gz
+
+    # do some packing
+    cd opt/brother/Printers/dcp${_model}
     perl -i -pe 's#/etc/init.d#/etc/rc.d#g' ./cupswrapper/cupswrapperdcp${_model}
-    perl -i -pe 's#printcap\.local#printcap#g' $srcdir/dcp${_model}/opt/brother/Printers/dcp${_model}/inf/setupPrintcapij
-    cp -rf $srcdir/dcp${_model}/usr/ $pkgdir/
-    cp -rf $srcdir/dcp${_model}/opt/ $pkgdir/
+    perl -i -pe 's#printcap\.local#printcap#g' $srcdir/opt/brother/Printers/dcp${_model}/inf/setupPrintcapij
+    cp -rf $srcdir/usr/ $pkgdir/
+    cp -rf $srcdir/opt/ $pkgdir/
 }