diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-06-29 02:26:04 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-06-29 02:26:04 -0300 |
| commit | 3733ee42acea6a0b6988e1e3d3b26b63e66bfc72 (patch) | |
| tree | 9ec3f44e2aebbd4030a705a8aff8ccb35a2cc69b | |
| parent | 553541a6fbb9f1e9c3b5e80e9e2067b81bd2c4c4 (diff) | |
| parent | b7394a2135bfe2e228adcaa47d9489656e902127 (diff) | |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
| -rw-r--r-- | pcr/cluster-glue/PKGBUILD | 4 | ||||
| -rw-r--r-- | pcr/cluster-glue/replace-opensource-to-free-term.sed | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index ca85bb979..2c45a3b0c 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -5,7 +5,7 @@ _pkgname1=${pkgname::7} _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} pkgver=1.0.11 -pkgrel=13 +pkgrel=14 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 @@ -61,7 +61,7 @@ sha512sums=( bb5bc5c5a9347302be583c43b100c0c3760ec4dcc3348a9f9708d5b2c58ec02dd5782c5ac9dcb86223258493ad3fba8ddd8dc5670390f0f602c34869b26bee6d ce58a2af9f32265f12cc4984e9ae7f285fdb7737813ecccc0780015d048938d9dd79278635eb1cc6833f12f37a8c43211fec17411780220cf38fc44b91ecc076 e59386aee4db5857fa131798327aa449a5efcd7d50c3ab45dadfa0becc31698a62367ce83b85ca739bdebaad4a9daf96d02c42673a4e26294ec0fa67323fdb5b - 8280babf96e3324ed9fb6e4412c4a587530be9e21835036a5e8abe5437eb7199962d9c10bf15db6f5fb62a86ce7fcab3e48f4fa8391b18920ab5af4b6ff843c2 + c82bd919d1cd02afccd10aea3e015f289ac97e387a1485097d681f9161a00c64859a5dce0ed36b98ad6a340264c2d854dcc83e3248e12828795b73c6ff67ef5b ) prepare() { diff --git a/pcr/cluster-glue/replace-opensource-to-free-term.sed b/pcr/cluster-glue/replace-opensource-to-free-term.sed index e6ccc8c9c..c086bb91e 100644 --- a/pcr/cluster-glue/replace-opensource-to-free-term.sed +++ b/pcr/cluster-glue/replace-opensource-to-free-term.sed @@ -1,6 +1,10 @@ +s|Open Source Definition (Version [0-9].[0-9])|Free Software Definition|g; +s|Open Source Definition|Free Software Definition|g; s|Open Source Initiative|Free Software Foundation|g; s|OSI Certifi|FSF Certif|g; s|OSI certifi|FSF certif|g; +s|opensource[.]org/osd-annotated|gnu.org/philosophy/free-sw.html|g; +s|opensource[.]org/osd|gnu.org/philosophy/free-sw.html|g; s|opensource[.]org/|gnu.org/philosophy/free-sw.html|g; s|[ _-].\{1,3\}[ _-][oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE]||g; s|[oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE][ _-].\{1,3\}[ _-]||g; @@ -10,6 +14,6 @@ s|open.\{0,1\}[sS]ource|free|g; s|Free Development Lab|Open Source Development Lab|g; s|free[.]org|opensource.org|g; s|gnu[.]org/philosophy/free-sw[.]htmllicenses|opensource.org/licenses|g; -s|gnu[.]org/philosophy/free-sw[.]htmlosd|opensource.org/osd|g; +s|oss[.]software[.]ibm[.]com/developerworks/free|oss.software.ibm.com/developerworks/opensource|g; s|oberhumer[.]com/free|oberhumer.com/opensource|g; s|free@google[.]com|opensource@google.com|g; |