Skip to content
Snippets Groups Projects
Commit 1cd21075 authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Merge branch 'master' into toutatis

parents f709561d ac10a85a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
makepackage
+ 1
− 0
View file @ 1cd21075
...@@ -175,6 +175,7 @@ do ...@@ -175,6 +175,7 @@ do
mv \$i \$i.real mv \$i \$i.real
cp /bin/true \$i cp /bin/true \$i
done done
export DEBIAN_FRONTEND=noninteractive
apt-get --force-yes -y dist-upgrade apt-get --force-yes -y dist-upgrade
umount /proc umount /proc
EOF EOF
......
makepending
+ 1
− 0
View file @ 1cd21075
...@@ -108,6 +108,7 @@ then ...@@ -108,6 +108,7 @@ then
# 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 = natty ] && continue
[ $package = "grub2" -a $UPSTREAM = oneiric ] && continue [ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
[ $package = "grub2" -a $UPSTREAM = precise ] && continue
[ $package = "yelp" -a $UPSTREAM = natty ] && continue [ $package = "yelp" -a $UPSTREAM = natty ] && continue
echo Current version in $DISTRO: $current echo Current version in $DISTRO: $current
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment