Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bookworm support #57

Merged
merged 1 commit into from
Dec 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Makefile.builder
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
ifneq (,$(findstring $(DIST),wheezy jessie stretch buster bullseye))
ifneq (,$(findstring $(DIST),stretch buster bullseye bookworm))
DEBIAN_PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
DISTRIBUTION := debian
BUILDER_MAKEFILE = $(DEBIAN_PLUGIN_DIR)Makefile.debian
TEMPLATE_SCRIPTS = $(DEBIAN_PLUGIN_DIR)template_debian
DIST_TAG := $(strip $(subst wheezy, deb7, $(DIST)))
DIST_TAG := $(strip $(subst jessie, deb8, $(DIST_TAG)))
DIST_TAG := $(strip $(subst stretch, deb9, $(DIST_TAG)))
DIST_TAG := $(strip $(subst buster, deb9, $(DIST_TAG)))
DIST_TAG := $(strip $(subst buster, deb10, $(DIST_TAG)))
DIST_TAG := $(strip $(subst bullseye, deb11, $(DIST_TAG)))
DIST_TAG := $(strip $(subst bookworm, deb12, $(DIST_TAG)))
endif
ifneq (,$(findstring $(DIST),trusty xenial bionic focal))
DEBIAN_PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
Expand Down
1 change: 1 addition & 0 deletions keys/bookworm-debian-archive-keyring.gpg
2 changes: 1 addition & 1 deletion pbuilderrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LOGLEVEL=I
USECOLORS=auto

case ${DISTRIBUTION} in
wheezy|jessie|stretch|buster|bullseye|sid|experimental)
stretch|buster|bullseye|bookworm|sid|experimental)
DIST_VENDOR=debian
MIRRORSITE=http://deb.debian.org/debian
;;
Expand Down
19 changes: 19 additions & 0 deletions template_debian/02_install_groups_bookworm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash -e
# vim: set ts=4 sw=4 sts=4 et :

if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
set -x
fi

source "${SCRIPTSDIR}/vars.sh"
source "${SCRIPTSDIR}/distribution.sh"

##### "=========================================================================
debug " Installing custom packages and customizing ${DIST}"
##### "=========================================================================

#### '--------------------------------------------------------------------------
info ' Adding contrib, non-free and Debian security to repository.'
#### '--------------------------------------------------------------------------
updateDebianSourceList
aptUpdate
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gnome.Terminal.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
org.gnome.Terminal.desktop
org.gnome.Nautilus.desktop
firefox-esr.desktop
thunderbird.desktop
yelp.desktop
3 changes: 3 additions & 0 deletions template_debian/appmenus_bookworm/whitelisted-appmenus.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.gnome.Terminal.desktop
org.gnome.Nautilus.desktop
firefox-esr.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
evolution.desktop
gimp.desktop
yelp.desktop
iceweasel.desktop
eog.desktop
rhythmbox.desktop
gnome-system-log.desktop
org.gnome.Terminal.desktop
gnome-calculator.desktop
org.gnome.Cheese.desktop
org.gnome.Nautilus.desktop
org.gnome.gedit.desktop
shotwell.desktop
org.gnome.Totem.desktop
libreoffice-startcenter.desktop
session-properties.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
gdebi.desktop
gpk-application.desktop
gnome-printers-panel.desktop
tracker-preferences.desktop
gnome-system-log.desktop
org.gnome.Terminal.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xfce4-terminal.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
xfce4-terminal.desktop
Thunar.desktop
firefox-esr.desktop
xfce-settings-manager.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
xfce4-terminal.desktop
xfce-settings-manager.desktop
2 changes: 1 addition & 1 deletion template_debian/distribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ function updateDebianSourceList() {
fi

# Add Debian security repositories
if [ "${DEBIANVERSION}" != "bullseye" ]; then
if [ "${DEBIANVERSION}" == "buster" ] || [ "${DEBIANVERSION}" == "stretch" ]; then
security_suffix="/updates"
else
security_suffix="-security"
Expand Down
16 changes: 16 additions & 0 deletions template_debian/packages_bookworm.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ncurses-term
aptitude
tasksel
sudo
dmsetup
psmisc
gnupg
xterm
libfile-mimeinfo-perl
libglib2.0-bin
ltrace
strace
haveged
wireless-tools
wpasupplicant
dbus-x11
28 changes: 28 additions & 0 deletions template_debian/packages_bookworm_standard.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
alsa-utils
apt-transport-https
cryptsetup
cups
emacs
evince
exfat-fuse
firefox-esr
firmware-linux
gedit
git
gnome-terminal
gnome-themes-standard
haveged
keepassxc
libnotify-bin
locales
locales-all
lvm2
nautilus
ncurses-term
network-manager
network-manager-gnome
nftables
thunderbird
vim-nox
xdg-user-dirs
xsettingsd
37 changes: 37 additions & 0 deletions template_debian/packages_bookworm_xfce.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apt-transport-https
atril
attr
bc
bzip2
cryptsetup
cups
dos2unix
emacs
exfat-fuse
firefox-esr
firmware-linux
git
gnupg
haveged
iw
keepassxc
less
locales
locales-all
lsof
lvm2
ncurses-term
nftables
qt5-style-plugins
qt5ct
rsync
sudo
thunderbird
tree
unzip
vim-nox
wget
xdg-user-dirs
xfce4
xfce4-terminal
zip