Adding debian version 0.3.2.1+svn20080509-5. debian/0.3.2.1+svn20080509-5
authorDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 21:50:21 +0000 (23:50 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 21:50:21 +0000 (23:50 +0200)
debian/README.Debian [new file with mode: 0644]
debian/changelog
debian/control
debian/lxde-logout.desktop [new file with mode: 0644]
debian/lxde-screenlock.desktop [new file with mode: 0644]
debian/patches/01_default-config.dpatch
debian/rules

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..95eab64
--- /dev/null
@@ -0,0 +1,21 @@
+                          lxpanel README.Debian
+                         ---------------------
+
+---------------
+Important Notes
+
+Although lxpanel is originally derived from fbpanel, now they are almost 
+totally different both in internal implementation and configuration. So, 
+don't use fbpanel config files here or things will break.
+
+--------------
+File Locations
+
+The config files of LXPanel are stored in ~/.config/lxpanel/<Profile Name>.
+
+Under LXDE, we use a different profile name - LXDE. So it's in 
+~/.config/lxpanel/LXDE. In this way, if you changed the config of the panel 
+under LXDE, it won't interfere other desktop environments.
+
+If the config files are missing, lxpanel loads system-wide config in 
+/usr/share/lxpanel/profile/<Profile name> instread.
index 2e06749..a1a0b58 100644 (file)
@@ -1,3 +1,13 @@
+lxde-common (0.3.2.1+svn20080509-5) unstable; urgency=low
+
+  * Added 'lock screen' and 'Logout' buttons into default panel settings.
+    (Closes: #493774)
+  * debian/control:
+    - lxde metapackage depends on lxterminal, lxrandr, obconf 
+    - lxde metapackage suggests on lxtask
+
+ -- Andrew Lee <andrew@linux.org.tw>  Sat, 27 Sep 2008 16:36:01 +0800
+
 lxde-common (0.3.2.1+svn20080509-4) unstable; urgency=high
 
   * Remove parallel builds support in debian/rules. (Closes: #490328) 
index d765ae8..ff694bc 100644 (file)
@@ -10,7 +10,7 @@ Homepage: http://lxde.sourceforge.net
 Package: lxde-common
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, lxde-settings-daemon
-Recommends: pcmanfm (>=0.3.9.5), lxpanel (>= 0.3.5.2), lxsession-lite (>=0.3.5) | lxsession (>= 0.3), lxappearance (>=0.2), openbox (>= 3.4.6.1), xscreensaver
+Recommends: lxde-core (>= ${source:Version})
 Suggests: lxlauncher
 Description: the Lightweight X11 Desktop Environment configuration data
  LXDE (the Lightweight X11 Desktop Environment) is a new project aimed
@@ -55,9 +55,9 @@ Description: Meta-package for the Lightweight X11 Desktop Environment Core
 
 Package: lxde
 Architecture: all
-Depends: lxde-core (>= ${source:Version}), lxappearance (>=0.2), gpicview (>= 0.1.9), leafpad, xarchiver
+Depends: lxde-core (>= ${source:Version}), lxappearance (>=0.2), gpicview (>= 0.1.9), leafpad, xarchiver, lxrandr, obconf, lxterminal
 Recommends: gdm, hal
-Suggests: lxlauncher
+Suggests: lxlauncher, lxtask
 Description: Meta-package for the Lightweight X11 Desktop Environment
  LXDE (the Lightweight X11 Desktop Environment) is a new project aimed
  to provide a new desktop environment which is lightweight and fast.
diff --git a/debian/lxde-logout.desktop b/debian/lxde-logout.desktop
new file mode 100644 (file)
index 0000000..91a2a8e
--- /dev/null
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Shutdown
+Name[zh_TW]=關機
+Comment=Shutdown or Reboot
+Icon=stock_exit
+Exec=lxde-logout
+NoDisplay=true
diff --git a/debian/lxde-screenlock.desktop b/debian/lxde-screenlock.desktop
new file mode 100644 (file)
index 0000000..4cff952
--- /dev/null
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScreenLock
+Name[zh_TW]=鎖住螢幕
+Comment=Lock your screen
+Icon=system-lock-screen
+Exec=xscreensaver-command -lock
+NoDisplay=true
index 4e6edcf..220340c 100644 (file)
@@ -6,9 +6,9 @@
 
 
 @DPATCH@
-diff -urNad lxde-common-0.3.2.1~/lxpanel/panel.in lxde-common-0.3.2.1/lxpanel/panel.in
---- lxde-common-0.3.2.1~/lxpanel/panel.in      2008-04-22 21:36:48.000000000 +0800
-+++ lxde-common-0.3.2.1/lxpanel/panel.in       2008-04-23 03:17:32.000000000 +0800
+diff -urNad lxde-common-0.3.2.1+svn20080509~/lxpanel/panel.in lxde-common-0.3.2.1+svn20080509/lxpanel/panel.in
+--- lxde-common-0.3.2.1+svn20080509~/lxpanel/panel.in  2008-09-02 22:51:19.000000000 +0800
++++ lxde-common-0.3.2.1+svn20080509/lxpanel/panel.in   2008-09-02 22:54:36.000000000 +0800
 @@ -53,10 +53,10 @@
              id=pcmanfm.desktop
          }
@@ -22,3 +22,19 @@ diff -urNad lxde-common-0.3.2.1~/lxpanel/panel.in lxde-common-0.3.2.1/lxpanel/pa
          }
      }
  }
+@@ -133,3 +133,15 @@
+     }
+ }
++Plugin {
++    type = launchbar
++    Config {
++        Button {
++            id=lxde-screenlock.desktop
++        }
++        Button {
++            id=lxde-logout.desktop
++        }
++    }
++}
++
index 1000875..a6b6102 100755 (executable)
@@ -17,20 +17,12 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall -g
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
     CFLAGS += -O0
 else
     CFLAGS += -O2
 endif
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-    INSTALL_PROGRAM += -s
-endif
 
 config.status: configure patch-stamp
        dh_testdir
@@ -75,6 +67,11 @@ install: build
 
        # Add here commands to install the package into debian/lxde-common.
        $(MAKE) DESTDIR=$(CURDIR)/debian/lxde-common install
+
+       # Install .desktop files
+       install -d $(CURDIR)/debian/lxde-common/usr/share/applications/
+       install $(CURDIR)/debian/lxde-logout.desktop $(CURDIR)/debian/lxde-common/usr/share/applications/
+       install $(CURDIR)/debian/lxde-screenlock.desktop $(CURDIR)/debian/lxde-common/usr/share/applications/
        dh_movefiles --sourcedir=debian/lxde-common