diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2015-09-12 13:18:19 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2015-09-12 13:18:19 +0200 |
| commit | ab37dca55f2cccf10bcf43475dbd3e7d34358e74 (patch) | |
| tree | 3a7a92ae215cced6554fc3c37e81ef59abb0489c /cups | |
| parent | c4d6b9758e95dfed4d244e1e5a4fa8da1b41bdf4 (diff) | |
| parent | 1309ccd6a30f67fbbd75096d38c0ed8e05f5f360 (diff) | |
| download | opt-ab37dca55f2cccf10bcf43475dbd3e7d34358e74.tar.gz opt-ab37dca55f2cccf10bcf43475dbd3e7d34358e74.tar.xz | |
Merge branch '3.1' into 3.2
Diffstat (limited to 'cups')
| -rw-r--r-- | cups/.footprint | 2 | ||||
| -rw-r--r-- | cups/.md5sum | 2 | ||||
| -rw-r--r-- | cups/Pkgfile | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cups/.footprint b/cups/.footprint index cef6c84fd..5bdd15f92 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -1,11 +1,13 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/lp etc/cups/ -rw-r----- root/lp etc/cups/cups-files.conf +-rw-r----- root/lp etc/cups/cups-files.conf.default -rw-r----- root/lp etc/cups/cupsd.conf -rw-r----- root/lp etc/cups/cupsd.conf.default drwxr-xr-x root/lp etc/cups/interfaces/ drwxr-xr-x root/lp etc/cups/ppd/ -rw-r----- root/lp etc/cups/snmp.conf +-rw-r----- root/lp etc/cups/snmp.conf.default drwx------ root/lp etc/cups/ssl/ drwxr-xr-x root/root etc/modprobe.d/ -rw-r--r-- root/root etc/modprobe.d/cups.conf diff --git a/cups/.md5sum b/cups/.md5sum index 6d9a3ac14..7d7c2f8bd 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,2 +1,2 @@ a416044375fa7c0318fcfdc5ecb0028f cups -f5c847d9a4fac6c4c66fb0526a7afaae cups-2.0.4-source.tar.bz2 +c4e57a66298bfdba66bb3d5bedd317a4 cups-2.1.0-source.tar.bz2 diff --git a/cups/Pkgfile b/cups/Pkgfile index 63edfc645..d4bfcb871 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,7 +4,7 @@ # Depends on: acl libusb zlib name=cups -version=2.0.4 +version=2.1.0 release=1 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2 cups) |