Skip to content

Commit

Permalink
[linux] Update debian packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
ntadej committed Jul 17, 2013
1 parent 8fb8b88 commit d65c52e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 91 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.0
0.8.90
9 changes: 7 additions & 2 deletions build-package.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
#############################################################################
# VLC-Qt - Qt and libvlc connector library
# Copyright (C) 2012 Tadej Novak <[email protected]>
# Copyright (C) 2013 Tadej Novak <[email protected]>
#
# This library is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published
Expand All @@ -21,14 +21,16 @@ set -eu

DEVEL=""
TARGET=""
while getopts "hdt:" OPTION
BUILD="1"
while getopts "hdt:b:" OPTION
do
case $OPTION in
h)
echo "Quick build system for VLC-Qt library."
echo ""
echo "Use -t to specify target (in targets directory)"
echo "Use -d to ignore dependency requests"
echo "Use -b to specify build number (defaults to 1)"
exit 0
;;
d)
Expand All @@ -37,6 +39,9 @@ do
t)
TARGET="$OPTARG"
;;
b)
BUILD="$OPTARG"
;;
esac
done

Expand Down
4 changes: 2 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
libvlc-qt (0.8.0) unstable; urgency=low
libvlc-qt (0.8.90-1) unstable; urgency=low

* The full changelog can be found in NEWS
or by running 'git log' when using Git

-- Tadej Novak <[email protected]> Sat, 12 Jan 2013 13:25:00 +0100
-- Tadej Novak <[email protected]> Wed, 17 Jul 2013 19:58:34 +0200
13 changes: 3 additions & 10 deletions targets/debian.sh
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
BUILD_DEPS=`awk 'BEGIN {cnt = 1;} /^Build-Depends:/ {split($0, line, ":");split(line[2], deps, ",");for (i in deps) {d = deps[i];sub(/^ */, "", d);sub(/ *$/, "", d);split(d, tokens, " ");packages[cnt] = tokens[1];cnt++;}} END {out = ""; for(i = 1; i <= cnt; i++) {out = out packages[i] " ";} print out; }' debian/control`
CHANGELOG=debian/changelog
NOW=`date -R`
VER=`git describe | sed "s/\([0-9]*\)\.\([0-9]*\)-\([0-9]*\)-.*/\1.\2.\3/"`
#VER=`git describe | sed "s/\([0-9]*\)\.\([0-9]*\)-\([0-9]*\)-.*/\1.\2.\3/"`
VER=`cat VERSION`

build()
{
echo >${CHANGELOG} "libvlc-qt (${VER}) unstable; urgency=low"
echo >${CHANGELOG} "libvlc-qt (${VER}-${BUILD}) unstable; urgency=low"
echo >>${CHANGELOG}
echo >>${CHANGELOG} " * The full changelog can be found in NEWS"
echo >>${CHANGELOG} " or by running 'git log' when using Git"
echo >>${CHANGELOG}
echo >>${CHANGELOG} " -- Tadej Novak <[email protected]> ${NOW}"

dpkg-buildpackage -b -us -uc ${DEVEL}

for a in ../libvlc-qt*${VER}*.deb; do
versioned_artifact "$a" deb application/x-deb `basename $a`
done

for a in ../libvlc-qt*${VER}*.changes; do
versioned_artifact "$a" changes text/plain `basename $a`
done
}

clean()
Expand Down
38 changes: 0 additions & 38 deletions toolchains/Toolchain-i686-w64-mingw32.cmake

This file was deleted.

38 changes: 0 additions & 38 deletions toolchains/Toolchain-x86_64-w64-mingw32.cmake

This file was deleted.

0 comments on commit d65c52e

Please sign in to comment.