Commit 9667015b by Ruben Rodriguez

Merge branch '9_trivial' into 'master'

Trisquel 9 trivial additions

See merge request !15
parents 2244c587 78f5824e
#APT::Install-Recommends "false";
APT::Install-Suggests "false";
#!/bin/bash
# This is a ugly hack to assign system wide aliases without changing a bit in
# the bash package.
# enable color support of ls and also add handy aliases
if [ "$TERM" != "dumb" ] && [ -x /usr/bin/dircolors ]; then
eval "`dircolors -b`"
alias ls='ls --color=auto'
alias ll='ls -lh'
alias la='ls -A'
alias l='ls -CF'
alias dir='ls --color=auto --format=vertical'
alias vdir='ls --color=auto --format=long'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
[ -f /usr/bin/vim ] && alias vi='vim' || alias vi='vim.tiny'
[ -f /usr/bin/vim ] || alias vim='vim.tiny'
[ -d /rofs ] && alias su='sudo su'
fi
#!/bin/bash -e
source /usr/lib/grub/grub-mkconfig_lib
# this allows desktop-base to override our settings
f=/usr/share/desktop-base/grub_background.sh
if test -e ${f} ; then
source ${f}
else
WALLPAPER="/usr/share/backgrounds/trisquel-grub.png"
if test -f /usr/share/backgrounds/trisquel-grub-custom.png ; then
WALLPAPER="/usr/share/backgrounds/trisquel-grub-custom.png"
fi
COLOR_NORMAL="white/black"
COLOR_HIGHLIGHT="yellow/white"
fi
set_mono_theme()
{
cat << EOF
set menu_color_normal=white/black
set menu_color_highlight=black/light-gray
EOF
}
# check for usable backgrounds
use_bg=false
if [ "$GRUB_TERMINAL_OUTPUT" = "gfxterm" ] ; then
for i in /boot/grub/`basename ${WALLPAPER}` ${WALLPAPER} ; do
if is_path_readable_by_grub $i ; then
bg=$i
case ${bg} in
*.png) reader=png ;;
*.tga) reader=tga ;;
*.jpg|*.jpeg) reader=jpeg ;;
esac
if test -e /boot/grub/${reader}.mod ; then
echo "Found background image: `basename ${bg}`" >&2
use_bg=true
break
fi
fi
done
fi
# set the background if possible
if ${use_bg} ; then
prepare_grub_to_access_device `${grub_probe} --target=device ${bg}`
cat << EOF
insmod ${reader}
if background_image `make_system_path_relative_to_its_root ${bg}` ; then
set color_normal=${COLOR_NORMAL}
set color_highlight=${COLOR_HIGHLIGHT}
else
EOF
fi
# otherwise, set a monochromatic theme
if ${use_bg} ; then
set_mono_theme | sed -e "s/^/ /g"
echo "fi"
else
set_mono_theme
fi
options b43 qos=0
options b43 nohwcrypt=1
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
### Created by Brad Sims 25/06/2004
### (Modified for Trisquel by Ruben Rodriguez and Santiago Rodriguez)
### I got tired of .screenrc's on the internet being so
### poorly commented... So being a good GNUbie I took matters
### into my own hands; and wrote this dotfile.
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
## Explanation of hardstatus line ##
# Ignore the ' marks if you use these examples for yourself
# Note that if you want to use the color brown under konsole
# You actually use bright yellow (%{Y}).
# Note the embeded space after the colon, I feel
# it just looks nicer with a blank between the
# text and console edge:
# '%{=b}%{G} Screen(s): '
# This prints the window listing in blue:
# '%{b}%w'
# This right-aligns what follows:
# '%='
# This displays the time (hours and minutes) in 12hr format
# and adds an AM/PM flag, in bold green:
# '%{G}%C%A'
# This displays the day of the week:
# '%D'
#This displays the date in Mon/day/year format:
# and again I embeded a space to give me one space
# between the text and console edge:
# '%M/%d/%Y '
# The resulting command give you a status line that
# looks like this:
# | Screen(s): 0* bash 5:30PM Fri, Jun/25/2004 |
# (The pipes indicate the edges of the xterm/console).
# Green text, time, and date; windows in blue:
hardstatus alwayslastline "%{=b}%{G}%{b}%w %=%{kG}%C%A %d/%M/%Y "
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
## Some general options ##
# Enable scroll back
termcapinfo xterm|xterms|xs|rxvt ti@:te@
# Turn off start message:
startup_message off
# Set messages timeout to three seconds:
msgwait 3
# Enlarge buffer
defscrollback 4096
#Disable beep
vbell off
bell " %n %t !"
#Nethack style messages
nethack on
caption splitonly "%2n %t"
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
## Keybindings ##
# bind F7 to detach screen session from this terminal
# bind F8 to kill current screen window.
# bind F9 to create a new screen
# bind F10 to rename current screen window
# bind F11 to move to previous window
# bind F12 to move to next window
bindkey -k k1 select 0
bindkey -k k2 select 1
bindkey -k k3 select 2
bindkey -k k4 select 3
bindkey -k k5 select 4
bindkey -k k6 select 5
bindkey -k k7 copy
bindkey -k k8 paste .
bindkey -k k9 screen
#bindkey -k k8 kill
#bindkey -k k9 screen
#bindkey -k k; title
#bindkey -k F1 prev
#bindkey -k F2 next
#unbind s
bind s
syntax on
set noautoindent
set background=dark
"set showcmd " Show (partial) command in status line.
set showmatch " Show matching brackets.
"set ignorecase " Do case insensitive matching
set smartcase " Do smart case matching
"set incsearch " Incremental search
""set autowrite " Automatically save before commands like :next and :make
"set hidden " Hide buffers when they are abandoned
"set mouse=a " Enable mouse usage (all modes) in terminals
partman-auto/text/home_scheme ::
500 5000 15000 xfs
method{ format }
format{ }
use_filesystem{ }
filesystem{ xfs }
mountpoint{ / }
options/relatime{ relatime } .
$lvmok{ }
500 1000 2000 ext4
method{ format }
format{ }
use_filesystem{ }
filesystem{ ext4 }
mountpoint{ /boot }
options/relatime{ relatime } .
96 512 300% linux-swap
$lvmok{ }
method{ swap }
format{ } .
100 10000 -1 xfs
$lvmok{ }
method{ format }
format{ }
use_filesystem{ }
filesystem{ xfs }
mountpoint{ /home }
options/relatime{ relatime } .
#!/bin/sh
PREREQ=""
DESCRIPTION="Configuring Xorg server for VESA safe mode"
prereqs()
{
echo "$PREREQ"
}
case $1 in
# get pre-requisites
prereqs)
prereqs
exit 0
;;
esac
. /scripts/casper-functions
grep video=vesa /proc/cmdline || exit
log_begin_msg "$DESCRIPTION"
cp /root/etc/X11/xorg.conf.vesa /root/etc/X11/xorg.conf
log_end_msg
# Copyright © 210 Ruben Rodriguez <ruben@trisquel.info>
# Copyright © 2009 Raphaël Hertzog <hertzog@debian.org>
# Copyright © 2008 Ian Jackson <ian@davenant.greenend.org.uk>, Colin Watson
# <cjwatson@ubuntu.com>, James Westby <jw+debian@jameswestby.net>
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package Dpkg::Vendor::Trisquel;
use strict;
use warnings;
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
use base 'Dpkg::Vendor::Debian';
=head1 NAME
Dpkg::Vendor::Trisquel - Trisquel vendor object
=head1 DESCRIPTION
This vendor object customize the behaviour of dpkg-source
to check that Maintainers have been modified if necessary.
=cut
sub run_hook {
my ($self, $hook, @params) = @_;
if ($hook eq "before-source-build") {
my $src = shift @params;
my $fields = $src->{'fields'};
# check that Maintainer/XSBC-Original-Maintainer comply to
# https://wiki.ubuntu.com/DebianMaintainerField
if (defined($fields->{'Version'}) and defined($fields->{'Maintainer'}) and
$fields->{'Version'} =~ /trisquel/) {
if ($fields->{'Maintainer'} !~ /trisquel/i) {
if (defined ($ENV{'DEBEMAIL'}) and $ENV{'DEBEMAIL'} =~ /\@trisquel\.info/) {
error(_g('Version number suggests Trisquel changes, but Maintainer: does not have Trisquel address'));
} else {
warning(_g('Version number suggests Trisquel changes, but Maintainer: does not have Trisquel address'));
}
}
unless ($fields->{'Original-Maintainer'}) {
warning(_g('Version number suggests Trisquel changes, but there is no XSBC-Original-Maintainer field'));
}
}
} elsif ($hook eq "before-changes-creation") {
my $fields = shift @params;
# Add Launchpad-Bugs-Fixed field
my $bugs = find_launchpad_closes($fields->{"Changes"} || "");
if (scalar(@{$bugs})) {
$fields->{"Launchpad-Bugs-Fixed"} = join(" ", @{$bugs});
}
} elsif ($hook eq "keyrings") {
my @keyrings = $self->SUPER::run_hook($hook);
push(@keyrings, '/usr/share/keyrings/trisquel-archive-keyring.gpg');
return @keyrings;
}
}
=head1 PUBLIC FUNCTIONS
=over
=item $bugs = Dpkg::Vendor::Trisquel::find_launchpad_closes($changes)
Takes one string as argument and finds "LP: #123456, #654321" statements,
which are references to bugs on Launchpad. Returns all closed bug
numbers in an array reference.
=cut
sub find_launchpad_closes {
my ($changes) = @_;
my @closes = ();
while ($changes &&
($changes =~ /lp:\s+\#\d+(?:,\s*\#\d+)*/ig)) {
push(@closes, $& =~ /\#?\s?(\d+)/g);
}
@closes = sort { $a <=> $b } @closes;
return \@closes;
}
=back
=cut
1;
trisquel-base-data (7.0-1) belenos; urgency=medium
* Remove alias for rm command
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 12 Jun 2015 02:40:33 +0200
trisquel-base-data (7.0) belenos; urgency=low
* Initial release for belenos
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 31 Jan 2014 19:46:30 +0100
trisquel-base-data (6.0-2) toutatis; urgency=low
* Updated /usr/share/backgrounds/trisquel-grub.png to fix #7741
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sat, 02 Mar 2013 03:14:09 +0100
trisquel-base-data (6.0-1) toutatis; urgency=low
* Updated partition layout so / target size is 15GB instead of 10.
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 25 Jan 2013 18:11:45 +0100
trisquel-base-data (6.0) toutatis; urgency=low
* Final release for Toutatis
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sun, 25 Nov 2012 07:32:32 +0100
trisquel-base-data (5.99) toutatis; urgency=low
* Initial release for Toutatis
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sun, 07 Oct 2012 05:26:25 +0200
trisquel-base-data (5.5) brigantia; urgency=low
* Updated for final brigantia artwork
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 05 Apr 2012 02:55:01 +0200
trisquel-base-data (5.4) brigantia; urgency=low
* Initial release for Brigantia
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Mon, 23 Jan 2012 18:40:13 +0100
trisquel-base-data (5.0) slaine; urgency=low
* Final release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 13:31:40 +0200
trisquel-base-data (4.99-1) slaine; urgency=low
* Updated grub artwork
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 15 Sep 2011 02:24:57 +0200
trisquel-base-data (4.99) slaine; urgency=low
* Initial release for Dagda
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sat, 16 Jul 2011 14:48:24 +0200
trisquel-base-data (4.5-5) slaine; urgency=low
* Removed /usr/lib/ubiquity/apt-setup/generators/99trisquel
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sat, 14 May 2011 17:22:21 +0200
trisquel-base-data (4.5-4) slaine; urgency=low
* removed preinst script
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 14 Apr 2011 20:29:33 +0200
trisquel-base-data (4.5-3) slaine; urgency=low
* Changed priority and section
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 14 Apr 2011 18:32:43 +0200
trisquel-base-data (4.5-2) slaine; urgency=low
* Added a hack to fix https://trisquel.info/en/forum/update-issues-clean-install
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 14 Apr 2011 14:16:54 +0200
trisquel-base-data (4.5-1) slaine; urgency=low
* Updated apt list generator
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 22 Mar 2011 18:21:02 +0100
trisquel-base-data (4.5) slaine; urgency=low
* Updated grub background, partman recipe and apt.conf.d/02trisquel
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 18 Mar 2011 00:28:39 +0100
trisquel-base-data (4.4.9-4) slaine; urgency=low
* Restored radeon into blacklist
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Thu, 24 Feb 2011 04:23:49 +0100
trisquel-base-data (4.4.9-3) slaine; urgency=low
* Removed radeon from blacklist
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 11 Feb 2011 00:49:34 +0100
trisquel-base-data (4.4.9-2) slaine; urgency=low
* Updated generator script logging texts
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Wed, 12 Jan 2011 03:03:48 +0100
trisquel-base-data (4.4.9-1) slaine; urgency=low
* New sources.list generator for ubiquity
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Mon, 10 Jan 2011 22:13:00 +0100
trisquel-base-data (4.4.9) slaine; urgency=low
* Initial release for slaine
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sun, 12 Dec 2010 18:41:00 +0200
trisquel-base-data (4.0-1) taranis; urgency=low
* Radeon module blacklisted
* Sets plymouth theme back to trisquel if lubuntu's is in use
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Wed, 22 Sep 2010 23:39:58 +0200
trisquel-base-data (4.0) taranis; urgency=low
* Added update-initramfs command on install
* Added grub background
* priority moved to important
* apt configured not to autoinstall recommended packages
* Initial release for Taranis
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Wed, 07 Sep 2010 19:50:00 +0200
trisquel-base-data (3.5-1) awen; urgency=low
* Added /usr/share/perl5/Dpkg/Vendor/Trisquel.pm, closes
http://trisquel.info/issues/1796
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Fri, 02 Apr 2010 04:00:31 +0200
trisquel-base-data (3.5) awen; urgency=low
* Partman recipe changed to ext4+xfs
* Legacy rebuildfstab script removed
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Sat, 20 Feb 2010 18:36:33 +0100
trisquel-base-data (3.4.9) awen; urgency=low
* Initial release for awen
-- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info> Tue, 16 Feb 2010 23:20:49 +0100
trisquel-base-data (3.0) dwyn; urgency=low
* b43 config added
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Wed, 09 Sep 2009 21:06:08 +0200
trisquel-base-data (2.99-3) dwyn; urgency=low
* partman recipe updated
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Tue, 04 Aug 2009 17:19:03 +0200
trisquel-base-data (2.99-2) dwyn; urgency=low
* Grub config file updated
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Sun, 12 Jul 2009 03:57:44 +0200
trisquel-base-data (2.99-1) dwyn; urgency=low
* Removed some bash aliases
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Fri, 12 Jun 2009 13:27:22 +0200
trisquel-base-data (2.99) dwyn; urgency=low
* Initial release for Dwyn
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Thu, 11 Jun 2009 14:50:23 +0200
trisquel-base-data (2.1-6) robur; urgency=low
* Screenrc bug fixed, conffile restored
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Thu, 14 May 2009 13:15:28 +0200
trisquel-base-data (2.1-5) robur; urgency=low
* Removed screenrc skel config due to synaptic bug (FIXME)
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Thu, 14 May 2009 10:26:41 +0200
trisquel-base-data (2.1-4) robur; urgency=low
* Ported from dpkg -b
-- Rubén Rodríguez Pérez <ruben@trisquel.info> Mon, 11 May 2009 11:56:59 +0200
Source: trisquel-base-data
Section: trisquel
Priority: important
Maintainer: Rubén Rodríguez <ruben@trisquel.info>
Build-Depends-Indep: debhelper
Standards-Version: 3.5.9.0
Package: trisquel-base-data
Architecture: all
Priority: important
Description: Trisquel base metapackage - data files.
Virtual package providing a dependency list for Trisquel base installation.
Provides a console basic environment.
.
This package was created by Rubén Rodríguez <ruben@trisquel.info>
Copyright (C) 2009 the authors
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
#!/bin/bash
if update-alternatives --query default.plymouth | grep Value | grep lubuntu -q
then
update-alternatives --remove default.plymouth /lib/plymouth/themes/lubuntu-logo/lubuntu-logo.plymouth
fi
update-initramfs -u
exit 0
#!/bin/bash
grep -q b43 /etc/modules && sed -i '/b43/d' /etc/modules
exit 0
#!/usr/bin/make -f
build:
clean:
dh_testdir
dh_testroot
dh_clean
binary-indep:
dh_clean
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
cp data/* -a debian/`find debian/ -mindepth 1 -maxdepth 1 -type d | cut -d/ -f2`
dh_fixperms
dh_compress
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
binary-arch:
binary: binary-indep binary-arch
.PHONY: binary binary-arch binary-indep clean build
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE
RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
AND CONDITIONS.