Removing patches 05-openbox-fullscreen.patch, 07-xdg-pcmanfm.patch, 08-xdg-openbox...
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Mon, 1 Sep 2014 15:20:13 +0000 (18:20 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Mon, 1 Sep 2014 15:29:52 +0000 (18:29 +0300)
debian/patches/05-openbox-fullscreen.patch [deleted file]
debian/patches/07-xdg-pcmanfm.patch [deleted file]
debian/patches/08-xdg-openbox.patch [deleted file]
debian/patches/09-xdg-lxpanel.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/05-openbox-fullscreen.patch b/debian/patches/05-openbox-fullscreen.patch
deleted file mode 100644 (file)
index f5c9529..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Changing fullscreen keyboard shortcut from F11 to Alt-F11 to avoid
- interferences with other programs that use F11 for fullscreen,
- such as iceweasel or gnome-terminal (Closes: #591350).
-
-diff -Naurp lxde-common.orig/openbox/rc.xml.in lxde-common/openbox/rc.xml.in
---- lxde-common.orig/openbox/rc.xml.in 2012-05-18 09:56:14.968790509 +0200
-+++ lxde-common/openbox/rc.xml.in      2012-05-18 15:26:56.877724061 +0200
-@@ -277,7 +277,7 @@
-       </action>
-   </keybind>
--  <keybind key="F11">
-+  <keybind key="A-F11">
-      <action name="ToggleFullscreen"/>
-   </keybind>
diff --git a/debian/patches/07-xdg-pcmanfm.patch b/debian/patches/07-xdg-pcmanfm.patch
deleted file mode 100644 (file)
index d5177eb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Correcting location of XDG global configuration file for pcmanfm in startlxde
- (Closes: #650427).
-
-diff -Naurp lxde-common.orig/startlxde.in lxde-common/startlxde.in
---- lxde-common.orig/startlxde.in      2012-05-18 15:27:34.881975959 +0200
-+++ lxde-common/startlxde.in   2012-05-18 15:37:29.349949913 +0200
-@@ -8,7 +8,7 @@ fi
- PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
- if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
-       mkdir -p "$PCMANFM_CONF_DIR"
--      cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
-+      cp /etc/xdg/pcmanfm/LXDE/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
- fi
- # Ensure the existance of openbox config file
diff --git a/debian/patches/08-xdg-openbox.patch b/debian/patches/08-xdg-openbox.patch
deleted file mode 100644 (file)
index a4b1059..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Moving location for openbox configuration files from /usr/share/lxde/openbox
- to XDG global configuration directory in /etc/xdg/openbox/LXDE
- (Closes: #649425).
-
-diff -Naurp lxde-common.orig/Makefile.am lxde-common/Makefile.am
---- lxde-common.orig/Makefile.am       2012-05-18 15:27:34.865976021 +0200
-+++ lxde-common/Makefile.am    2012-05-18 15:49:55.390944636 +0200
-@@ -26,7 +26,7 @@ lxpanel_DATA=lxpanel/config
- lxpanel_paneldir=$(datadir)/lxpanel/profile/LXDE/panels
- lxpanel_panel_DATA=lxpanel/panel
--openboxdir=$(datadir)/lxde/openbox
-+openboxdir=$(sysconfdir)/xdg/openbox/LXDE
- openbox_DATA= \
-       openbox/rc.xml \
-       openbox/menu.xml
-diff -Naurp lxde-common.orig/Makefile.in lxde-common/Makefile.in
---- lxde-common.orig/Makefile.in       2012-05-18 15:27:34.865976021 +0200
-+++ lxde-common/Makefile.in    2012-05-18 15:50:24.763127662 +0200
-@@ -237,7 +237,7 @@ lxpaneldir = $(datadir)/lxpanel/profile/
- lxpanel_DATA = lxpanel/config
- lxpanel_paneldir = $(datadir)/lxpanel/profile/LXDE/panels
- lxpanel_panel_DATA = lxpanel/panel
--openboxdir = $(datadir)/lxde/openbox
-+openboxdir = $(sysconfdir)/xdg/openbox/LXDE
- openbox_DATA = \
-       openbox/rc.xml \
-       openbox/menu.xml
-diff -Naurp lxde-common.orig/startlxde.in lxde-common/startlxde.in
---- lxde-common.orig/startlxde.in      2012-05-18 15:27:34.881975959 +0200
-+++ lxde-common/startlxde.in   2012-05-18 15:49:55.390944636 +0200
-@@ -15,7 +15,7 @@ fi
- OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
- if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then
-       mkdir -p "$OPENBOX_CONF_DIR"
--      cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
-+      cp /etc/xdg/openbox/LXDE/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
- fi
- # Ensure the existance of the 'Desktop' folder
diff --git a/debian/patches/09-xdg-lxpanel.patch b/debian/patches/09-xdg-lxpanel.patch
deleted file mode 100644 (file)
index e1c473c..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Moving location for lxpanel configuration files from /usr/share/lxde/lxpanel
- to XDG global configuration directory in /etc/xdg/lxpanel/LXDE.
-
-diff -Naurp lxde-common.orig/Makefile.am lxde-common/Makefile.am
---- lxde-common.orig/Makefile.am       2012-05-18 15:51:54.027743985 +0200
-+++ lxde-common/Makefile.am    2012-05-18 15:54:04.048612199 +0200
-@@ -20,10 +20,10 @@ images_DATA= \
-       images/logout-banner.png \
-       images/lxde-icon.png
--lxpaneldir=$(datadir)/lxpanel/profile/LXDE
-+lxpaneldir=$(sysconfdir)/xdg/lxpanel/profile/LXDE
- lxpanel_DATA=lxpanel/config
--lxpanel_paneldir=$(datadir)/lxpanel/profile/LXDE/panels
-+lxpanel_paneldir=$(sysconfdir)/xdg/lxpanel/profile/LXDE/panels
- lxpanel_panel_DATA=lxpanel/panel
- openboxdir=$(sysconfdir)/xdg/openbox/LXDE
-diff -Naurp lxde-common.orig/Makefile.in lxde-common/Makefile.in
---- lxde-common.orig/Makefile.in       2012-05-18 15:51:54.031743960 +0200
-+++ lxde-common/Makefile.in    2012-05-18 15:53:13.428275239 +0200
-@@ -233,9 +233,9 @@ images_DATA = \
-       images/logout-banner.png \
-       images/lxde-icon.png
--lxpaneldir = $(datadir)/lxpanel/profile/LXDE
-+lxpaneldir = $(sysconfdir)/xdg/lxpanel/profile/LXDE
- lxpanel_DATA = lxpanel/config
--lxpanel_paneldir = $(datadir)/lxpanel/profile/LXDE/panels
-+lxpanel_paneldir = $(sysconfdir)/xdg/lxpanel/profile/LXDE/panels
- lxpanel_panel_DATA = lxpanel/panel
- openboxdir = $(sysconfdir)/xdg/openbox/LXDE
- openbox_DATA = \
-diff -Naurp lxde-common.orig/startlxde.in lxde-common/startlxde.in
---- lxde-common.orig/startlxde.in      2012-05-18 16:19:30.970879169 +0200
-+++ lxde-common/startlxde.in   2012-05-18 16:23:14.588381796 +0200
-@@ -20,6 +20,13 @@ if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml
-       cp /etc/xdg/openbox/LXDE/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
- fi
-+# Ensure the existance of lxpanel config files
-+LXPANEL_CONF_DIR="$XDG_CONFIG_HOME/lxpanel"
-+if [ ! -e "$LXPANEL_CONF_DIR/LXDE" ]; then
-+      mkdir -p "$LXPANEL_CONF_DIR"
-+      cp -r /etc/xdg/lxpanel/profile/LXDE "$LXPANEL_CONF_DIR"
-+fi
-+
- # Ensure the existance of the 'Desktop' folder
- if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then
-       . "$XDG_CONFIG_HOME/user-dirs.dirs"
index d245f23..e14391b 100644 (file)
@@ -2,8 +2,4 @@
 02-desktop-background.patch
 03-menu-xdg.patch
 04-default-terminal.patch
-05-openbox-fullscreen.patch
 06-l10n-pt-br.patch
-07-xdg-pcmanfm.patch
-08-xdg-openbox.patch
-09-xdg-lxpanel.patch