Adding debian version 0.5.5-2. debian/0.5.5-2
authorDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 22:05:34 +0000 (00:05 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 22:05:34 +0000 (00:05 +0200)
debian/changelog
debian/control
debian/lxde-common.install
debian/lxde-logout.desktop [deleted file]
debian/patches/10_ensure-dbus-launch.patch [deleted file]
debian/patches/11_ensure-desktop-folder.patch [deleted file]
debian/patches/13_ensure-menu-prefix.patch [deleted file]
debian/patches/series
debian/source/options [deleted file]

index 8c518a0..8e97cda 100644 (file)
@@ -1,3 +1,13 @@
+lxde-common (0.5.5-2) unstable; urgency=low
+
+  [ Sergey Slipchenko ]
+  * Drop few patches included in upstream (Closes: #648899)
+  * Drop debian/lxde-logout.desktop (Closes: #592686)
+  * Drop debian/source/options
+  * Delete unneeded ${shlibs:Depends}
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Tue, 14 Feb 2012 16:39:04 +0800
+
 lxde-common (0.5.5-1) unstable; urgency=low
 
   * Merging upstream version 0.5.5:
index 594e9de..f962333 100644 (file)
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-lxde/lxde-common.git
 
 Package: lxde-common
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}, lxsession (>= 0.4.4)
+Depends: ${misc:Depends}, lxsession (>= 0.4.4)
 Recommends: lxde-core (>= ${source:Version})
 Suggests: lxlauncher
 Description: Lightweight X11 Desktop Environment configuration data
index 748e787..be015a4 100644 (file)
@@ -1,5 +1,5 @@
 debian/lxde-common.lintian-overrides usr/share/lintian/overrides
-debian/lxde-logout.desktop usr/share/applications
+lxde-logout.desktop usr/share/applications
 debian/lxde-screenlock.desktop usr/share/applications
 usr/
 etc/
diff --git a/debian/lxde-logout.desktop b/debian/lxde-logout.desktop
deleted file mode 100644 (file)
index c624e9d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Shutdown
-Name[zh_TW]=關機
-Name[pt_BR]=Desligar
-Comment[pt_BR]=Desligar, reiniciar, sair da sessão etc.
-Comment=Shutdown or Reboot
-Icon=stock_exit
-Exec=lxde-logout
-NoDisplay=true
diff --git a/debian/patches/10_ensure-dbus-launch.patch b/debian/patches/10_ensure-dbus-launch.patch
deleted file mode 100644 (file)
index 9ea9b0c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Upstream (http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=847a8e73e658bb9ced5eb7b12242b0064224f49e
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -28,6 +28,11 @@
- fi
- mkdir -p "$XDG_DESKTOP_DIR"
-+# Launch DBus if needed
-+if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-+       eval "$(dbus-launch --sh-syntax --exit-with-session)"
-+fi
-+
- # Clean up after GDM (GDM sets the number of desktops to one)
- xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
diff --git a/debian/patches/11_ensure-desktop-folder.patch b/debian/patches/11_ensure-desktop-folder.patch
deleted file mode 100644 (file)
index b0ce92d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#Upstream: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=28309e598478254fa9c918782cf089aea6358abb
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -33,6 +33,14 @@
-        eval "$(dbus-launch --sh-syntax --exit-with-session)"
- fi
-+# Ensure the existance of the 'Desktop' folder
-+if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then
-+       . "$XDG_CONFIG_HOME/user-dirs.dirs"
-+else
-+       XDG_DESKTOP_DIR="$HOME/Desktop"
-+fi
-+mkdir -p "$XDG_DESKTOP_DIR"
-+
- # Clean up after GDM (GDM sets the number of desktops to one)
- xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
diff --git a/debian/patches/13_ensure-menu-prefix.patch b/debian/patches/13_ensure-menu-prefix.patch
deleted file mode 100644 (file)
index 71067d4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From fcefd17a7187232d15aca13fdedf47a4b854fc21 Mon Sep 17 00:00:00 2001
-From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-Date: Sun, 7 Mar 2010 10:51:08 +0800
-Subject: [PATCH] Properly set XDG_MENU_PREFIX.
-
----
- startlxde.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
- mode change 100755 => 100644 openbox-lxde
-
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -54,5 +54,7 @@
- export XDG_MENU_PREFIX="lxde-"
-+export XDG_MENU_PREFIX="lxde-"
-+
- # Start the LXDE session
- exec @prefix@/bin/lxsession -s LXDE -e LXDE
index d3a34e2..a7f14fe 100644 (file)
@@ -2,7 +2,4 @@
 02_alternative_desktop-background.patch
 03_menu-xdg.patch
 05_default_terminal.patch
-10_ensure-dbus-launch.patch
-11_ensure-desktop-folder.patch
 12_autostart-gnome-polkit.patch
-13_ensure-menu-prefix.patch
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644 (file)
index 779dbfd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-compression = "bzip2"
-compression-level = 9