diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-14 10:56:20 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-14 10:56:20 -0300 |
| commit | d5be0922f99093b4659507a4c17c664ac5c2f577 (patch) | |
| tree | 03704fe8477fe4f6e3f2f15f0bd848b5e4b702e9 /extra/cups | |
| parent | c6d876200ad3def9a1e9725b3daf29e01ae8e3c5 (diff) | |
| parent | a36c4a33891932acf2ac1cdebbb9caed01d7df6f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/pdf2djvu/PKGBUILD
core/systemd/PKGBUILD
extra/audacious/PKGBUILD
extra/cups/PKGBUILD
multilib-testing/lib32-libdrm/PKGBUILD
staging/inkscape/PKGBUILD
staging/poppler/PKGBUILD
testing/ethtool/PKGBUILD
testing/libdrm/PKGBUILD
testing/openconnect/PKGBUILD
Diffstat (limited to 'extra/cups')
| -rw-r--r-- | extra/cups/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/cups/cups-systemd-socket.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 877673b1b..4f4580f7b 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165095 2012-08-10 13:32:19Z andyrtr $ +# $Id: PKGBUILD 165181 2012-08-12 16:18:01Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -25,7 +25,7 @@ md5sums=('87ade07e3d1efd03c9c3add949cf9c00' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' '90c30380d4c8cd48a908cfdadae1ea24' - 'a81573a429b98e16670d7fea47e528c4' + '7d2347b6d444e223f6b7dc6e706b9ffe' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index f699b9eda..0eb5f4af1 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -103,7 +103,7 @@ diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.i diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in --- cups-1.5.0/data/cups.service.in.systemd-socket 2011-10-18 15:32:40.846670473 +0100 +++ cups-1.5.0/data/cups.service.in 2011-10-18 15:32:40.846670473 +0100 -@@ -0,0 +1,9 @@ +@@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service + @@ -117,7 +117,7 @@ diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.ser diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in --- cups-1.5.0/data/cups.socket.in.systemd-socket 2011-10-18 15:32:40.847670454 +0100 +++ cups-1.5.0/data/cups.socket.in 2011-10-18 15:32:40.847670454 +0100 -@@ -0,0 +1,10 @@ +@@ -0,0 +1,11 @@ +[Unit] +Description=CUPS Printing Service Sockets + |