Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • trisquel/package-helpers
  • aklis/package-helpers
  • leny2010/package-helpers
  • fr33domlover/package-helpers
  • Legimet/package-helpers
  • ralphtheninja/package-helpers
  • damo22/package-helpers
  • wherrfrye/package-helpers
  • habs/package-helpers
  • pehjota/package-helpers
  • kpengboy/package-helpers
  • alvaro/package-helpers
  • salman/package-helpers
  • pabloyoyoista/package-helpers
  • mixalis/package-helpers
  • jorgesumle/package-helpers
  • a_slacker_here/package-helpers
  • chaosmonk/package-helpers
  • Beformed/package-helpers
  • dknight/package-helpers
  • proninyaroslav/package-helpers
  • adfeno/package-helpers
  • snd/package-helpers
  • davidpgil/package-helpers
  • diopon/package-helpers
  • ruben/package-helpers
  • bandali/package-helpers
  • joshaspinall/package-helpers
  • GNUtoo/package-helpers
  • Ark74/package-helpers
  • dragestil/package-helpers
  • bill-auger/package-helpers
  • andi89gi/package-helpers
  • Fikar/package-helpers
  • davidl/package-helpers
  • jas/package-helpers
  • parodper/package-helpers
  • David_Hedlund/package-helpers
  • dinomug/package-helpers
  • bf/package-helpers
  • hartkemd/package-helpers
  • del111/package-helpers
  • jxself/package-helpers
  • JacobK/package-helpers
44 results
Show changes
Showing
with 1044 additions and 0 deletions
This diff is collapsed.
helpers/DATA/budgie-artwork/trisquel-budgie-logo_128_alpha.png

7.84 KiB

helpers/DATA/budgie-artwork/trisquel-budgie-logo_128_solid.png

25.8 KiB

helpers/DATA/budgie-artwork/trisquel-budgie-logo_200_alpha.png

13.2 KiB

helpers/DATA/budgie-artwork/trisquel-budgie-logo_200_solid.png

33.4 KiB

