Skip to content

fix for debian sid/trixie and "/etc/apt/keyrings/" #128

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

fix for debian sid/trixie and "/etc/apt/keyrings/" #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions scripts/install_pulseaudio_sources_apt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ if [ ! -d "$PULSE_DIR" ]; then
for srclst in $SRCLIST; do
while read type url suite rest; do
case "$suite" in
$codename | $codename-updates | $codename-security)
$codename | $codename-updates | $codename-security | sid | trixie)
if [ "$type" = deb ]; then
echo "deb $url $suite $rest"
echo "deb-src $url $suite $rest"
Expand All @@ -116,7 +116,7 @@ if [ ! -d "$PULSE_DIR" ]; then

# Cater for DEB822 .sources files. These can appear alongside the
# older format.
for src in $(find /etc/apt/sources.list.d -maxdepth 1 -type f -name '*.sources'); do
for src in $(find /etc/apt/sources.list.d -maxdepth 1 -type f -name '*.sources' -o -name '*.list'); do
# If we can find a match for the codename in the file, enable
# sources for all elements of the file. We assume that different
# codenames will be assigned to different files
Expand Down Expand Up @@ -149,11 +149,7 @@ if [ ! -d "$PULSE_DIR" ]; then
;;
Debian-12)
# Debian testing build
case "$codename" in
bookworm)
sudo apt-get install -y doxygen
;;
esac
sudo apt-get install -y doxygen
;;
esac

Expand Down
10 changes: 9 additions & 1 deletion scripts/install_pulseaudio_sources_apt_wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,15 @@ done

for file in $(find /etc/apt/trusted.gpg.d/ \
-maxdepth 1 \
-type f -name '*.gpg' ); do
-type f -name '*.gpg' -o -name '*.asc' ); do
if [ ! -f "$BUILDROOT/$file" ]; then
echo "- Copying $file to the root"
sudo install -Dm 0644 $file $BUILDROOT/$file || exit $?
fi
done
for file in $(find /etc/apt/keyrings/ \
-maxdepth 1 \
-type f -name '*.gpg' -o -name '*.asc' ); do
if [ ! -f "$BUILDROOT/$file" ]; then
echo "- Copying $file to the root"
sudo install -Dm 0644 $file $BUILDROOT/$file || exit $?
Expand Down