RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small fixes for ubuntu packaging

This commit is contained in:
Daniel Pavel 2013-01-07 12:40:44 +02:00
parent 210859a5ef
commit 5e0d2992c9
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/build_deb.sh
View File

@ -22,7 +22,6 @@ cd solaar-$VERSION
cp -a "$DEBIAN_FILES" . cp -a "$DEBIAN_FILES" .
test -n "$DEBIAN_FILES_EXTRA" && cp -a $DEBIAN_FILES_EXTRA/* debian/ test -n "$DEBIAN_FILES_EXTRA" && cp -a $DEBIAN_FILES_EXTRA/* debian/
# test -d debian/patches && ls -1 debian/patches/*.diff | cut -d / -f 3 > debian/patches/series
debuild ${DEBUILD_ARGS:-$@} debuild ${DEBUILD_ARGS:-$@}

9
packaging/build_ppa.sh
View File

@ -4,10 +4,13 @@ set -e
cd `dirname "$0"`/.. cd `dirname "$0"`/..
DISTRIBUTION=ubuntu
DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu"
. "$HOME/.devscripts" . "$HOME/.devscripts"
DEBIAN_CHANGELOG=$PWD/packaging/debian/changelog DEBIAN_CHANGELOG="$PWD/packaging/debian/changelog"
PPA_CHANGELOG=$PWD/packaging/ubuntu/changelog PPA_CHANGELOG="$DEBIAN_FILES_EXTRA/changelog"
latest=`head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#'` latest=`head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#'`
cat - "$DEBIAN_CHANGELOG" > "$PPA_CHANGELOG" <<_CHANGELOG cat - "$DEBIAN_CHANGELOG" > "$PPA_CHANGELOG" <<_CHANGELOG
@ -19,8 +22,6 @@ $latest
_CHANGELOG _CHANGELOG
DISTRIBUTION=ubuntu
DEBIAN_FILES_EXTRA=$PWD/packaging/ubuntu
DEBUILD_ARGS="-S" DEBUILD_ARGS="-S"
. packaging/build_deb.sh . packaging/build_deb.sh

3
packaging/debian/rules
View File

@ -15,6 +15,9 @@ PREFIX = /usr
override_dh_auto_install: override_dh_auto_install:
dh_auto_install -- --prefix=$(PREFIX) --install-lib=$(PREFIX)/share/solaar/lib dh_auto_install -- --prefix=$(PREFIX) --install-lib=$(PREFIX)/share/solaar/lib
override_dh_python2:
dh_python2 $(PREFIX)/share/solaar
override_dh_installudev: override_dh_installudev:
cp rules.d/??-logitech-unifying-receiver.rules debian/solaar.logitech-unifying-receiver.udev cp rules.d/??-logitech-unifying-receiver.rules debian/solaar.logitech-unifying-receiver.udev
dh_installudev --priority=99 --name=logitech-unifying-receiver dh_installudev --priority=99 --name=logitech-unifying-receiver

2
packaging/ubuntu/rules.extra
View File

@ -5,5 +5,7 @@ PREFIX = /opt/extras.ubuntu.com/solaar
# hacky... # hacky...
override_dh_link: override_dh_link:
dh_link dh_link
sed -i -e 's#Exec=solaar#Exec=/opt/extras.ubuntu.com/solaar/bin/solaar#' \
debian/solaar/opt/extras.ubuntu.com/solaar/share/applications/solaar.desktop
sed -i -e 's#Icon=solaar.png#Icon=/opt/extras.ubuntu.com/solaar/share/icons/solaar.png#' \ sed -i -e 's#Icon=solaar.png#Icon=/opt/extras.ubuntu.com/solaar/share/icons/solaar.png#' \
debian/solaar/opt/extras.ubuntu.com/solaar/share/applications/solaar.desktop debian/solaar/opt/extras.ubuntu.com/solaar/share/applications/solaar.desktop