diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
| commit | 908d987dd1dcd4899f8f7f0878514c22ca8048b7 (patch) | |
| tree | 29bf5986774207c3453044e1f370fb98d2431265 /libre/your-freedom | |
| parent | 308bfb446305a96dffce945b6c4fb82b10d1b91b (diff) | |
| parent | 8351d69e64a40d68fa32cfeea227b6fcf7afe974 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/your-freedom')
| -rw-r--r-- | libre/your-freedom/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/your-freedom/your-freedom.install | 14 |
2 files changed, 16 insertions, 18 deletions
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 8aad59fe4..6f2b209d5 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -2,7 +2,7 @@ pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 -pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free." +pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free." arch=('any') url="https://parabolagnulinux.org" license=('GPL3') @@ -10,18 +10,16 @@ groups=('base') install=${pkgname}.install source=(blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt) -build() { +package() { + conflicts=($(cut -d: -f1,2 blacklist-${pkgver}.txt | \ + sed "s/:$//" | \ + grep -v ":" | \ + grep -v '^#' | \ + sort -u + )) cd ${srcdir} install -d ${pkgdir}/usr/share/doc/${pkgname} install -m644 blacklist-${pkgver}.txt ${pkgdir}/usr/share/doc/${pkgname}/ } -package() { - conflicts=($(cut -d: -f1,2 ${pkgdir}/usr/share/doc/${pkgname}/blacklist-${pkgver}.txt | \ - sed "s/:$//" | \ - grep -v ":" | \ - sort -u - )) -} - -md5sums=('b8c939de5aa75a92299f65210e510d61') +md5sums=('5fd14982619414fea1882b351607291e') diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install index 0786adabf..e0477cab9 100644 --- a/libre/your-freedom/your-freedom.install +++ b/libre/your-freedom/your-freedom.install @@ -3,25 +3,25 @@ pre_install() { cat <<EOM == IMPORTANT NOTICE == - This package will help you identify unfree packages that are installed - on your system at the time of it's installation, as well as protecting + This package will help you identify nonfree packages that are installed + on your system at the time of its installation, as well as protecting you from (accidentally) installing them. - Also, if any other unfree package is identified, later updates will ask - you for it's removal. + Also, if any other nonfree package is identified, later updates will ask + you for its removal. - Have in mind that, if you want to retain certain unfree packages + Have in mind that, if you want to retain certain nonfree packages installed on your system, you'll have to remove your-freedom :) If you find out any of the following: - * Cascade package removal due to unfree dependencies, + * Cascade package removal due to nonfree dependencies, * Your-freedom conflicting with a *-libre package, * Etc. Please report back to the Parabola Project on the usual channels: * https://labs.parabola.nu * irc://freenode.net/#parabola - * mailto:dev@list.parabolagnulinux.org + * mailto:dev@lists.parabolagnulinux.org EOM } |