Merge branch 'belenos' into 'belenos'

Belenos

Attempt to fix dpkg build from jenkins

See merge request !73
This commit is contained in:
Ruben Rodriguez 2015-04-14 17:49:59 +00:00
commit ebf6ea61bc

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2012 Rubén Rodríguez <ruben@trisquel.info> # Copyright (C) 2012-2015 Ruben Rodriguez <ruben@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=2
#FAKEROOT=true #FAKEROOT=true
COMPONENT=main COMPONENT=main
@ -58,6 +58,7 @@ EOF
cp $DATA/Trisquel.pm scripts/Dpkg/Vendor/Trisquel.pm cp $DATA/Trisquel.pm scripts/Dpkg/Vendor/Trisquel.pm
sed 's/>$log_file/|tee $log_file/' -i ./build-aux/test-driver
changelog "Compiled for Trisquel" changelog "Compiled for Trisquel"