From 2c902b34789d65093782fd4f6d3570d266124e43 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 14 May 2018 20:35:12 -0500 Subject: [PATCH] Clean up unnecessary scripts and install files. --- Makefile | 8 +----- debian/changelog | 36 ++++++++++++------------ debian/control | 15 ++-------- debian/light-locker.desktop | 2 -- debian/lubuntu-default-session.install | 1 - debian/lubuntu-default-settings.dirs | 1 - debian/lubuntu-default-settings.install | 25 ---------------- debian/lubuntu-default-settings.links | 1 - debian/lubuntu-default-settings.postinst | 26 ----------------- debian/lubuntu-default-settings.postrm | 14 --------- debian/lubuntu-default-settings.preinst | 14 --------- debian/lubuntu-default-settings.prerm | 10 ------- debian/lubuntu-extra-sessions.install | 12 -------- debian/maintscript | 5 ---- debian/qlubuntu-default-session.install | 1 - debian/rules | 3 -- 16 files changed, 21 insertions(+), 153 deletions(-) delete mode 100644 debian/light-locker.desktop delete mode 100644 debian/lubuntu-default-session.install delete mode 100644 debian/lubuntu-default-settings.dirs delete mode 100644 debian/lubuntu-default-settings.install delete mode 100644 debian/lubuntu-default-settings.links delete mode 100644 debian/lubuntu-default-settings.postinst delete mode 100644 debian/lubuntu-default-settings.postrm delete mode 100644 debian/lubuntu-default-settings.preinst delete mode 100644 debian/lubuntu-default-settings.prerm delete mode 100644 debian/lubuntu-extra-sessions.install delete mode 100644 debian/maintscript delete mode 100644 debian/qlubuntu-default-session.install diff --git a/Makefile b/Makefile index 5991316..d302e69 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,11 @@ #!/usr/bin/make -f -SUBDIRS := usr/share/applications/po usr/share/xsessions/po - all: install install: mkdir -pv $(DESTDIR) cp -a src/etc src/usr $(DESTDIR)/. - # po generation - for i in $(SUBDIRS); do \ - make -C $(DESTDIR)/$$i; \ - rm -rf $(DESTDIR)/$$i; \ - done + # remove some remaining files find $(DESTDIR) -type f -iname "*.in" | xargs rm -f diff --git a/debian/changelog b/debian/changelog index ff9134f..14e1357 100644 --- a/debian/changelog +++ b/debian/changelog @@ -214,7 +214,7 @@ lubuntu-default-settings (0.41) utopic; urgency=medium - Fix lubuntu-logout shortcut to be compatible also with lxpanel 0.7.0. - Add xfce-power-manager plugin. - Remove xcb plugin since ibus is launched by default and has an icon for - switching keyboard layout. + switching keyboard layout. -- Julien Lavergne Thu, 11 Sep 2014 13:56:18 +0200 @@ -290,7 +290,7 @@ lubuntu-default-settings (0.37) trusty; urgency=low lubuntu-default-settings (0.36) trusty; urgency=low - * debian/20-* & debian/*.postrm & debian/*.postinst & + * debian/20-* & debian/*.postrm & debian/*.postinst & debian/*default-session.install: - Use lightdm conf files to set default session (LP: #1259525). * debian/control: @@ -340,11 +340,11 @@ lubuntu-default-settings (0.33) saucy; urgency=low * usr/share/lxpanel/Lubuntu - Enable xkb plugin by default for switching keyboard layout. * usr/share/lubuntu/openbox - - Fix transmission menu item (LP: #1193055) + - Fix transmission menu item (LP: #1193055) * etc/xdg/lxsession/QLubuntu/desktop.conf - Fix launch of razor-panel * etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf - - Update with new upstream version. + - Update with new upstream version. * /usr/share/lubuntu/openbox/*rc.xml - lxsession-default lock instead of xscreensaver (LP: #1204052) * etc/xdg/lxsession/*/conffiles.conf @@ -355,7 +355,7 @@ lubuntu-default-settings (0.33) saucy; urgency=low lubuntu-default-settings (0.32) saucy; urgency=low [ Julien Lavergne ] - * Add a new QLubuntu session, by using only Qt applications + * Add a new QLubuntu session, by using only Qt applications * usr/bin/start* - Remove gnome-keyring workaround, since we have the proper fix for ssh. * Use x-www-browser and x-terminal-emulator in more places. @@ -404,7 +404,7 @@ lubuntu-default-settings (0.30) raring; urgency=low - Add a custom configuration file for lxterminal. - Use Ubuntu font in lxterminal. * usr/bin/startlubuntu* - - Install the lxterminal configuration file. + - Install the lxterminal configuration file. - Workaround ssh agent not autostarted properly. * usr/share/lubuntu/openbox/rc.xml - Add shortcuts for windows tiling (SuperKey + the direction). @@ -529,7 +529,7 @@ lubuntu-default-settings (0.23) precise; urgency=low - Add a rule to maximize all new windows with type normal. - Place new windows on the monitor with the mouse, rather than the primary monitor. - - Use scrot -u -b (focused window with border) for the screenshot of the + - Use scrot -u -b (focused window with border) for the screenshot of the current window. - Add a shortcut for the power button. - Use horizontal presentation of the alt-tab. @@ -590,13 +590,13 @@ lubuntu-default-settings (0.20) oneiric; urgency=low [ Julien Lavergne ] * usr/share/lubuntu/openbox/rc.xml - - Add Super_L, Super_R and ALt-F1 to keybindings for opening the menu. + - Add Super_L, Super_R and ALt-F1 to keybindings for opening the menu. * etc/xdg/lxsession/*/autostart: - Don't autostart nm-applet, should be autostarted automatically. - Use xfce4-power-manager instead of gnome-power-manager which depends now on gnome-settings-daemon. * etc/xdg/lubuntu/lxdm/lxdm.conf: - - Update with version in lxdm 0.4.0. + - Update with version in lxdm 0.4.0. -- Julien Lavergne Thu, 28 Jul 2011 23:42:29 +0200 @@ -675,10 +675,10 @@ lubuntu-default-settings (0.14) natty; urgency=low -- Julien Lavergne Tue, 09 Nov 2010 22:53:38 +0100 lubuntu-default-settings (0.13) maverick; urgency=low - + * debian/postinst: - Don't fail if the alternative file doesn't exist. (LP: #654211) - + -- Julien Lavergne Mon, 04 Oct 2010 23:16:56 +0200 lubuntu-default-settings (0.12) maverick; urgency=low @@ -725,7 +725,7 @@ lubuntu-default-settings (0.8) maverick; urgency=low - Depends on the re-written pcmanfm (>= 0.9.5). * usr/share/lubuntu/openbox/menu.xml: - Use new command to launch desktop settings. - * autostart: + * autostart: - Use new pcmanfm --desktop command to start pcmanfm with desktop management -- Julien Lavergne Wed, 02 Jun 2010 01:28:01 +0200 @@ -749,7 +749,7 @@ lubuntu-default-settings (0.6) lucid; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. - * usr/bin/start* : + * usr/bin/start* : - From LXDE upstream, make sure dbus is launched when it's necessary. - Add polkit-gnome-authentification-agent-1 to make polkit working again. * Add custom defaults.list for applications by default. @@ -770,7 +770,7 @@ lubuntu-default-settings (0.5) lucid; urgency=low * Complete openbox keybindings for taking screenshot. Thanks Adam for the patch. * Switch to Lubuntu custom theme : - - debian/control : Depends on lubuntu-artwork (>= 0.4) and + - debian/control : Depends on lubuntu-artwork (>= 0.4) and elementary-icon-theme. - desktop.conf : Use elementary-monochrome for icon theme. - Use Clearlooks for Openbox theme. @@ -784,7 +784,7 @@ lubuntu-default-settings (0.4) lucid; urgency=low * Use openbox menu on the desktop indead of pcmanfm one. * Install configuration file for QT apps if no one is installed, and set QT style=GTK+. - * Merge Leszek Lesner openbox settings. + * Merge Leszek Lesner openbox settings. -- Julien Lavergne Sun, 24 Jan 2010 19:57:14 +0100 @@ -794,15 +794,15 @@ lubuntu-default-settings (0.3) lucid; urgency=low Bump depends on lxsession to >= 0.4.1 to use this feature. * Remove autostart for lxde-settings-daemon, it merged with lxsession. * Change path to the wallpaper to a png file rather than a jpg. Bump depends - on lubuntu-artwork (>= 0.3) + on lubuntu-artwork (>= 0.3) -- Julien Lavergne Sun, 13 Dec 2009 11:19:35 +0100 lubuntu-default-settings (0.2) lucid; urgency=low - * Add the volume applet to the panel to have a way to configure + * Add the volume applet to the panel to have a way to configure the sound - * Autostart gnome-power-manager to add power management support and + * Autostart gnome-power-manager to add power management support and the battery icon in notification-area * Set the terminal for pcmanfm to lxterminal * Move lxpanel background for Lubuntu to a specific file. diff --git a/debian/control b/debian/control index bb9352a..c684c71 100644 --- a/debian/control +++ b/debian/control @@ -17,18 +17,7 @@ Depends: lubuntu-artwork, policykit-desktop-privileges, ttf-ubuntu-font-family, ${misc:Depends} -Breaks: lubuntu-default-settings (<< 1.0), lubuntu-extra-sessions (<< 1.0), lubuntu-live-settings (<< 1.0), lubuntu-nexus7-default-session (<< 1.0), lubuntu-nexus7-extra-files (<< 1.0), lxgames-default-session (<< 1.0), qlubuntu-default-session (<< 1.0) -Replaces: lubuntu-default-settings (<< 1.0), lubuntu-extra-sessions (<< 1.0), lubuntu-live-settings (<< 1.0), lubuntu-nexus7-default-session (<< 1.0), lubuntu-nexus7-extra-files (<< 1.0), lxgames-default-session (<< 1.0), qlubuntu-default-session (<< 1.0) +Breaks: lubuntu-default-session (<< 1.0), lubuntu-default-settings (<< 1.0), lubuntu-extra-sessions (<< 1.0), lubuntu-live-settings (<< 1.0), lubuntu-nexus7-default-session (<< 1.0), lubuntu-nexus7-extra-files (<< 1.0), lxgames-default-session (<< 1.0), qlubuntu-default-session (<< 1.0) +Replaces: lubuntu-default-session (<< 1.0), lubuntu-default-settings (<< 1.0), lubuntu-extra-sessions (<< 1.0), lubuntu-live-settings (<< 1.0), lubuntu-nexus7-default-session (<< 1.0), lubuntu-nexus7-extra-files (<< 1.0), lxgames-default-session (<< 1.0), qlubuntu-default-session (<< 1.0) Description: default settings for Lubuntu Various system settings tailored for Lubuntu. - -Package: lubuntu-default-session -Architecture: all -Depends: lubuntu-default-settings, - sddm, - sddm-theme-lubuntu-chooser, - ${misc:Depends} -Breaks: lubuntu-default-session (<< 1.0) -Replaces: lubuntu-default-session (<< 1.0) -Description: set default session to Lubuntu - This package sets the default session to Lubuntu by default. diff --git a/debian/light-locker.desktop b/debian/light-locker.desktop deleted file mode 100644 index e1e3e17..0000000 --- a/debian/light-locker.desktop +++ /dev/null @@ -1,2 +0,0 @@ -[Desktop Entry] -Hidden=true diff --git a/debian/lubuntu-default-session.install b/debian/lubuntu-default-session.install deleted file mode 100644 index 37d228c..0000000 --- a/debian/lubuntu-default-session.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/lightdm/lightdm.conf.d/20-lubuntu.conf diff --git a/debian/lubuntu-default-settings.dirs b/debian/lubuntu-default-settings.dirs deleted file mode 100644 index cc94349..0000000 --- a/debian/lubuntu-default-settings.dirs +++ /dev/null @@ -1 +0,0 @@ -/etc/lxdm diff --git a/debian/lubuntu-default-settings.install b/debian/lubuntu-default-settings.install deleted file mode 100644 index ac8a518..0000000 --- a/debian/lubuntu-default-settings.install +++ /dev/null @@ -1,25 +0,0 @@ -etc/lightdm/ -etc/xdg/lubuntu/applications/ -etc/xdg/lubuntu/libfm/ -etc/xdg/lubuntu/lxdm/ -etc/xdg/lubuntu/lxterminal/ -etc/xdg/lubuntu/menus/lxde-applications.menu -etc/xdg/lubuntu/menus/lxgames-applications.menu -etc/xdg/lxsession/Lubuntu-Netbook/ -etc/xdg/lxsession/Lubuntu/ -etc/xdg/pcmanfm/ -etc/xdg/xdg-Lubuntu/ -usr/bin/ -usr/share/applications/lubuntu-logout.desktop -usr/share/applications/lubuntu-screenlock.desktop -usr/share/gdm/ -usr/share/lubuntu/leafpad/ -usr/share/lubuntu/openbox/menu.xml -usr/share/lubuntu/openbox/rc.xml -usr/share/lubuntu/pcmanfm/ -usr/share/lubuntu/qt/Trolltech.conf -usr/share/lubuntu/xscreensaver/ -usr/share/lxpanel/profile/Lubuntu/ -usr/share/upstart/sessions/ -usr/share/xsessions/Lubuntu.desktop -usr/share/xsessions/QLubuntu.desktop diff --git a/debian/lubuntu-default-settings.links b/debian/lubuntu-default-settings.links deleted file mode 100644 index 1934e5e..0000000 --- a/debian/lubuntu-default-settings.links +++ /dev/null @@ -1 +0,0 @@ -etc/xdg/xdg-Lubuntu etc/xdg/xdg-QLubuntu diff --git a/debian/lubuntu-default-settings.postinst b/debian/lubuntu-default-settings.postinst deleted file mode 100644 index 865ef36..0000000 --- a/debian/lubuntu-default-settings.postinst +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -e - -set -e - -# Remove alternative file if it's not a symlink, workaround for broken upgrade -# See bug #625485 -if [ -f /etc/alternatives/lxdm.conf ] ; then - if [ ! -h "/etc/alternatives/lxdm.conf" ] ; then - rm -f "/etc/alternatives/lxdm.conf" - fi -fi - -if [ "$1" = "configure" ] ; then - update-alternatives --install /etc/lxdm/default.conf \ - lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 -fi - -if dpkg-maintscript-helper supports mv_conffile; then - dpkg-maintscript-helper mv_conffile \ - /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf \ - /etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf \ - 0.44 -- "$@" -fi - -#DEBHELPER# -exit 0 diff --git a/debian/lubuntu-default-settings.postrm b/debian/lubuntu-default-settings.postrm deleted file mode 100644 index 018967e..0000000 --- a/debian/lubuntu-default-settings.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh - -set -e - -if dpkg-maintscript-helper supports mv_conffile; then - dpkg-maintscript-helper mv_conffile \ - /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf \ - /etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf \ - 0.44 -- "$@" -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/lubuntu-default-settings.preinst b/debian/lubuntu-default-settings.preinst deleted file mode 100644 index 018967e..0000000 --- a/debian/lubuntu-default-settings.preinst +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh - -set -e - -if dpkg-maintscript-helper supports mv_conffile; then - dpkg-maintscript-helper mv_conffile \ - /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf \ - /etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf \ - 0.44 -- "$@" -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/lubuntu-default-settings.prerm b/debian/lubuntu-default-settings.prerm deleted file mode 100644 index c287785..0000000 --- a/debian/lubuntu-default-settings.prerm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e - -set -e - -if [ "$1" = "remove" ] ; then - update-alternatives --remove lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf -fi - -#DEBHELPER# -exit 0 diff --git a/debian/lubuntu-extra-sessions.install b/debian/lubuntu-extra-sessions.install deleted file mode 100644 index 1c481f3..0000000 --- a/debian/lubuntu-extra-sessions.install +++ /dev/null @@ -1,12 +0,0 @@ -etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory -etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu -etc/xdg/lubuntu/pcmanfm-qt/ -etc/xdg/lxsession/LX-Games/ -etc/xdg/lxsession/Lubuntu-Nexus7/ -etc/xdg/lxsession/QLubuntu/ -usr/share/lubuntu/openbox/nexus-rc.xml -usr/share/lubuntu/qt/Trolltech-qt-session.conf -usr/share/lxpanel/profile/Lubuntu-Nexus7/ -usr/share/xsessions/lubuntu-nexus7.desktop -usr/share/xsessions/lxgames.desktop -usr/share/xsessions/Lubuntu-Netbook.desktop diff --git a/debian/maintscript b/debian/maintscript deleted file mode 100644 index b430320..0000000 --- a/debian/maintscript +++ /dev/null @@ -1,5 +0,0 @@ -mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -rm_conffile /etc/lightdm/lightdm.conf.d/20-lubuntu.conf 0.40 -rm_conffile /etc/lightdm/lightdm.conf.d/20-lubuntu-nexus7.conf 0.40 -rm_conffile /etc/lightdm/lightdm.conf.d/20-lxgames.conf 0.40 -rm_conffile /etc/lightdm/lightdm.conf.d/20-qlubuntu.conf 0.40 diff --git a/debian/qlubuntu-default-session.install b/debian/qlubuntu-default-session.install deleted file mode 100644 index 78f990d..0000000 --- a/debian/qlubuntu-default-session.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/lightdm/lightdm.conf.d/20-qlubuntu.conf diff --git a/debian/rules b/debian/rules index 716ec0b..2c4b17a 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,3 @@ override_dh_auto_build: $(MAKE) DESTDIR=$(CURDIR)/debian/tmp - -override_dh_missing: - dh_missing --fail-missing