diff --git a/Makefile b/Makefile index b12622c..f0754e7 100755 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ all: # basicwallpaper (cd common/basicwallpaper && mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release && make) # Lubuntu OEM setup stuff - (cd lubuntu && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/xsessions && mkdir -p usr/libexec && mkdir -p etc && mkdir -p usr/share/applications) + (cd lubuntu && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/xsessions && mkdir -p usr/libexec && mkdir -p etc && mkdir -p usr/share/applications && mkdir -p home/oem/Desktop) (cp lubuntu/calamares-logs-helper lubuntu/oemconfig/usr/bin/) (cp lubuntu/oem/sddm.conf lubuntu/oemconfig/etc/) (cp lubuntu/oem/sudoers.oem lubuntu/oemconfig/etc/ && chmod 400 lubuntu/oemconfig/etc/sudoers.oem) @@ -25,9 +25,10 @@ all: (cp lubuntu/oem/lubuntu-oem-env/lubuntu-oem-environment.desktop lubuntu/oemconfig/usr/share/xsessions/) (cp lubuntu/oem/lubuntu-oem-env/start-lubuntu-oem-env lubuntu/oemconfig/usr/libexec/) (cp common/basicwallpaper/build/basicwallpaper lubuntu/oemconfig/usr/bin/) + (cp lubuntu/oem/calamares-finish-oem.desktop lubuntu/oemconfig/home/oem/Desktop/) (fakeroot bash -c "chown -R root:root lubuntu/oemconfig && tar cvzf lubuntu/oemconfig.tar.gz lubuntu/oemconfig") # Kubuntu OEM setup stuff - (cd kubuntu && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/xsessions && mkdir -p usr/libexec && mkdir -p etc && mkdir -p usr/share/applications) + (cd kubuntu && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/xsessions && mkdir -p usr/libexec && mkdir -p etc && mkdir -p usr/share/applications && mkdir -p home/oem/Desktop) (cp kubuntu/calamares-logs-helper kubuntu/oemconfig/usr/bin/) (cp kubuntu/oem/sddm.conf kubuntu/oemconfig/etc/) (cp kubuntu/oem/sudoers.oem kubuntu/oemconfig/etc/ && chmod 400 kubuntu/oemconfig/etc/sudoers.oem) @@ -40,9 +41,10 @@ all: (cp kubuntu/oem/kubuntu-oem-env/kubuntu-oem-environment.desktop kubuntu/oemconfig/usr/share/xsessions/) (cp kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env kubuntu/oemconfig/usr/libexec/) (cp common/basicwallpaper/build/basicwallpaper kubuntu/oemconfig/usr/bin/) + (cp kubuntu/oem/calamares-finish-oem.desktop kubuntu/oemconfig/home/oem/Desktop/) (fakeroot bash -c "chown -R root:root kubuntu/oemconfig && tar cvzf kubuntu/oemconfig.tar.gz kubuntu/oemconfig") # Ubuntu Unity OEM setup stuff - (cd ubuntuunity && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/xsessions && mkdir -p usr/libexec && mkdir -p etc/lightdm && mkdir -p usr/share/applications) + (cd ubuntuunity && mkdir oemconfig && cd oemconfig && mkdir -p usr/bin && mkdir -p etc/calamares && mkdir -p usr/share/xsessions && mkdir -p usr/libexec && mkdir -p etc/lightdm && mkdir -p usr/share/applications && mkdir -p home/oem/Desktop) (cp ubuntuunity/calamares-logs-helper ubuntuunity/oemconfig/usr/bin/) (cp ubuntuunity/oem/lightdm.conf ubuntuunity/oemconfig/etc/lightdm/) (cp ubuntuunity/oem/sudoers.oem ubuntuunity/oemconfig/etc/ && chmod 400 kubuntu/oemconfig/etc/sudoers.oem) @@ -55,6 +57,7 @@ all: (cp ubuntuunity/oem/ubuntu-unity-oem-env/ubuntu-unity-oem-environment.desktop ubuntuunity/oemconfig/usr/share/xsessions/) (cp ubuntuunity/oem/ubuntu-unity-oem-env/start-ubuntu-unity-oem-env ubuntuunity/oemconfig/usr/libexec/) (cp common/basicwallpaper/build/basicwallpaper ubuntuunity/oemconfig/usr/bin/) + (cp ubuntuunity/oem/calamares-finish-oem.desktop ubuntuunity/oemconfig/home/oem/Desktop/) (fakeroot bash -c "chown -R root:root ubuntuunity/oemconfig && tar cvzf ubuntuunity/oemconfig.tar.gz ubuntuunity/oemconfig") # Get rid of the unnecessary files find lubuntu/ -type f -iname "*.in" | xargs rm -f diff --git a/debian/changelog b/debian/changelog index c03fd39..ce3eba7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (1:24.04.34) noble; urgency=medium + + * Add icon on Desktop to finish OEM install. (LP: #2060928) + + -- Walter Lapchynski Fri, 19 Apr 2024 19:18:59 +0000 + calamares-settings-ubuntu (1:24.04.33) noble; urgency=medium * Fix slideshow image sizes for Kubuntu.