This diff is collapsed.
diff --git a/bin/casper-snapshot b/bin/casper-snapshot
index ab075292..33243f63 100755
--- a/bin/casper-snapshot
+++ b/bin/casper-snapshot
@@ -33,7 +33,7 @@ VERSION=0.0.1
if [ -e /etc/casper.conf ]; then
. /etc/casper.conf
else
- USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
+ USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
HOSTNAME=$(hostname)
BUILD_SYSTEM="Debian"
fi
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index d6c75e66..c80e2058 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then
sddm_session=QLubuntu.desktop
fi
cat >>/root/etc/sddm.conf <<EOF
-[Users]
-MinimumUid=999
-
[Autologin]
User=$USERNAME
Session=$sddm_session
diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
index 8320e710..efbf5677 100755
--- a/scripts/casper-bottom/25adduser
+++ b/scripts/casper-bottom/25adduser
@@ -57,7 +57,8 @@ db_set passwd/root-password-crypted '*'
db_set passwd/user-password-crypted U6aMy0wojraho
db_set passwd/user-fullname "$USERFULLNAME"
db_set passwd/username "$USERNAME"
-db_set passwd/user-uid 999
+# Per LP: #2004092, systemd uses 995-999
+db_set passwd/user-uid 1000
chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
if [ ! -f /root/usr/bin/sddm ]; then
@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
fi
done
-# GDM
-if [ -d /root/etc/gdm3 ]; then
- sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
-fi
-
# Kubuntu
if [ -f "/root/usr/bin/plasma-desktop" ]; then
if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then
--- a/scripts/casper 2023-02-13 23:53:18.908768968 -0600
+++ b/scripts/casper 2023-02-21 03:28:55.176581755 -0600
@@ -376,18 +376,18 @@
# maybe make livecd-rootfs embed something in the casper initrd?
case $PRETTY_NAME in
*development*)
- server_url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/$UBUNTU_CODENAME-live-server-$DPKG_ARCH.iso
- desktop_url=http://cdimage.ubuntu.com/daily-live/current/$UBUNTU_CODENAME-desktop-$DPKG_ARCH.iso
+ server_url=""
+ desktop_url=""
;;
*)
case $DPKG_ARCH in
amd64)
- server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
- desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
+ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
+ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
;;
*)
- server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
- desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
+ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
+ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
;;
esac
;;
diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Makefile
--- choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile 2021-02-26 15:22:56.000000000 -0600
+++ choose-mirror-2.111/Makefile 2021-06-04 12:09:55.000000000 -0500
@@ -33,8 +33,8 @@
STRIP=strip
# Derivative distributions may want to change these.
-#MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist
-MASTERLIST=Mirrors.masterlist.trisquel
+MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
+MASTERLIST=Mirrors.masterlist
ifdef DEBUG
CFLAGS:=$(CFLAGS) -DDODEBUG
diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in choose-mirror-2.111/debian/choose-mirror-bin.templates-in
--- choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in 2021-02-26 15:22:56.000000000 -0600
+++ choose-mirror-2.111/debian/choose-mirror-bin.templates-in 2021-02-08 06:52:03.000000000 -0600
@@ -12,10 +12,14 @@
Type: select
Choices-C: ${CHOICES-C}
Choices: ${CHOICES}
-Default: _CODENAME_
-Description: Trisquel version to install:
- In Trisquel, this question is never asked, and is only for preseeding.
- Caveat emptor.
+# :sl2:
+_Description: Debian version to install:
+ Debian comes in several flavors. Stable is well-tested and rarely changes.
+ Unstable is untested and frequently changing. Testing is a middle ground,
+ that receives many of the new versions from unstable if they are not too
+ buggy.
+ .
+ Only flavors available on the selected mirror are listed.
Template: mirror/codename
Type: string
diff -ru source/CommandNotFound/db/tests/test_db.py source/CommandNotFound/db/tests/test_db.py_fix
--- source/CommandNotFound/db/tests/test_db.py 2021-12-08 04:53:19.000000000 -0600
+++ source/CommandNotFound/db/tests/test_db.py_fix 2022-08-26 01:26:06.984427040 -0500
@@ -11,7 +11,7 @@
from CommandNotFound.db.creator import DbCreator
from CommandNotFound.db.db import SqliteDatabase
-mock_commands_bionic_backports = """suite: bionic-backports
+mock_commands_etiona_backports = """suite: etiona-backports
component: main
arch: all
@@ -20,7 +20,7 @@
commands: script,wall,new-stuff-only-in-backports
"""
-mock_commands_bionic_proposed = """suite: bionic-proposed
+mock_commands_etiona_proposed = """suite: etiona-proposed
component: main
arch: all
@@ -29,7 +29,7 @@
commands: script,wall
"""
-mock_commands_bionic = """suite: bionic
+mock_commands_etiona = """suite: etiona
component: main
arch: all
@@ -65,7 +65,7 @@
ignore-commands: ignore-me
"""
-mock_commands_bionic_universe = """suite: bionic
+mock_commands_etiona_universe = """suite: etiona
component: universe
arch: all
@@ -84,7 +84,7 @@
shutil.rmtree(self.tmpdir)
def make_mock_commands_file(self, suite, content):
- path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.ubuntu.com_ubuntu_dists_%s_Commands-all" % suite)
+ path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.trisquel.org_trisquel_dists_%s_Commands-all" % suite)
try:
os.makedirs(os.path.dirname(path))
except OSError:
@@ -95,7 +95,7 @@
def test_create_trivial_db(self):
mock_commands_file = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_file])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -108,9 +108,9 @@
def test_create_multiple_dbs(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
mock_commands_2 = self.make_mock_commands_file(
- "bionic-proposed_main", mock_commands_bionic_proposed)
+ "etiona-proposed_main", mock_commands_etiona_proposed)
cre = DbCreator([mock_commands_1, mock_commands_2])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -131,9 +131,9 @@
def test_create_backports_excluded_dbs(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
mock_commands_2 = self.make_mock_commands_file(
- "bionic-backports_main", mock_commands_bionic_backports)
+ "etiona-backports_main", mock_commands_etiona_backports)
cre = DbCreator([mock_commands_1, mock_commands_2])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -146,7 +146,7 @@
def test_create_no_versions_does_not_crash(self):
mock_commands = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic.replace("version: 1.0\n", ""))
+ "etiona_main", mock_commands_etiona.replace("version: 1.0\n", ""))
cre = DbCreator([mock_commands])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -157,11 +157,8 @@
def test_create_priorities_work(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
- mock_commands_2 = self.make_mock_commands_file(
- "bionic_universe", mock_commands_bionic_universe)
- self.assertNotEqual(mock_commands_1, mock_commands_2)
- cre = DbCreator([mock_commands_1, mock_commands_2])
+ "etiona_main", mock_commands_etiona)
+ cre = DbCreator([mock_commands_1])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
# validate content
@@ -173,12 +170,11 @@
db.lookup("bzr"), [
("bzr1", "1.0", "main"),
("bzr2", "2.7", "main"),
- ("bzr-tng", "3.0", "universe"),
])
def test_priorities_bonus_works(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_1])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -193,7 +189,7 @@
def test_visible_pkgname_works(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_1])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -205,9 +201,9 @@
def test_create_multiple_no_unneeded_creates(self):
mock_commands_1 = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
mock_commands_2 = self.make_mock_commands_file(
- "bionic-proposed_main", mock_commands_bionic_proposed)
+ "etiona-proposed_main", mock_commands_etiona_proposed)
cre = DbCreator([mock_commands_1, mock_commands_2])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
@@ -220,7 +216,7 @@
def test_create_honors_ignore_comamnds(self):
mock_commands_file = self.make_mock_commands_file(
- "bionic_main", mock_commands_bionic)
+ "etiona_main", mock_commands_etiona)
cre = DbCreator([mock_commands_file])
dbpath = os.path.join(self.tmpdir, "test.db")
cre.create(dbpath)
diff -ru source.orig/CommandNotFound/CommandNotFound.py source/CommandNotFound/CommandNotFound.py
--- source.orig/CommandNotFound/CommandNotFound.py 2021-12-08 05:53:19.000000000 -0500
+++ source/CommandNotFound/CommandNotFound.py 2023-06-09 16:52:12.675354733 -0400
@@ -227,8 +227,6 @@
else:
print("apt install %s" % packages[0][0], file=self.output_fd)
print(_("Please ask your administrator."))
- if not packages[0][2] in self.sources_list:
- print(_("You will have to enable the component called '%s'") % packages[0][2], file=self.output_fd)
self.output_fd.flush()
def sudo(self):
@@ -246,10 +244,7 @@
ver = " # version %s, or" % (package[1])
else:
ver = " # version %s" % (package[1])
- if package[2] in self.sources_list:
- print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
- else:
- print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver) + " (" + _("You will have to enable component called '%s'") % package[2] + ")", file=self.output_fd)
+ print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
if self.euid != 0 and not self.user_can_sudo:
print(_("Ask your administrator to install one of them."), file=self.output_fd)
self.output_fd.flush()
=== modified file 'metadata/core.xml.in'
Index: compiz-0.9.7.4/metadata/core.xml.in
===================================================================
--- compiz-0.9.7.4.orig/metadata/core.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/metadata/core.xml.in 2012-04-05 12:43:06.231451763 +0200
@@ -138,7 +138,7 @@
<option name="focus_prevention_match" type="match">
<_short>Focus Prevention Windows</_short>
<_long>Focus prevention windows</_long>
- <default>any</default>
+ <default>!(class=Polkit-gnome-authentication-agent-1)</default>
</option>
</group>
<group>
@@ -173,7 +173,7 @@
<option name="minimize_window_key" type="key">
<_short>Minimize Window</_short>
<_long>Minimize active window</_long>
- <default>&lt;Alt&gt;F9</default>
+ <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
</option>
<option name="minimize_window_button" type="button">
<_short>Minimize Window</_short>
@@ -182,12 +182,12 @@
<option name="maximize_window_key" type="key">
<_short>Maximize Window</_short>
<_long>Maximize active window</_long>
- <default>&lt;Alt&gt;F10</default>
+ <default>&lt;Control&gt;&lt;Super&gt;Up</default>
</option>
<option name="unmaximize_window_key" type="key">
<_short>Unmaximize Window</_short>
<_long>Unmaximize active window</_long>
- <default>&lt;Alt&gt;F5</default>
+ <default>&lt;Control&gt;&lt;Super&gt;Down</default>
</option>
<option name="maximize_window_horizontally_key" type="key">
<_short>Maximize Window Horizontally</_short>
@@ -210,7 +210,7 @@
<option name="show_desktop_key" type="key">
<_short>Show Desktop</_short>
<_long>Hide all windows and focus desktop</_long>
- <default>&lt;Control&gt;&lt;Alt&gt;d</default>
+ <default>&lt;Control&gt;&lt;Super&gt;d</default>
</option>
<option name="show_desktop_edge" type="edge">
<_short>Show Desktop</_short>
@@ -220,6 +220,7 @@
<option name="toggle_window_maximized_key" type="key">
<_short>Toggle Window Maximized</_short>
<_long>Toggle active window maximized</_long>
+ <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
</option>
<option name="toggle_window_maximized_button" type="button">
<_short>Toggle Window Maximized</_short>
@@ -244,14 +245,14 @@
<option name="hsize" type="int">
<_short>Horizontal Virtual Size</_short>
<_long>Screen size multiplier for horizontal virtual size</_long>
- <default>4</default>
+ <default>2</default>
<min>1</min>
<max>32</max>
</option>
<option name="vsize" type="int">
<_short>Vertical Virtual Size</_short>
<_long>Screen size multiplier for vertical virtual size</_long>
- <default>1</default>
+ <default>2</default>
<min>1</min>
<max>32</max>
</option>
Index: compiz-0.9.7.4/plugins/fade/fade.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/fade/fade.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/fade/fade.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -9,6 +9,7 @@
</requirement>
<relation type="after">
<plugin>decor</plugin>
+ <plugin>staticswitcher</plugin>
</relation>
<relation type="before">
<plugin>cube</plugin>
@@ -49,7 +50,7 @@
<option name="window_match" type="match">
<_short>Fade windows</_short>
<_long>Windows that should be fading</_long>
- <default>any</default>
+ <default>any &amp; !(title=notify-osd)</default>
</option>
<option name="visual_bell" type="bell">
<_short>Visual Bell</_short>
Index: compiz-0.9.7.4/plugins/place/place.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/place/place.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/place/place.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -19,8 +19,8 @@
<option name="mode" type="int">
<_short>Placement Mode</_short>
<_long>Algorithm to use for window placement</_long>
- <default>0</default>
- <min>2</min>
+ <default>2</default>
+ <min>0</min>
<max>5</max>
<desc>
<value>0</value>
Index: compiz-0.9.7.4/plugins/resize/resize.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/resize/resize.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/resize/resize.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -28,7 +28,7 @@
<option name="mode" type="int">
<_short>Default Resize Mode</_short>
<_long>Default mode used for window resizing</_long>
- <default>0</default>
+ <default>2</default>
<min>0</min>
<max>3</max>
<desc>
Index: compiz-0.9.7.4/plugins/scale/scale.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/scale/scale.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/scale/scale.xml.in 2012-04-05 12:43:51.243674966 +0200
@@ -18,14 +18,14 @@
<option name="spacing" type="int">
<_short>Spacing</_short>
<_long>Space between windows</_long>
- <default>10</default>
+ <default>68</default>
<min>0</min>
<max>250</max>
</option>
<option name="speed" type="float">
<_short>Speed</_short>
<_long>Scale speed</_long>
- <default>1.5</default>
+ <default>2.4</default>
<min>0.1</min>
<max>50</max>
<precision>0.1</precision>
@@ -33,7 +33,7 @@
<option name="timestep" type="float">
<_short>Timestep</_short>
<_long>Scale timestep</_long>
- <default>1.2</default>
+ <default>0.1</default>
<min>0.1</min>
<max>50</max>
<precision>0.1</precision>
@@ -46,7 +46,7 @@
<option name="opacity" type="int">
<_short>Opacity</_short>
<_long>Amount of opacity in percent</_long>
- <default>75</default>
+ <default>100</default>
<min>0</min>
<max>100</max>
</option>
@@ -55,7 +55,7 @@
<_long>Overlay an icon on windows once they are scaled</_long>
<min>0</min>
<max>2</max>
- <default>1</default>
+ <default>0</default>
<desc>
<value>0</value>
<_name>None</_name>
@@ -96,7 +96,7 @@
<_long>Selects where windows are scaled if multiple output devices are used.</_long>
<min>0</min>
<max>1</max>
- <default>0</default>
+ <default>1</default>
<desc>
<value>0</value>
<_name>On current output device</_name>
@@ -112,7 +112,7 @@
<option name="key_bindings_toggle" type="bool">
<_short>Key Bindings Toggle Scale Mode</_short>
<_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>
- <default>false</default>
+ <default>true</default>
</option>
<option name="button_bindings_toggle" type="bool">
<_short>Button Bindings Toggle Scale Mode</_short>
@@ -122,9 +122,6 @@
<option name="initiate_edge" type="edge">
<_short>Initiate Window Picker</_short>
<_long>Layout and start transforming windows</_long>
- <default>
- <edge name="TopRight"/>
- </default>
<allowed edgednd="true"/>
</option>
<option name="initiate_key" type="key">
@@ -148,6 +145,7 @@
<option name="initiate_all_key" type="key">
<_short>Initiate Window Picker For All Windows</_short>
<_long>Layout and start transforming all windows</_long>
+ <default>&lt;Super&gt;w</default>
</option>
<option name="initiate_group_edge" type="edge">
<_short>Initiate Window Picker For Window Group</_short>
@@ -178,7 +176,7 @@
<option name="show_desktop" type="bool">
<_short>Click Desktop to Show Desktop</_short>
<_long>Enter Show Desktop mode when Desktop is clicked during Scale</_long>
- <default>true</default>
+ <default>false</default>
</option>
</group>
</options>
Index: compiz-0.9.7.4/plugins/decor/decor.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/decor/decor.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/decor/decor.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -30,7 +30,7 @@
<option name="active_shadow_opacity" type="float">
<_short>Shadow Opacity</_short>
<_long>Drop shadow opacity</_long>
- <default>0.5</default>
+ <default>0.8</default>
<min>0.01</min>
<max>6.0</max>
<precision>0.01</precision>
@@ -65,7 +65,7 @@
<option name="inactive_shadow_radius" type="float">
<_short>Shadow Radius</_short>
<_long>Drop shadow radius</_long>
- <default>8.0</default>
+ <default>5.0</default>
<min>0.1</min>
<max>13.0</max>
<precision>0.1</precision>
@@ -73,7 +73,7 @@
<option name="inactive_shadow_opacity" type="float">
<_short>Shadow Opacity</_short>
<_long>Drop shadow opacity</_long>
- <default>0.5</default>
+ <default>0.4</default>
<min>0.01</min>
<max>6.0</max>
<precision>0.01</precision>
@@ -100,6 +100,7 @@
<option name="command" type="string">
<_short>Command</_short>
<_long>Decorator command line that is executed if no decorator is already running</_long>
+ <default>/usr/bin/compiz-decorator</default>
</option>
<option name="mipmap" type="bool">
<_short>Mipmap</_short>
Index: compiz-0.9.7.4/plugins/gnomecompat/gnomecompat.xml.in
===================================================================
--- compiz-0.9.7.4.orig/plugins/gnomecompat/gnomecompat.xml.in 2012-03-30 11:57:16.000000000 +0200
+++ compiz-0.9.7.4/plugins/gnomecompat/gnomecompat.xml.in 2012-04-05 12:43:06.247451838 +0200
@@ -52,6 +52,7 @@
<option name="run_command_terminal_key" type="key">
<_short>Open a terminal</_short>
<_long>Open a terminal</_long>
+ <default>&lt;Control&gt;&lt;Alt&gt;T</default>
</option>
</group>
</options>
diff -uNr compiz-0.9.7.8.orig/plugins/place/src/place.cpp compiz-0.9.7.8/plugins/place/src/place.cpp
--- compiz-0.9.7.8.orig/plugins/place/src/place.cpp 2012-04-26 07:47:01.000000000 +0100
+++ compiz-0.9.7.8/plugins/place/src/place.cpp 2012-05-11 18:15:22.023909137 +0100
@@ -228,12 +228,15 @@
w = screen->findWindow (event->xproperty.window);
if (w)
{
- mStrutWindows.remove (w);
- /* Only do when handling screen size change.
- ps->strutWindowCount is 0 at any other time */
- if (mStrutWindows.empty ())
- doHandleScreenSizeChange (screen->width (),
- screen->height ()); /* 2nd pass */
+ if (!mStrutWindows.empty ())
+ {
+ mStrutWindows.remove (w);
+ /* Only do when handling screen size change.
+ ps->strutWindowCount is 0 at any other time */
+ if (mStrutWindows.empty ())
+ doHandleScreenSizeChange (screen->width (),
+ screen->height ()); /* 2nd pass */
+ }
}
}
}
#################################
#
# Backend
#
#################################
# Backend to use: "xrender" or "glx".
# GLX backend is typically much faster but depends on a sane driver.
backend = "glx";
# Needed on some systems to avoid delay in changes of screen contents. (e.g. Pluma)
xrender-sync = true;
xrender-sync-fence = true;
# GLX backend: Avoid using stencil buffer, useful if you don’t have a stencil buffer.
glx-no-stencil = true;
# GLX backend: Copy unmodified regions from front buffer instead of redrawing them all.
# My tests with nvidia-drivers show a 10% decrease in performance when the whole screen is modified,
# but a 20% increase when only 1/4 is.
# My tests on nouveau show terrible slowdown.
# Useful with --glx-swap-method, as well.
glx-copy-from-front = false;
# GLX backend: Use MESA_copy_sub_buffer to do partial screen update.
# My tests on nouveau shows a 200% performance boost when only 1/4 of the screen is updated.
# May break VSync and is not available on some drivers.
# Overrides --glx-copy-from-front.
# glx-use-copysubbuffermesa = true;
# GLX backend: Avoid rebinding pixmap on window damage.
# Probably could improve performance on rapid window content changes, but is known to break things on some drivers (LLVMpipe).
# Recommended if it works.
# glx-no-rebind-pixmap = true;
# GLX backend: GLX buffer swap method we assume.
# Could be undefined (0), copy (1), exchange (2), 3-6, or buffer-age (-1).
# undefined is the slowest and the safest, and the default value.
# copy is fastest, but may fail on some drivers,
# 2-6 are gradually slower but safer (6 is still faster than 0).
# Usually, double buffer means 2, triple buffer means 3.
# buffer-age means auto-detect using GLX_EXT_buffer_age, supported by some drivers.
# Useless with --glx-use-copysubbuffermesa.
# Partially breaks --resize-damage.
# Defaults to undefined.
glx-swap-method = "undefined";
#################################
#
# Shadows
#
#################################
# Enabled client-side shadows on windows.
shadow = true;
# Don't draw shadows on DND windows.
no-dnd-shadow = true;
# Avoid drawing shadows on dock/panel windows.
no-dock-shadow = true;
# Zero the part of the shadow's mask behind the window. Fix some weirdness with ARGB windows.
clear-shadow = false;
# The blur radius for shadows. (default 12)
shadow-radius = 10;
# The left offset for shadows. (default -15)
shadow-offset-x = -12;
# The top offset for shadows. (default -15)
shadow-offset-y = -12;
# The translucency for shadows. (default .75)
shadow-opacity = 0.4;
# Set if you want different colour shadows
# shadow-red = 0.0;
# shadow-green = 0.0;
# shadow-blue = 0.0;
# The shadow exclude options are helpful if you have shadows enabled. Due to the way compton draws its shadows, certain applications will have visual glitches
# (most applications are fine, only apps that do weird things with xshapes or argb are affected).
# This list includes all the affected apps I found in my testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this prevents a visual glitch with the XFWM alt tab switcher.
shadow-exclude = [
"! name~=''",
"name = 'Notification'",
"name = 'Plank'",
"name = 'Docky'",
"name = 'Kupfer'",
"name = 'xfce4-notifyd'",
"name *= 'VLC'",
"name *= 'compton'",
"name *= 'Firefox'",
"name *= 'IceCat'",
"name *= 'Totem'",
"name *= 'XBMC'",
"class_g = 'Conky'",
"class_g = 'Kupfer'",
"class_g = 'Synapse'",
"class_g ?= 'Notify-osd'",
"class_g ?= 'Cairo-dock'",
"class_g ?= 'Xfce4-notifyd'",
"class_g ?= 'Xfce4-power-manager'",
"_GTK_FRAME_EXTENTS@:c"
];
# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
shadow-ignore-shaped = false;
#################################
#
# Opacity
#
#################################
menu-opacity = 1;
inactive-opacity = 1;
active-opacity = 1;
frame-opacity = 1;
inactive-opacity-override = false;
alpha-step = 0.06;
# Dim inactive windows. (0.0 - 1.0)
# inactive-dim = 0.2;
# Do not let dimness adjust based on window opacity.
# inactive-dim-fixed = true;
# Blur background of transparent windows. Bad performance with X Render backend. GLX backend is preferred.
# blur-background = true;
# Blur background of opaque windows with transparent frames as well.
# blur-background-frame = true;
# Do not let blur radius adjust based on window opacity.
blur-background-fixed = false;
blur-background-exclude = [
"window_type = 'dock'",
"window_type = 'desktop'"
];
#################################
#
# Fading
#
#################################
# Fade windows during opacity changes.
fading = true;
# The time between steps in a fade in milliseconds. (default 10).
fade-delta = 4;
# Opacity change between steps while fading in. (default 0.028).
fade-in-step = 0.03;
# Opacity change between steps while fading out. (default 0.03).
fade-out-step = 0.03;
# Fade windows in/out when opening/closing
# no-fading-openclose = true;
# Specify a list of conditions of windows that should not be faded.
fade-exclude = [ " window_type *= 'menu'" ];
#################################
#
# Other
#
#################################
# Try to detect WM windows and mark them as active.
mark-wmwin-focused = true;
# Mark all non-WM but override-redirect windows active (e.g. menus).
mark-ovredir-focused = true;
# Use EWMH _NET_WM_ACTIVE_WINDOW to determine which window is focused instead of using FocusIn/Out events.
# Usually more reliable but depends on a EWMH-compliant WM.
use-ewmh-active-win = true;
# Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on.
detect-rounded-corners = true;
# Detect _NET_WM_OPACITY on client windows, useful for window managers not passing _NET_WM_OPACITY of client windows to frame windows.
# This prevents opacity being ignored for some apps.
# For example without this enabled my xfce4-notifyd is 100% opacity no matter what.
detect-client-opacity = true;
# Specify refresh rate of the screen.
# If not specified or 0, compton will try detecting this with X RandR extension.
refresh-rate = 0;
# Set VSync method. VSync methods currently available:
# none: No VSync
# drm: VSync with DRM_IOCTL_WAIT_VBLANK. May only work on some drivers.
# opengl: Try to VSync with SGI_video_sync OpenGL extension. Only work on some drivers.
# opengl-oml: Try to VSync with OML_sync_control OpenGL extension. Only work on some drivers.
# opengl-swc: Try to VSync with SGI_swap_control OpenGL extension. Only work on some drivers. Works only with GLX backend. Known to be most effective on many drivers. Does not actually control paint timing, only buffer swap is affected, so it doesn’t have the effect of --sw-opti unlike other methods. Experimental.
# opengl-mswc: Try to VSync with MESA_swap_control OpenGL extension. Basically the same as opengl-swc above, except the extension we use.
# (Note some VSync methods may not be enabled at compile time.)
vsync = "opengl";
# Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing.
# Reported to have no effect, though.
dbe = false;
# Painting on X Composite overlay window. Recommended.
paint-on-overlay = true;
# Limit compton to repaint at most once every 1 / refresh_rate second to boost performance.
# This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already,
# unless you wish to specify a lower refresh rate than the actual value.
sw-opti = false;
# Unredirect all windows if a full-screen opaque window is detected, to maximize performance for full-screen windows, like games.
# Known to cause flickering when redirecting/unredirecting windows.
# paint-on-overlay may make the flickering less obvious.
unredir-if-possible = true;
# Specify a list of conditions of windows that should always be considered focused.
focus-exclude = [ ];
# Use WM_TRANSIENT_FOR to group windows, and consider windows in the same group focused at the same time.
detect-transient = true;
# Use WM_CLIENT_LEADER to group windows, and consider windows in the same group focused at the same time.
# WM_TRANSIENT_FOR has higher priority if --detect-transient is enabled, too.
detect-client-leader = true;
#################################
#
# Window type settings
#
#################################
wintypes:
{
tooltip =
{
# fade: Fade the particular type of windows.
fade = true;
# shadow: Give those windows shadow
shadow = false;
# opacity: Default opacity for the type of windows.
opacity = 1;
# focus: Whether to always consider windows of this type focused.
focus = true;
};
};
diff -ruN src-old/connman-dbus.conf src/connman-dbus.conf
--- src-old/connman-dbus.conf 2011-11-08 15:29:09.000000000 +0000
+++ src/connman-dbus.conf 2011-11-08 15:28:11.000000000 +0000
@@ -9,8 +9,15 @@
</policy>
<policy at_console="true">
<allow send_destination="net.connman"/>
+ <allow send_interface="net.connman.Agent"/>
+ <allow send_interface="net.connman.Counter"/>
+ <allow send_interface="net.connman.Manager"/>
</policy>
<policy context="default">
+ <deny own="net.connman"/>
<deny send_destination="net.connman"/>
+ <deny send_interface="net.connman.Agent"/>
+ <deny send_interface="net.connman.Counter"/>
+ <deny send_interface="net.connman.Manager"/>
</policy>
</busconfig>
diff -Nru console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer
--- console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer 2021-07-23 22:45:19.000000000 -0500
+++ console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer 2022-12-17 18:07:01.460681582 -0600
@@ -21,9 +21,8 @@
if ! db_get oem-config/enable || [ "$RET" != true ]; then
# create the required templates
debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb
-
- # mark the questions as seen
- for template in \## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
+ for template in \
+## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
do
echo keyboard-configuration $template seen true
done | chroot /target debconf-set-selections
File added
Description: Fix FTBFS in cwidget as well as in aptitude due to missing #include <pthread.h>
Author: Paul Wise <pabs@debian.org>
Reviewed-By: Axel Beckert <abe@debian.org>
Bug-Debian: https://bugs.debian.org/1015925
Bug: https://bugs.debian.org/1015925
--- a/src/cwidget/generic/threads/threads.h
+++ b/src/cwidget/generic/threads/threads.h
@@ -26,6 +26,7 @@
#define THREADS_H
#include <errno.h>
+#include <pthread.h>
#include <cwidget/generic/util/exception.h>
namespace cwidget
diff --git a/build/Makefile b/build/Makefile
index c073a32..cace03d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -431,6 +431,12 @@ endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
ifdef KERNELVERSION
+ifneq ($(DEB_HOST_ARCH),ppc64el)
+ find $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ -name "ld-linux*" | xargs -r chmod 755
+endif
+ifeq ($(DEB_HOST_ARCH),ppc64el)
+ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld*.so*
+endif
# Set up modules.dep, ensure there is at least one standard dir (kernel
# in this case), so depmod will use its prune list for archs with no
# modules.