Removing debian/desktop/lxde-screenlock.desktop, it is included by upstream.
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Thu, 23 Oct 2014 14:29:20 +0000 (17:29 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Thu, 23 Oct 2014 15:23:14 +0000 (18:23 +0300)
debian/desktop/lxde-screenlock.desktop [deleted file]
debian/lxde-common.install [deleted file]
debian/patches/01-default-config.patch

diff --git a/debian/desktop/lxde-screenlock.desktop b/debian/desktop/lxde-screenlock.desktop
deleted file mode 100644 (file)
index 25a9ff2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=ScreenLock
-Name[zh_TW]=鎖住螢幕
-Name[pt_BR]=Bloquear tela
-Comment[pt_BR]=Bloqueie sua tela
-Comment=Lock your screen
-Icon=system-lock-screen
-Exec=lxlock
-NoDisplay=true
diff --git a/debian/lxde-common.install b/debian/lxde-common.install
deleted file mode 100644 (file)
index b13c2d5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-lxde-logout.desktop    /usr/share/applications
-
-debian/desktop/*       /usr/share/applications
index 05c29bf..85f6b03 100644 (file)
@@ -24,13 +24,3 @@ diff -Naurp lxde-common.orig/lxpanel/panel.in lxde-common/lxpanel/panel.in
      type = cpu
  }
  
-@@ -134,6 +130,9 @@ Plugin {
-     type = launchbar
-     Config {
-         Button {
-+            id=lxde-screenlock.desktop
-+        }
-+        Button {
-             id=lxde-logout.desktop
-         }
-     }