diff options
| author |  waker <wakeroid@gmail.com> | 2012-05-03 23:05:53 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-05-03 23:05:53 +0200 |
| commit | 4ceaaeb68a0667841597f42dd59c5b2fe66d33cc (patch) | |
| tree | eefb028209b8c5b01f9c8ed0bcb434e020e0812a | |
| parent | b1d7db5c7bcb413d0446fbf86751389e2af91625 (diff) | |
numerous packaging fixes for 0.5.3
| -rw-r--r-- | PORTABLE_VERSION | 2 | ||||
| -rwxr-xr-x | scripts/portable_postbuild.sh | 1 | ||||
| -rwxr-xr-x | tools/apbuild/apgcc | 2 | ||||
| -rwxr-xr-x | tools/packages/arch.sh | 9 | ||||
| -rw-r--r-- | tools/packages/arch_install | 2 | ||||
| -rw-r--r-- | tools/packages/arch_pkginfo | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/PORTABLE_VERSION b/PORTABLE_VERSION index 6db426b0..21e24718 100644 --- a/PORTABLE_VERSION +++ b/PORTABLE_VERSION @@ -1 +1 @@ -0.5.3-rc2 +0.5.3-rc3 diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh index 9a82c216..46d6ec5b 100755 --- a/scripts/portable_postbuild.sh +++ b/scripts/portable_postbuild.sh @@ -6,6 +6,7 @@ OUTDIR=portable/$ARCH/deadbeef-$VERSION PLUGDIR=$OUTDIR/plugins DOCDIR=$OUTDIR/doc PIXMAPDIR=$OUTDIR/pixmaps +echo OUTDIR=$OUTDIR rm -rf $OUTDIR diff --git a/tools/apbuild/apgcc b/tools/apbuild/apgcc index 8b81686c..be4863a3 100755 --- a/tools/apbuild/apgcc +++ b/tools/apbuild/apgcc @@ -74,7 +74,7 @@ if (!defined $appath) { $appath =~ s/\/*$//g; $appath =~ s/^(.*)\/.*?$/$1/; $appath .= '/include/apbuild'; - if (! -f "$appath/apsymbols.h" && -f "$FindBin::Bin/apsymbols.h") { + if (! -f "$appath/apsymbols.h.i686" && -f "$FindBin::Bin/apsymbols.h.i686") { $appath = $FindBin::Bin; } } diff --git a/tools/packages/arch.sh b/tools/packages/arch.sh index 8e22176e..ce171a67 100755 --- a/tools/packages/arch.sh +++ b/tools/packages/arch.sh @@ -2,6 +2,7 @@ PWD=`pwd` VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` +ARCH_VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print' | sed 's/-//'` BUILD=`cat PORTABLE_BUILD | perl -ne 'chomp and print'` ARCH=`uname -m | perl -ne 'chomp and print'` INDIR=$PWD/static/$ARCH/deadbeef-$VERSION @@ -19,7 +20,9 @@ cp -r $INDIR/* $TEMPDIR/ # rm unneeded files rm $TEMPDIR/opt/deadbeef/lib/deadbeef/*.la for i in $TEMPDIR/opt/deadbeef/lib/deadbeef/*.so.0.0.0; do - mv $i $TEMPDIR/opt/deadbeef/lib/deadbeef/`basename $i .0.0.0` + n=$TEMPDIR/opt/deadbeef/lib/deadbeef/`basename $i .0.0.0` + mv $i $n + strip --strip-unneeded $n done rm $TEMPDIR/opt/deadbeef/lib/deadbeef/*.so.* rm $TEMPDIR/opt/deadbeef/lib/deadbeef/*.a @@ -32,7 +35,7 @@ mv $TEMPDIR/opt/deadbeef/share/icons $TEMPDIR/usr/share/ # generate .PKGINFO echo "# `date -u`" >$PKGINFO -echo "pkgver = $VERSION-$BUILD" >>$PKGINFO +echo "pkgver = $ARCH_VERSION-$BUILD" >>$PKGINFO echo "builddate = `date --utc +%s`" >>$PKGINFO echo "size = `du -sb $TEMPDIR | awk '{print $1}'`" >>$PKGINFO echo "arch = $ARCH" >>$PKGINFO @@ -43,4 +46,4 @@ cp tools/packages/arch_install $INSTALL # archive cd $TEMPDIR -fakeroot -- tar Jcvf $OUTDIR/deadbeef-$VERSION-$BUILD-$ARCH.pkg.tar.xz * .PKGINFO .INSTALL +fakeroot -- tar Jcvf $OUTDIR/deadbeef-static-$ARCH_VERSION-$BUILD-$ARCH.pkg.tar.xz * .PKGINFO .INSTALL diff --git a/tools/packages/arch_install b/tools/packages/arch_install index eaf1b9a6..2c5696c8 100644 --- a/tools/packages/arch_install +++ b/tools/packages/arch_install @@ -1,4 +1,4 @@ -pkgname=deadbeef +pkgname=deadbeef-static post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor diff --git a/tools/packages/arch_pkginfo b/tools/packages/arch_pkginfo index e58eee9e..17d1c0f9 100644 --- a/tools/packages/arch_pkginfo +++ b/tools/packages/arch_pkginfo @@ -1,4 +1,4 @@ -pkgname = deadbeef +pkgname = deadbeef-static pkgdesc = An audio player for GNU/Linux based on GTK2. url = http://deadbeef.sourceforge.net packager = Alexey Yakovenko <waker@users.sf.net> |