diff options
| author | Adrien Nader <adrien@notk.org> | 2013-07-14 18:18:24 +0200 |
|---|---|---|
| committer | Adrien Nader <adrien@notk.org> | 2013-07-14 18:18:24 +0200 |
| commit | bb133be00f750948bc342c539bd68dea0fa2fb29 (patch) | |
| tree | ce1c37a4c0df66fa5d373df8c5ed94feca38d0ef /a | |
| parent | e11c0f9f8b2f64e227ee8519b4e081be95e00b90 (diff) | |
| parent | 3d71db9fef192ab43f037849557fa7042f37d514 (diff) | |
Merge remote-tracking branch 'volkerdi/master'
Conflicts:
d/binutils/binutils.SlackBuild
d/binutils/release.binutils-2.23.52.0.1
d/gcc/gcc.SlackBuild
l/expat/expat.SlackBuild
l/gtk+2/gtk+2.SlackBuild
l/pango/pango.SlackBuild
l/pango/pango.etc.host.location.diff.gz
xap/gucharmap/gucharmap.SlackBuild
Diffstat (limited to 'a')
| -rwxr-xr-x | a/gettext/gettext-tools.SlackBuild | 2 | ||||
| -rwxr-xr-x | a/gettext/gettext.SlackBuild | 2 | ||||
| -rw-r--r-- | a/xz/xz-5.0.4.tar.bz2.sig | bin | 543 -> 0 bytes | |||
| -rw-r--r-- | a/xz/xz-5.0.5.tar.xz.sig | bin | 0 -> 543 bytes | |||
| -rwxr-xr-x | a/xz/xz.SlackBuild | 4 |
5 files changed, 4 insertions, 4 deletions
diff --git a/a/gettext/gettext-tools.SlackBuild b/a/gettext/gettext-tools.SlackBuild index aa7b73c..b231ad5 100755 --- a/a/gettext/gettext-tools.SlackBuild +++ b/a/gettext/gettext-tools.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.18.2.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j6 "} diff --git a/a/gettext/gettext.SlackBuild b/a/gettext/gettext.SlackBuild index b3853e7..6ebfb22 100755 --- a/a/gettext/gettext.SlackBuild +++ b/a/gettext/gettext.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.18.2.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j6 "} diff --git a/a/xz/xz-5.0.4.tar.bz2.sig b/a/xz/xz-5.0.4.tar.bz2.sig Binary files differdeleted file mode 100644 index dddc151..0000000 --- a/a/xz/xz-5.0.4.tar.bz2.sig +++ /dev/null diff --git a/a/xz/xz-5.0.5.tar.xz.sig b/a/xz/xz-5.0.5.tar.xz.sig Binary files differnew file mode 100644 index 0000000..3c9adfd --- /dev/null +++ b/a/xz/xz-5.0.5.tar.xz.sig diff --git a/a/xz/xz.SlackBuild b/a/xz/xz.SlackBuild index 6080975..31b95b5 100755 --- a/a/xz/xz.SlackBuild +++ b/a/xz/xz.SlackBuild @@ -22,7 +22,7 @@ # SUCH DAMAGE. PKGNAM=xz -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -54,7 +54,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION chown -R root:root . find . \ |