Skip to content

Commit

Permalink
Debian: Remove unnecessary build dependency again and handle this in …
Browse files Browse the repository at this point in the history
…the ags+libraries script.
  • Loading branch information
tobihan committed Jan 21, 2014
1 parent 1da7669 commit d8c18d1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
5 changes: 1 addition & 4 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ Build-Depends: debhelper (>= 8.0.0),
libfreetype6-dev,
libtheora-dev,
libvorbis-dev,
libogg-dev,
liballegro4.4-plugin-alsa
# liballegro4.4-plugin-alsa is not really neccessary
# and was just added for the ags+libraries script.
libogg-dev
Standards-Version: 3.9.3
Homepage: https://github.com/adventuregamestudio/ags
Vcs-Git: git://github.com/adventuregamestudio/ags.git
Expand Down
14 changes: 12 additions & 2 deletions debian/make_ags+libraries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ debuild -us -uc -S

# Build ags binary package in i386 chroot, also use a hook script to copy libraries and licenses
# from the chroot to a folder that is mounted into the chroot via --bindmounts.
DEB_BUILD_OPTIONS="rpath=$ORIGIN/lib32" cowbuilder-dist wheezy i386 build $BASEPATH/../ags_$VERSION.dsc --buildresult $BASEPATH/ags+libraries --hookdir $BASEPATH/debian/ags+libraries/hooks --bindmounts "$BASEPATH/ags+libraries"
DEB_BUILD_OPTIONS="rpath=$ORIGIN/lib32" cowbuilder-dist wheezy i386 build \
$BASEPATH/../ags_$VERSION.dsc \
--buildresult $BASEPATH/ags+libraries \
--hookdir $BASEPATH/debian/ags+libraries/hooks \
--bindmounts "$BASEPATH/ags+libraries" \
--extrapackages "liballegro4.4-plugin-alsa"

# Get the ags binary out of the binary Debian package and clean up.
cd $BASEPATH/ags+libraries
Expand All @@ -62,7 +67,12 @@ rm -rf $BASEPATH/ags+libraries/ags_* $BASEPATH/ags+libraries/ags-dbg_* $BASEPATH

# Repeat for amd64.
sed -i -r "5s/.*/BIT=64/" $BASEPATH/debian/ags+libraries/hooks/B00_copy_libs.sh
DEB_BUILD_OPTIONS="rpath=$ORIGIN/lib64" cowbuilder-dist wheezy amd64 build $BASEPATH/../ags_$VERSION.dsc --buildresult $BASEPATH/ags+libraries --hookdir $BASEPATH/debian/ags+libraries/hooks --bindmounts "$BASEPATH/ags+libraries"
DEB_BUILD_OPTIONS="rpath=$ORIGIN/lib64" cowbuilder-dist wheezy amd64 build \
$BASEPATH/../ags_$VERSION.dsc \
--buildresult $BASEPATH/ags+libraries \
--hookdir $BASEPATH/debian/ags+libraries/hooks \
--bindmounts "$BASEPATH/ags+libraries" \
--extrapackages "liballegro4.4-plugin-alsa"

cd $BASEPATH/ags+libraries
ar p $BASEPATH/ags+libraries/ags_${VERSION}_amd64.deb data.tar.gz | tar zx
Expand Down

0 comments on commit d8c18d1

Please sign in to comment.