diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 20:33:33 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 20:33:33 -0300 |
commit | 1125e0af211fdad4bf992229317014d5cc5aa030 (patch) | |
tree | 68ce9e268461e5106810f35145c7700be6a8ed44 /~mtjm | |
parent | b4903e03dc897db3b525a3dd85b96be8cc30bf01 (diff) | |
parent | 03b51852bcdd2ab24f5761a903bbebbac5028c40 (diff) |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to '~mtjm')
29 files changed, 9 insertions, 8 deletions
diff --git a/~mtjm/cups-usblp/PKGBUILD b/~mtjm/cups-usblp/PKGBUILD index 62b12072a..62b12072a 100644..100755 --- a/~mtjm/cups-usblp/PKGBUILD +++ b/~mtjm/cups-usblp/PKGBUILD diff --git a/~mtjm/cups-usblp/cups b/~mtjm/cups-usblp/cups index 744c8e663..744c8e663 100644..100755 --- a/~mtjm/cups-usblp/cups +++ b/~mtjm/cups-usblp/cups diff --git a/~mtjm/cups-usblp/cups-avahi-1-config.patch b/~mtjm/cups-usblp/cups-avahi-1-config.patch index 304cd2607..304cd2607 100644..100755 --- a/~mtjm/cups-usblp/cups-avahi-1-config.patch +++ b/~mtjm/cups-usblp/cups-avahi-1-config.patch diff --git a/~mtjm/cups-usblp/cups-avahi-2-backend.patch b/~mtjm/cups-usblp/cups-avahi-2-backend.patch index 00e12a0a3..00e12a0a3 100644..100755 --- a/~mtjm/cups-usblp/cups-avahi-2-backend.patch +++ b/~mtjm/cups-usblp/cups-avahi-2-backend.patch diff --git a/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch b/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch index daf852a0f..daf852a0f 100644..100755 --- a/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch +++ b/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch diff --git a/~mtjm/cups-usblp/cups-avahi-4-poll.patch b/~mtjm/cups-usblp/cups-avahi-4-poll.patch index d7fa5fd56..d7fa5fd56 100644..100755 --- a/~mtjm/cups-usblp/cups-avahi-4-poll.patch +++ b/~mtjm/cups-usblp/cups-avahi-4-poll.patch diff --git a/~mtjm/cups-usblp/cups-avahi-5-services.patch b/~mtjm/cups-usblp/cups-avahi-5-services.patch index 820b3c32b..820b3c32b 100644..100755 --- a/~mtjm/cups-usblp/cups-avahi-5-services.patch +++ b/~mtjm/cups-usblp/cups-avahi-5-services.patch diff --git a/~mtjm/cups-usblp/cups-no-export-ssllibs.patch b/~mtjm/cups-usblp/cups-no-export-ssllibs.patch index 9be3c819b..9be3c819b 100644..100755 --- a/~mtjm/cups-usblp/cups-no-export-ssllibs.patch +++ b/~mtjm/cups-usblp/cups-no-export-ssllibs.patch diff --git a/~mtjm/cups-usblp/cups-no-gcrypt.patch b/~mtjm/cups-usblp/cups-no-gcrypt.patch index 42f71d0d4..42f71d0d4 100644..100755 --- a/~mtjm/cups-usblp/cups-no-gcrypt.patch +++ b/~mtjm/cups-usblp/cups-no-gcrypt.patch diff --git a/~mtjm/cups-usblp/cups-no-gzip-man.patch b/~mtjm/cups-usblp/cups-no-gzip-man.patch index 6786c4430..6786c4430 100644..100755 --- a/~mtjm/cups-usblp/cups-no-gzip-man.patch +++ b/~mtjm/cups-usblp/cups-no-gzip-man.patch diff --git a/~mtjm/cups-usblp/cups-systemd-socket.patch b/~mtjm/cups-usblp/cups-systemd-socket.patch index 09d17d415..09d17d415 100644..100755 --- a/~mtjm/cups-usblp/cups-systemd-socket.patch +++ b/~mtjm/cups-usblp/cups-systemd-socket.patch diff --git a/~mtjm/cups-usblp/cups.install b/~mtjm/cups-usblp/cups.install index 47c3d9b82..47c3d9b82 100644..100755 --- a/~mtjm/cups-usblp/cups.install +++ b/~mtjm/cups-usblp/cups.install diff --git a/~mtjm/cups-usblp/cups.logrotate b/~mtjm/cups-usblp/cups.logrotate index 9c49bbdaf..9c49bbdaf 100644..100755 --- a/~mtjm/cups-usblp/cups.logrotate +++ b/~mtjm/cups-usblp/cups.logrotate diff --git a/~mtjm/cups-usblp/cups.pam b/~mtjm/cups-usblp/cups.pam index 53724d1f8..53724d1f8 100644..100755 --- a/~mtjm/cups-usblp/cups.pam +++ b/~mtjm/cups-usblp/cups.pam diff --git a/~mtjm/debootstrap/PKGBUILD b/~mtjm/debootstrap/PKGBUILD index 8da48c3a0..20ff27fcb 100644..100755 --- a/~mtjm/debootstrap/PKGBUILD +++ b/~mtjm/debootstrap/PKGBUILD @@ -1,25 +1,26 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=debootstrap -_version=1.0.29 -_ubuntu=1 -_trisquel=5.0 -_trisquelrev=2 +_version=1.0.37 +_ubuntu=0 +_trisquel=5.5 +_trisquelrev=1 pkgver=$_version.$_ubuntu.$_trisquel.$_trisquelrev pkgrel=1 pkgdesc="Bootstrap a basic Trisquel system" arch=('any') -url="http://packages.trisquel.info/source/dagda/debootstrap" +url="http://packages.trisquel.info/source/brigantia/debootstrap" license=('custom') depends=('sh') makedepends=('makedev') backup=() -source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}ubuntu${_ubuntu}+${_trisquel}trisquel${_trisquelrev}.tar.gz") -md5sums=('22f8ddf5e11153c6fae8309a579e3376') +#source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}ubuntu${_ubuntu}+${_trisquel}trisquel${_trisquelrev}.tar.gz") +source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}+${_trisquel}trisquel${_trisquelrev}.tar.gz") +sha256sums=('13ce77c840dc83ce84b52e850275b5ef6371bb72d068663933a2e1eefbd13e1e') package() { cd "$srcdir/source" - sed -i 's;MAKEDEV := /sbin/MAKEDEV;MAKEDEV := /usr/sbin/MAKEDEV;' Makefile # fix Arch compatibility + sed -i 's;MAKEDEV := /sbin/MAKEDEV;MAKEDEV := /usr/sbin/MAKEDEV -d .;' Makefile # fix Arch compatibility sed -i 's; consoleonly;;' Makefile # doesn't work, not sure why make all # not in build, since it needs root priviledges make DESTDIR="$pkgdir/" install diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE index 304031cb6..304031cb6 100644..100755 --- a/~mtjm/python-coverage/LICENSE +++ b/~mtjm/python-coverage/LICENSE diff --git a/~mtjm/python-coverage/PKGBUILD b/~mtjm/python-coverage/PKGBUILD index f9acc0d94..f9acc0d94 100644..100755 --- a/~mtjm/python-coverage/PKGBUILD +++ b/~mtjm/python-coverage/PKGBUILD diff --git a/~mtjm/python-getmediumurl/PKGBUILD b/~mtjm/python-getmediumurl/PKGBUILD index 172f6dcd9..172f6dcd9 100644..100755 --- a/~mtjm/python-getmediumurl/PKGBUILD +++ b/~mtjm/python-getmediumurl/PKGBUILD diff --git a/~mtjm/python-urlreader/PKGBUILD b/~mtjm/python-urlreader/PKGBUILD index 4ffe93c6f..4ffe93c6f 100644..100755 --- a/~mtjm/python-urlreader/PKGBUILD +++ b/~mtjm/python-urlreader/PKGBUILD diff --git a/~mtjm/python2-openid/PKGBUILD b/~mtjm/python2-openid/PKGBUILD index 31cdf3290..31cdf3290 100644..100755 --- a/~mtjm/python2-openid/PKGBUILD +++ b/~mtjm/python2-openid/PKGBUILD diff --git a/~mtjm/python2-postfix-policyd-spf/PKGBUILD b/~mtjm/python2-postfix-policyd-spf/PKGBUILD index 237b6c9bd..237b6c9bd 100644..100755 --- a/~mtjm/python2-postfix-policyd-spf/PKGBUILD +++ b/~mtjm/python2-postfix-policyd-spf/PKGBUILD diff --git a/~mtjm/python2-pydns/PKGBUILD b/~mtjm/python2-pydns/PKGBUILD index cf5f4b388..cf5f4b388 100644..100755 --- a/~mtjm/python2-pydns/PKGBUILD +++ b/~mtjm/python2-pydns/PKGBUILD diff --git a/~mtjm/python2-pyflakes/PKGBUILD b/~mtjm/python2-pyflakes/PKGBUILD index 397c487b7..397c487b7 100644..100755 --- a/~mtjm/python2-pyflakes/PKGBUILD +++ b/~mtjm/python2-pyflakes/PKGBUILD diff --git a/~mtjm/python2-pyspf/PKGBUILD b/~mtjm/python2-pyspf/PKGBUILD index abb3bfa5f..abb3bfa5f 100644..100755 --- a/~mtjm/python2-pyspf/PKGBUILD +++ b/~mtjm/python2-pyspf/PKGBUILD diff --git a/~mtjm/thinkfan/PKGBUILD b/~mtjm/thinkfan/PKGBUILD index 9bb9a4793..9bb9a4793 100644..100755 --- a/~mtjm/thinkfan/PKGBUILD +++ b/~mtjm/thinkfan/PKGBUILD diff --git a/~mtjm/thinkfan/thinkfan b/~mtjm/thinkfan/thinkfan index d37c81424..d37c81424 100644..100755 --- a/~mtjm/thinkfan/thinkfan +++ b/~mtjm/thinkfan/thinkfan diff --git a/~mtjm/ttf-beteckna/PKGBUILD b/~mtjm/ttf-beteckna/PKGBUILD index ff338e0d4..ff338e0d4 100644..100755 --- a/~mtjm/ttf-beteckna/PKGBUILD +++ b/~mtjm/ttf-beteckna/PKGBUILD diff --git a/~mtjm/ttf-beteckna/ttf.install b/~mtjm/ttf-beteckna/ttf.install index 33b7d6549..33b7d6549 100644..100755 --- a/~mtjm/ttf-beteckna/ttf.install +++ b/~mtjm/ttf-beteckna/ttf.install diff --git a/~mtjm/zbar/PKGBUILD b/~mtjm/zbar/PKGBUILD index 64b47b5dc..64b47b5dc 100644..100755 --- a/~mtjm/zbar/PKGBUILD +++ b/~mtjm/zbar/PKGBUILD |