diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-02-04 19:15:34 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-02-04 19:15:34 -0200 |
| commit | 57f52074941be81a76b5b96c784d207eac799d10 (patch) | |
| tree | fcccd7a4815b41c80560847a58f64515f7fee653 | |
| parent | 612387f4d9af2ad1f4ac4bd070ab1ab3cd1651d4 (diff) | |
fix parabola-release problem
| -rw-r--r-- | libre/filesystem/PKGBUILD | 5 | ||||
| -rw-r--r-- | libre/lsb-release/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/lsb-release/lsb-release.install | 2 | ||||
| -rw-r--r-- | libre/psi/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/psi/parabola.patch | 5 |
5 files changed, 9 insertions, 9 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 9cb060ecc..69edeeb16 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -5,7 +5,7 @@ pkgname=filesystem pkgver=2013.05 -pkgrel=2.1 +pkgrel=2.2 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -52,7 +52,8 @@ package() { for f in gshadow shadow crypttab; do install -m600 ${srcdir}/${f} etc/ done - touch etc/arch-release + touch etc/parabola-release + ln -s parabola-release etc/arch-release install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD index 8f33e7ba3..c6cbe5863 100644 --- a/libre/lsb-release/PKGBUILD +++ b/libre/lsb-release/PKGBUILD @@ -7,7 +7,7 @@ pkgname=lsb-release pkgver=1.4 -pkgrel=14.1 +pkgrel=14.2 pkgdesc="LSB version query program (Parabola rebranded)" arch=('any') url="http://www.linuxbase.org/" diff --git a/libre/lsb-release/lsb-release.install b/libre/lsb-release/lsb-release.install index 62d404892..261df2a73 100644 --- a/libre/lsb-release/lsb-release.install +++ b/libre/lsb-release/lsb-release.install @@ -1,10 +1,8 @@ post_install() { - rm -f /etc/arch-release echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release } post_upgrade() { - rm -f /etc/arch-release sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release } diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD index 69ac930b0..c4150075f 100644 --- a/libre/psi/PKGBUILD +++ b/libre/psi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=psi pkgver=0.15 -pkgrel=2.1 +pkgrel=2.2 pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)' url='http://psi-im.org/' license=('GPL') @@ -15,7 +15,7 @@ install='psi.install' source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2" 'parabola.patch') md5sums=('aea15f17cf93e7cea52f305523f761be' - 'a641b77517c82c6e1f254d5595a25113') + '8a5c799ad8b6fd5310d4a849c324c82c') prepare() { cd ${srcdir}/psi-${pkgver} diff --git a/libre/psi/parabola.patch b/libre/psi/parabola.patch index cafe67fa1..9d41bffc4 100644 --- a/libre/psi/parabola.patch +++ b/libre/psi/parabola.patch @@ -25,7 +25,7 @@ }; enum OsFlags { -@@ -106,24 +90,7 @@ +@@ -106,24 +90,8 @@ QString file; QString name; } osInfo[] = { @@ -47,7 +47,8 @@ - - // many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :) - { LinuxRedHat, OsUseFile, "/etc/redhat-release", "RedHat Linux" }, -+ { LinuxParabola, OsUseName, "/etc/arch-release", "Parabola GNU/Linux-libre" }, ++ { LinuxParabola, OsUseName, "/etc/parabola-release", "Parabola GNU/Linux-libre" }, ++ { LinuxParabola, OsUseFile, "/etc/parabola-release", "Parabola GNU/Linux-libre" }, { LinuxNone, OsUseName, "", "" } }; |