Merge branch 'master' into belenos

This commit is contained in:
Rubén Rodríguez 2014-06-18 09:32:24 +02:00
commit a5a06fa08d

View file

@ -106,17 +106,13 @@ then
# echo Current version in $DISTRO: $current 1>&2 # echo Current version in $DISTRO: $current 1>&2
# echo Upstream version in $UPSTREAM: $upstream 1>&2 # echo Upstream version in $UPSTREAM: $upstream 1>&2
[ $package = "grub2" -a $UPSTREAM = natty ] && continue
[ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
[ $package = "grub2" -a $UPSTREAM = precise ] && continue
[ $package = "yelp" -a $UPSTREAM = natty ] && continue
echo Current version in $DISTRO: $current echo Current version in $DISTRO: $current
echo Upstream version in $UPSTREAM: $upstream echo Upstream version in $UPSTREAM: $upstream
[ $current = "EOL" ] && continue [ $current = "EOL" ] && continue
if echo $package |grep -q linux-ubuntu-modules if [ $package = "grub2" ]
then then
echo WARNING! linux-ubuntu-modules packages need to be manually compiled! echo WARNING! grub2 packages need to be manually compiled!
echo echo
continue continue
fi fi