Makefile

@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
-all:
+all: install
 	make -C src/usr/share/xsessions/po/
 	rm -rf src/usr/share/xsessions/po/ src/usr/share/xsessions/*.in
+
+install:
+	mkdir -pv $(DESTDIR)
+	cp -a src/etc src/usr $(DESTDIR)/.
+
+# vim:ts=4

debian/changelog

@@ -1,130 +1,3 @@
-lubuntu-default-settings (25.04.12) plucky; urgency=medium
-
-  * Change menu file to -compact to improve preferences display. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Sun, 23 Mar 2025 01:11:36 +0000
-
-lubuntu-default-settings (25.04.11) plucky; urgency=medium
-
-  * Rename LXQt Modules to match those being superceded (LP: #2103824) 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 21 Mar 2025 18:42:31 +0000
-
-lubuntu-default-settings (25.04.10) plucky; urgency=medium
-
-  * Added Comment to Picom LXQt module so executable shown in tooltip. 
-  * Added LXQt Modules for the following (LP: #2059346):
-    * Bluetooth Manager (blueman)
-    * Lubuntu Update
-    * Clipboard Manager (qlipper)
-    * Screensaver (xscreensaver)
-    * Network Manager (nm-tray)
-    * Print Manager (print-applet)
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Sun, 16 Mar 2025 20:45:11 +0000
-
-lubuntu-default-settings (25.04.9) plucky; urgency=medium
-
-  * Create a LXQt module for Picom. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Tue, 11 Mar 2025 02:35:31 +0000
-
-lubuntu-default-settings (25.04.8) plucky; urgency=medium
-
-  * Add explicit configuration for SDDM. 
-  * Prohibit virtual keyboard on SDDM. (LP: #2091958)
-  * Add explicit configuration for Picom. (LP: #2100464)
-  * Remove Firefox from quicklaunch. 
-  * Add more sane defaults for fancymenu. 
-  * Populate favorites in fancymenu.
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Wed, 05 Mar 2025 02:54:39 +0000
-
-lubuntu-default-settings (25.04.7) plucky; urgency=medium
-
-  * Add a default Neochat configuration file, for future switching.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 17 Feb 2025 00:52:10 -0600
-
-lubuntu-default-settings (25.04.6) plucky; urgency=medium
-
-  * Update shortcuts for fancymenu change. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 14 Feb 2025 07:41:54 +0000
-
-lubuntu-default-settings (25.04.5) plucky; urgency=medium
-
-  * Replace mainmenu with fancymenu in panel.
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Wed, 12 Feb 2025 07:19:00 +0000
-
-lubuntu-default-settings (25.04.4) plucky; urgency=medium
-
-  * Tone down the foreground a bit. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 07 Feb 2025 09:17:45 +0000
-
-lubuntu-default-settings (25.04.3) plucky; urgency=medium
-
-  * Spin off the Ubuntu color scheme into a Lubuntu color scheme and default
-    to that.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 31 Jan 2025 11:13:15 -0600
-
-lubuntu-default-settings (25.04.2) plucky; urgency=medium
-
-  * Default to the Ubuntu color scheme for QTerminal.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 11 Dec 2024 02:03:08 -0600
-
-lubuntu-default-settings (25.04.1) plucky; urgency=medium
-
-  * Welcome to Plucky Puffin!
-  * Remove snap-installation-monitor (LP: #2061318).
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 Oct 2024 19:47:26 -0500
-
-lubuntu-default-settings (24.10.1) oracular; urgency=medium
-
-  [ Aaron Rainbolt ]
-  * Fix theming. (LP: #2080442)
-
-  [ Simon Quigley ]
-  * Switch back to qpdfview from okular.
-  * Port snap-installation-monitor to Qt 6.
-  * Switch to the Qt 6 LibreOffice frontend.
-  * Bump Standards-version to 4.7.0, no changes needed.
-  * Various Lintian complaints.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 11 Sep 2024 19:12:04 -0500
-
-lubuntu-default-settings (24.04.11) noble; urgency=medium
-
-  * Do not show an actual popup, just the notification for the snap monitor.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 17 Apr 2024 22:27:23 -0500
-
-lubuntu-default-settings (24.04.10) noble; urgency=medium
-
-  * Do not show hibernate option in the menu. (LP: #1902497)
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Tue, 16 Apr 2024 23:28:56 +0000
-
-lubuntu-default-settings (24.04.9) noble; urgency=medium
-
-  * Create lubuntu-snap-installation-monitor, which tells the user if snaps
-    are still being pre-seeded in the background. Mostly used in the case of
-    preseeding a lot of snaps, or preseeding snaps on a slower machine
-    (LP: #2045580, LP: #2061318).
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 14 Apr 2024 15:49:12 -0500
-
-lubuntu-default-settings (24.04.8) noble; urgency=medium
-
-  * Don't decorate firmware-updater, it comes with its own (LP: #2061307).
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 14 Apr 2024 12:44:19 -0500
-
 lubuntu-default-settings (24.04.7) noble; urgency=medium
 
   * Removing outdated Openbox configs. (LP: #2059845)

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Build-Depends: debhelper-compat (= 13), intltool
-Standards-Version: 4.7.0
+Standards-Version: 4.6.2
 Homepage: https://lubuntu.me
 Vcs-Browser: https://git.launchpad.net/lubuntu-default-settings?h=master
 Vcs-Git: https://git.launchpad.net/lubuntu-default-settings
@@ -18,11 +18,7 @@ Depends: fonts-ubuntu,
          lxqt-session,
          openbox,
          policykit-desktop-privileges,
-         qt6-style-kvantum,
-         qt6-style-kvantum-l10n,
          ${misc:Depends}
-Recommends: breeze-gtk-theme,
+Recommends: breeze-gtk-theme
-            qt6-style-kvantum-themes
 Description: default settings for Lubuntu
- Various system settings tailored for Lubuntu's default session. This includes
+ Various system settings tailored for Lubuntu.
- default settings, applications, and themes.

debian/install

@@ -1,3 +0,0 @@
-src/etc/* /etc/
-src/usr/lib /usr
-src/usr/share /usr/

debian/lintian-overrides

@@ -1,3 +0,0 @@
-# These desktop files are not meant to be user-visible; ignore these flags
-lubuntu-default-settings: desktop-entry-lacks-icon-entry [usr/share/xsessions/Lubuntu.desktop]
-lubuntu-default-settings: desktop-entry-lacks-keywords-entry [usr/share/xsessions/Lubuntu.desktop]

debian/rules

@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 %:
 	dh $@
+
+override_dh_auto_build:
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp

src/etc/sddm.conf.d/lubuntu_settings.conf

@@ -1,5 +0,0 @@
-[General]
-InputMethod=
-
-[Theme]
-Current=lubuntu

src/etc/xdg/xdg-Lubuntu/Kvantum/kvantum.kvconfig

@@ -1,2 +0,0 @@
-[General]
-theme=Lubuntu

src/etc/xdg/xdg-Lubuntu/autostart/blueman.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Bluetooth Manager
-Comment=blueman-applet
-Exec=blueman-applet
-Type=Application
-X-LXQt-Module=true

src/etc/xdg/xdg-Lubuntu/autostart/lubuntu-update-autostart.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Lubuntu Update
-Comment=lubuntu-update
-Exec=/usr/bin/lubuntu-update
-Type=Application
-X-LXQt-Module=true

src/etc/xdg/xdg-Lubuntu/autostart/lxqt-qlipper-autostart.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Clipboard Manager
-Comment=qlipper
-Exec=qlipper
-Type=Application
-X-LXQt-Need-Tray=true
-X-LXQt-Module=true

src/etc/xdg/xdg-Lubuntu/autostart/lxqt-xscreensaver-autostart.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Screensaver
-Comment=xscreensaver
-Exec=xscreensaver -no-splash
-Type=Application
-X-LXQt-X11-Only=true
-X-LXQt-Module=true

src/etc/xdg/xdg-Lubuntu/autostart/nm-tray-autostart.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Network Manager
-Comment=nm-tray
-Exec=nm-tray
-Type=Application
-X-LXQt-Need-Tray=true
-X-LXQt-Module=true

src/etc/xdg/xdg-Lubuntu/autostart/picom.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=X Compositor
-Comment=picom
-Exec=picom
-Type=Application
-X-LXQt-Module=true

src/etc/xdg/xdg-Lubuntu/autostart/print-applet.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Print Manager
-Comment=system-config-printer-applet
-Exec=system-config-printer-applet
-Type=Application
-X-LXQt-Module=true

src/etc/xdg/xdg-Lubuntu/lxqt/globalkeyshortcuts.conf

@@ -169,7 +169,7 @@ Exec=lxqt-config-brightness, -i
 [Super_L.32]
 Comment=Show/hide main menu
 Enabled=true
-path=/panel/fancymenu/show_hide
+path=/panel/mainmenu/show_hide
 
 [XF86AudioLowerVolume.33]
 Comment=Decrease sound volume

src/etc/xdg/xdg-Lubuntu/lxqt/lxqt.conf

@@ -10,6 +10,6 @@ cursor_theme=breeze_cursors
 
 [Qt]
 font="Ubuntu,11,-1,5,50,0,0,0,0,0"
-style=kvantum
+style=Breeze
 doubleClickInterval=400
 wheelScrollLines=3

src/etc/xdg/xdg-Lubuntu/lxqt/panel.conf

@@ -1,22 +1,13 @@
 panels=panel1
 
 [panel1]
-plugins=fancymenu, desktopswitch, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock
+plugins=mainmenu, desktopswitch, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock
 position=Bottom
 desktop=0
 
-[fancymenu]
+[mainmenu]
-buttonsAtTop=false
+type=mainmenu
-categoriesAtRight=false
-favorites\1\desktopFile=/usr/share/applications/featherpad.desktop
-favorites\2\desktopFile=/usr/share/applications/lubuntu-update.desktop
-favorites\3\desktopFile=/usr/share/applications/pcmanfm-qt.desktop
-favorites\4\desktopFile=/usr/share/applications/qterminal.desktop
-favorites\size=4
 filterClear=true
-menu_file=/etc/xdg/menus/lxqt-applications-compact.menu
-showText=false
-type=fancymenu
 
 [desktopswitch]
 type=desktopswitch
@@ -24,7 +15,8 @@ type=desktopswitch
 [quicklaunch]
 type=quicklaunch
 apps\1\desktop=/usr/share/applications/pcmanfm-qt.desktop
-apps\size=1
+apps\2\desktop=/var/lib/snapd/desktop/applications/firefox_firefox.desktop
+apps\size=2
 alignment=Left
 
 [taskbar]

src/etc/xdg/xdg-Lubuntu/lxqt/session.conf

@@ -7,7 +7,8 @@ BROWSER=firefox
 GTK_CSD=0
 GTK_OVERLAY_SCROLLING=0
 TERM=qterminal
-SAL_USE_VCLPLUGIN=qt6
+SAL_USE_VCLPLUGIN=qt5
+SAL_VCL_QT5_USE_CAIRO=true
 
 [Mouse]
 cursor_size=18

src/etc/xdg/xdg-Lubuntu/openbox/rc.xml

@@ -739,10 +739,6 @@
         Focus all applications launched
         Usefull when launching applications, like terminal from pcmanfm
   -->
-  <application name="firmware-updater">
-    <decor>no</decor>
-  </application>
-
   <application class="*">
     <focus>yes</focus>
   </application>

src/etc/xdg/xdg-Lubuntu/picom.conf

@@ -1 +0,0 @@
-backend = "xrender";

src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini

@@ -4,7 +4,6 @@ FixedTabWidth=false
 HideTabBarWithOnlyOneTab=true
 fontFamily=Ubuntu Mono
 fontSize=14
-colorScheme=Lubuntu
 
 [MainWindow]
 size=@Size(800 600)

src/usr/share/Lubuntu/applications/lxqt-hibernate.desktop

@@ -1,110 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=lxqt-leave --hibernate
-Icon=system-suspend-hibernate
-Categories=System;X-Leave;
-OnlyShowIn=LXQt;
-NoDisplay=true;
-
-Name=Hibernate
-GenericName=Hibernate the machine
-Comment=Hibernate the machine
-GenericName[ar]=أسبت الجهاز
-Name[ar]=أسبت
-Comment[ar]=أسبت الجهاز
-Name[bg]=Хибернация
-GenericName[bg]=Хибернация на машината
-Comment[bg]=Хибернация на машината
-Name[ca]=Hiberna
-GenericName[ca]=Posa en hibernació la màquina
-Comment[ca]=Posa en hibernació la màquina
-GenericName[cs]=Uspat počítač na disk
-Name[cs]=Uspat na disk
-Comment[cs]=Uspat počítač na disk
-Name[da]=Dvale
-GenericName[da]=Sæt maskinen i dvale
-Comment[da]=Sæt maskinen i dvale
-GenericName[de]=Rechner in Tiefschlaf versetzen
-Name[de]=Tiefschlaf
-Comment[de]=Rechner in Tiefschlaf versetzen
-Name[el]=Νάρκη
-GenericName[el]=Nάρκωση του υπολογιστή
-Comment[el]=Nάρκωση του υπολογιστή
-Name[es]=Hibernar
-GenericName[es]=Hibernar
-Comment[es]=Hibernar el sistema
-Name[et]=Sügavasse unne
-GenericName[et]=Salvesta arvuti olek püsimälusse
-Comment[et]=Salvesta arvuti olek püsimälusse
-Name[eu]=Hibernatu
-GenericName[eu]=Hibernatu ordenagailua
-Comment[eu]=Hibernatu ordenagailua
-Name[fi]=Lepotila
-GenericName[fi]=Siirry lepotilaan
-Comment[fi]=Siirry lepotilaan
-Name[fr]=Hivernation
-GenericName[fr]=Hivernation de l'ordinateur
-Comment[fr]=Hivernation de l'ordinateur
-Name[he]=תרדמת
-GenericName[he]=הרדמת המכונה
-Comment[he]=הרדמת המכונה
-GenericName[hr]=Postavi uređaj u stanje mirovanja
-Name[hr]=Stanje mirovanja
-Comment[hr]=Postavi uređaj u stanje mirovanja
-GenericName[hu]=A számítógép hibernálása
-Name[hu]=Hibernálás
-Comment[hu]=A számítógép hibernálása
-Name[it]=Iberna
-GenericName[it]=Ibernare il computer
-Comment[it]=Ibernare il computer
-Name[ja]=ハイバネート
-GenericName[ja]=PC を休止状態にします
-Comment[ja]=PC を休止状態にします
-Name[kk]=Гибернациялау
-GenericName[kk]=Компьютерді гибернациялау
-Comment[kk]=Компьютерді гибернациялау
-Name[ko]=최대 절전모드
-GenericName[ko]=시스템을 최대 절전모드로 전환
-Comment[ko]=시스템을 최대 절전모드로 전환
-Name[lt]=Užmigdyti
-GenericName[lt]=Užmigdyti kompiuterį
-Comment[lt]=Užmigdyti kompiuterį
-Name[nb_NO]=Dvalemodus
-GenericName[nb_NO]=Sett maskinen i dvalemodus
-Comment[nb_NO]=Sett maskinen i dvalemodus
-Name[nl]=Slaapstand
-GenericName[nl]=Zet de computer in de slaapstand
-Comment[nl]=Zet de computer in de slaapstand
-Name[oc]=Ivernar
-GenericName[oc]=Far ivernar la maquina
-Comment[oc]=Far ivernar la maquina
-Name[pl]=Hibernuj
-GenericName[pl]=Hibernuj komputer
-Comment[pl]=Hibernuj komputer
-Name[pt]=Hibernar
-GenericName[pt]=Hibernar o computador
-Comment[pt]=Hibernar o computador
-Name[ru]=Спящий режим
-GenericName[ru]=Перевести компьютер в спящий режим
-Comment[ru]=Перевести компьютер в спящий режим
-Name[sk]=Hibernovať
-GenericName[sk]=Hibernovať
-Comment[sk]=Stav počítača sa uloží na disk a pri zapnutí sa obnoví
-Name[sl]=Hibernacija
-GenericName[sl]=Hiberniraj napravo
-Comment[sl]=Hiberniraj napravo
-Name[tr]=Uykuya Al
-GenericName[tr]=bilgisayarı uykuya alın
-Comment[tr]=bilgisayarı uykuya alın
-Name[uk]=Приспати
-GenericName[uk]=Приспати комп'ютер
-Comment[uk]=Приспати комп'ютер
-Name[vi]=Ngủ đông
-GenericName[vi]=Ngủ đông máy tính
-Comment[vi]=Ngủ đông máy tính
-Name[zh_CN]=休眠
-GenericName[zh_CN]=休眠计算机
-Comment[zh_CN]=休眠计算机
-Name[zh_TW]=休眠
-GenericName[zh_TW]=電腦休眠
-Comment[zh_TW]=電腦休眠

src/usr/share/Lubuntu/applications/lxqt-mimeapps.list

@@ -1,2 +1,2 @@
 [Default Applications]
-application/pdf=qpdfview.desktop
+application/pdf=okularApplication_pdf.desktop

src/usr/share/Lubuntu/applications/mimeapps.list

@@ -1,2 +1,2 @@
 [Added Associations]
-application/pdf=qpdfview.desktop
+application/pdf=okularApplication_pdf.desktop

src/usr/share/qtermwidget6/color-schemes/Lubuntu.colorscheme

@@ -1,67 +0,0 @@
-[General]
-Description=Lubuntu
-Opacity=1
-Wallpaper=
-
-[Background]
-Color=00,00,44
-MaxRandomHue=0
-MaxRandomSaturation=0
-MaxRandomValue=0
-
-[BackgroundIntense]
-Color=48,10,36
-
-[Color0]
-Color=46,52,54
-
-[Color0Intense]
-Color=85,87,83
-
-[Color1]
-Color=204,0,0
-
-[Color1Intense]
-Color=239,41,41
-
-[Color2]
-Color=78,154,6
-
-[Color2Intense]
-Color=138,226,52
-
-[Color3]
-Color=196,160,0
-
-[Color3Intense]
-Color=252,233,79
-
-[Color4]
-Color=52,101,164
-
-[Color4Intense]
-Color=114,159,207
-
-[Color5]
-Color=117,80,123
-
-[Color5Intense]
-Color=173,127,168
-
-[Color6]
-Color=6,152,154
-
-[Color6Intense]
-Color=52,226,226
-
-[Color7]
-Color=211,215,207
-
-[Color7Intense]
-Color=238,238,236
-
-[Foreground]
-Color=195,195,195
-
-[ForegroundIntense]
-Color=255,255,255