summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2016-10-01 21:29:46 +0200
committerDaniel Peukert2016-10-01 21:29:46 +0200
commit8114cb2992e73a03204271ead86b646d4f3113e1 (patch)
tree42026cad2458e445cc6266778419518858490987
parent294d07247ce9a0aaae875a2f7d8ea6f8991f1cd2 (diff)
downloadaur-8114cb2992e73a03204271ead86b646d4f3113e1.tar.gz
Fixed the branch and updated the PKGBUILD
-rw-r--r--.SRCINFO9
-rw-r--r--.editorconfig8
-rw-r--r--.gitignore14
-rw-r--r--PKGBUILD23
-rw-r--r--cloudprint-cups.install4
5 files changed, 40 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 173de3505138..8163f4b1670f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Dec 7 20:38:14 UTC 2015
pkgbase = cloudprint-cups-git
pkgdesc = Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print.
- pkgver = 20140308.130.gbf67714
- pkgrel = 2
+ pkgver = 20160502.r15.gad53b23
+ pkgrel = 1
epoch = 1
url = https://github.com/simoncadman/CUPS-Cloud-Print
install = cloudprint-cups.install
@@ -11,6 +9,7 @@ pkgbase = cloudprint-cups-git
license = GPL3
makedepends = cups
makedepends = git
+ depends = python2
depends = python2-pycups
depends = python2-httplib2
depends = python2-six
@@ -19,7 +18,7 @@ pkgbase = cloudprint-cups-git
conflicts = cloudprint-cups
conflicts = cupscloudprint
options = !emptydirs
- source = cloudprint-cups-git::git://github.com/simoncadman/CUPS-Cloud-Print.git
+ source = cloudprint-cups-git::git://github.com/simoncadman/CUPS-Cloud-Print.git#branch=capabilities-fix
md5sums = SKIP
pkgname = cloudprint-cups-git
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..a467ee9a97a6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+tab_width = 4
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b669a9b7602c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# from https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index f6e058ee458e..409bef09f089 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,33 @@
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com> (original PKGBUILD by mortzu and zizzfizzix)
pkgname=cloudprint-cups-git
-pkgver=20140308.130.gbf67714
-pkgrel=2
+pkgver=20160502.r15.gad53b23
+pkgrel=1
epoch=1
pkgdesc='Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print.'
arch=('any')
url='https://github.com/simoncadman/CUPS-Cloud-Print'
license=('GPL3')
-depends=('python2-pycups' 'python2-httplib2' 'python2-six')
+depends=('python2' 'python2-pycups' 'python2-httplib2' 'python2-six')
makedepends=('cups' 'git')
provides=('cloudprint-cups' 'cupscloudprint')
conflicts=('cloudprint-cups' 'cupscloudprint')
options=(!emptydirs)
install=cloudprint-cups.install
-source=("${pkgname}::git://github.com/simoncadman/CUPS-Cloud-Print.git")
+source=("$pkgname::git://github.com/simoncadman/CUPS-Cloud-Print.git#branch=capabilities-fix")
md5sums=('SKIP')
pkgver() {
- cd ${srcdir}/${pkgname}
- git describe --always --tags | sed 's|-|.|g'
+ cd "$srcdir/$pkgname"
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd ${srcdir}/${pkgname}
- ./configure --prefix /usr
- make
+ cd "$srcdir/$pkgname"
+ ./configure --prefix /usr
+ make
}
package() {
- cd ${srcdir}/${pkgname}
- NOPERMS=1 make DESTDIR=${pkgdir} install
+ cd "$srcdir/$pkgname"
+ NOPERMS=1 make DESTDIR="$pkgdir" install
}
diff --git a/cloudprint-cups.install b/cloudprint-cups.install
index 8b754ae1c724..829862e78c1a 100644
--- a/cloudprint-cups.install
+++ b/cloudprint-cups.install
@@ -1,7 +1,7 @@
post_install() {
- echo 'Run "sudo /usr/share/cloudprint-cups/listcloudprinters.py" to set up.'
+ echo 'Run "sudo /usr/share/cloudprint-cups/setupcloudprint.py" to set up.'
}
post_upgrade() {
- /usr/share/cloudprint-cups/upgrade.py
+ /usr/share/cloudprint-cups/upgrade.py
}