Adding debian version 0.5.0-4. debian-squeeze debian/0.5.0-4
authorDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 22:04:08 +0000 (00:04 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 18 Apr 2012 22:04:08 +0000 (00:04 +0200)
29 files changed:
debian/README.Debian
debian/changelog
debian/compat
debian/control
debian/lxde-common.install [new file with mode: 0644]
debian/lxde-common.lintian-overrides [new file with mode: 0644]
debian/lxde-common.postinst [new file with mode: 0644]
debian/lxde-common.prerm [new file with mode: 0644]
debian/lxde-logout.desktop
debian/lxde-screenlock.desktop
debian/patches/00list [deleted file]
debian/patches/01_default-config.dpatch [deleted file]
debian/patches/01_default-config.patch [new file with mode: 0644]
debian/patches/02_lxsession_0.4.1.dpatch [deleted file]
debian/patches/02_lxsession_0.4.1.patch [new file with mode: 0644]
debian/patches/03_menu-xdg.dpatch [deleted file]
debian/patches/03_menu-xdg.patch [new file with mode: 0644]
debian/patches/04_pcmanfm0.9.patch [new file with mode: 0644]
debian/patches/05_default_terminal.patch [new file with mode: 0644]
debian/patches/10_ensure-dbus-launch.patch [new file with mode: 0644]
debian/patches/11_ensure-desktop-folder.patch [new file with mode: 0644]
debian/patches/12_autostart-gnome-polkit.patch [new file with mode: 0644]
debian/patches/13_ensure-menu-prefix.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/postinst [deleted file]
debian/prerm [deleted file]
debian/rules
debian/source/format [new file with mode: 0644]
debian/watch

index bd1f8ec..3ae3dfc 100644 (file)
@@ -15,7 +15,53 @@ or ~/.config/lxsession/LXDE/desktop.conf if user-specific config file
 is available, and presents the config values to other programs via 
 XSETTINGS protocol defined by freedesktop.org.
 
+Default LXDE Hotkeys with Default openbox-lxde WM
+-------------------------------------------------
+Desktop Switching
+
+       DesktopLeft             C-A-Left
+       DesktopRight            C-A-Right
+       DesktopUp               C-A-Up
+       DesktopDown             C-A-Down
+       SendToDesktopLeft       S-A-Left
+       SendToDesktopRight      S-A-Right
+       SendToDesktopUp         S-A-Up
+       SendToDesktopDown       S-A-Down
+       Desktop1                W-F1
+       Desktop2                W-F2
+       Desktop3                W-F3
+       Desktop4                W-F4
+       ToggleShowDesktop       W-d
+       ToggleShowDesktop       C-A-d
+
+Windows Operation
+
+       Close                   A-F4
+       LowerFocus              A-Escape
+       ShowMenu                A-space
+       ToggleFullscreen        F11
+
+Window Switching
+
+       NextWindow              A-Tab
+       PreviousWindow          A-S-Tab
+       SwitchToPanelOrDesktop  C-A-Tab
+
+Running Applications   
+
+       File Manager            W-e
+       Task Manager            A-C-Delete
+       
+Keybindings from LXPanel
+
+       Popup Run Window        W-r and A-F2
+       Show LXPanel Menu       C-Escape
+
+
+No Display Managers Users
+-------------------------
+If you use startx. Choose startlxde script to start up LXDE.
+
 More Info
 ---------
 See http://wiki.lxde.org/en/Debian for more info. 
-
index 859dccf..33945c0 100644 (file)
@@ -1,3 +1,53 @@
+lxde-common (0.5.0-4) unstable; urgency=low
+
+  [ Andrew Lee (李健秋) ]
+  * debian/README.Debian:
+    - Update README.Debian for 'startx' users. (Closes:#570083)
+    - Document default hotkeys for default openbox-lxde WM
+  * Added freedesktop.org's specification required type keys to 
+    lxde-logout.desktop and lxde-screenlock.desktop (Closes:#570135)
+  * Convert dpatch to quilt
+  * Update autostart file to support pcmanfm 0.9 series. (Closes:#583146)
+  * Set default terminal to x-terminal-emulator. (Closes:#563221)
+  * debian/control:
+    - Use LXDE Packaging Team address
+    - Bumped Standard-version to 3.8.4
+    - Updated Homepage url
+    - Added Vcs-Git and Vcs-Browser tags
+    - Update lxde-common depends on lxsession (>= 0.4.4)
+    - Update lxde-core depends on pcmanfm (>=0.9.5), lxpanel (>= 0.5.5)
+    - Drop recommends on hal
+    - Recommends on chromium-browser | iceweasel | www-browser (Closes:#570176)
+  * Correct watch file. (Closes:#582670)
+  * debian/patches:
+    - 04_pcmanfm0.9.patch: install default config file for pcmanfm 0.9 series
+  * Switch to DH7
+  * Switch to dpkg-source 3.0 (quilt) format
+
+  [ Julien Lavergne ]
+  * debian/patches:
+   - 10_ensure-dbus-launch.patch: From upstream, launch dbus when it's needed.
+   - 11_ensure-desktop-folder.patch: From upstream, create the desktop folder
+     if it doesn't exist.
+   - 12_autostart-gnome-polkit.patch:
+     Autostart polkit-gnome-authentication-agent-1 to make polkit working on
+     LXDE session. 
+   - 13_ensure-menu-prefix.patch: From upstream, ensure that the menu prefix is
+     properly set.
+  * debian/control:
+   - Recommends xserver-xorg for lxde, to install by default a xserver.
+   - Recommends policykit-1-gnome for polkit support.
+   - Recommends gksu for support in pcmanfm.
+   - Wrap depends and build-depends.
+   - Build-depends on debhelper (>= 7.0.50) for overrides support.
+   - Add ${misc:Depends} to lxde-core and lxde.
+  * debian/rules:
+   - Add --fail-missing to dh_install. 
+  * debian/lxde-common.install:
+   - Install etc/ and usr/
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 02 Jun 2010 00:24:55 +0800
+
 lxde-common (0.5.0-3) unstable; urgency=low
 
   * debian/control:
index 7ed6ff8..7f8f011 100644 (file)
@@ -1 +1 @@
-5
+7
index b5b170e..4a8b1b6 100644 (file)
@@ -1,14 +1,24 @@
 Source: lxde-common
 Section: x11
 Priority: optional
-Maintainer: Andrew Lee (李健秋) <ajqlee@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>=2.6), dpatch, docbook-to-man
-Standards-Version: 3.8.3
-Homepage: http://lxde.sourceforge.net
+Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
+Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>
+Build-Depends: debhelper (>= 7.0.50),
+               autotools-dev,
+               quilt (>= 0.40),
+               docbook-to-man,
+               autoconf,
+               automake
+Standards-Version: 3.8.4
+Homepage: http://lxde.org
+Vcs-Git: git://git.debian.org/git/collab-maint/lxde-common.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/lxde-common.git;a=summary
 
 Package: lxde-common
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, lxsession (>= 0.4.1)
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends},
+         lxsession (>= 0.4.4)
 Recommends: lxde-core (>= ${source:Version})
 Suggests: lxlauncher
 Description: the Lightweight X11 Desktop Environment configuration data
@@ -31,9 +41,16 @@ Description: the Lightweight X11 Desktop Environment configuration data
 
 Package: lxde-core
 Architecture: all
-Depends: lxde-common (>= ${source:Version}), pcmanfm | pcmanfm-nohal, lxpanel (>= 0.4), openbox (>= 3.4.6.1)
-Recommends: hal, xscreensaver, lxterminal | x-terminal-emulator
-Suggests: lxlauncher, iceweasel | www-browser
+Depends: ${misc:Depends},
+         lxde-common (>= ${source:Version}),
+         pcmanfm (>=0.9.5),
+         lxpanel (>= 0.5.5),
+         openbox (>= 3.4.6.1)
+Recommends: xscreensaver,
+            lxterminal | x-terminal-emulator,
+            gksu
+Suggests: lxlauncher,
+          chromium-browser | iceweasel | www-browser
 Description: Meta-package for the Lightweight X11 Desktop Environment Core
  LXDE (the Lightweight X11 Desktop Environment) is a new project aimed
  to provide a new desktop environment which is lightweight and fast.
@@ -47,9 +64,28 @@ Description: Meta-package for the Lightweight X11 Desktop Environment Core
 
 Package: lxde
 Architecture: all
-Depends: lxde-core (>= ${source:Version}), lxappearance (>=0.2), lxinput (>=0.1), lxsession-edit, lxshortcut, gpicview (>= 0.1.9), lxterminal, leafpad, xarchiver, lxrandr, obconf, lxde-icon-theme
-Recommends: gdm | x-display-manager, hal, iceweasel | www-browser, lxmusic, menu-xdg
-Suggests: lxlauncher, lxtask
+Depends: ${misc:Depends},
+         lxde-core (>= ${source:Version}),
+         lxappearance (>=0.4.0),
+         lxinput (>=0.1.1),
+         lxsession-edit,
+         lxshortcut,
+         gpicview (>= 0.1.9),
+         lxterminal,
+         leafpad,
+         xarchiver,
+         lxrandr,
+         obconf,
+         lxde-icon-theme
+Recommends: gdm | x-display-manager,
+            hal,
+            chromium-browser | iceweasel | www-browser,
+            lxmusic,
+            menu-xdg,
+            xserver-xorg,
+            policykit-1-gnome
+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-common.install b/debian/lxde-common.install
new file mode 100644 (file)
index 0000000..1988754
--- /dev/null
@@ -0,0 +1,5 @@
+etc/
+usr/
+debian/lxde-logout.desktop usr/share/applications 
+debian/lxde-screenlock.desktop usr/share/applications
+debian/lxde-common.lintian-overrides usr/share/lintian/overrides
diff --git a/debian/lxde-common.lintian-overrides b/debian/lxde-common.lintian-overrides
new file mode 100644 (file)
index 0000000..2e93f99
--- /dev/null
@@ -0,0 +1,6 @@
+#
+# The desktop-command-not-in-package bacause that's in a depends package 
+# command.
+#
+lxde-common: desktop-command-not-in-package /usr/share/applications/lxde-screenlock.desktop xscreensaver-command
+
diff --git a/debian/lxde-common.postinst b/debian/lxde-common.postinst
new file mode 100644 (file)
index 0000000..86ddd07
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+if [ "$1" = configure ]; then
+  update-alternatives --install /usr/bin/x-session-manager \
+    x-session-manager /usr/bin/startlxde 50 \
+    --slave /usr/share/man/man1/x-session-manager.1.gz \
+    x-session-manager.1.gz /usr/share/man/man1/startlxde.1.gz 
+
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/lxde-common.prerm b/debian/lxde-common.prerm
new file mode 100644 (file)
index 0000000..9d0d4d2
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
+  update-alternatives --remove x-session-manager /usr/bin/startlxde 
+fi
+
+#DEBHELPER#
+
+exit 0
index 91a2a8e..3a5a382 100644 (file)
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
 Name=Shutdown
 Name[zh_TW]=關機
 Comment=Shutdown or Reboot
index 4cff952..da98130 100644 (file)
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
 Name=ScreenLock
 Name[zh_TW]=鎖住螢幕
 Comment=Lock your screen
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index 1611f39..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-01_default-config.dpatch
-02_lxsession_0.4.1.dpatch
-03_menu-xdg.dpatch
diff --git a/debian/patches/01_default-config.dpatch b/debian/patches/01_default-config.dpatch
deleted file mode 100644 (file)
index 1045258..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_default-config.dpatch by Andrew Lee <andrew@linux.org.tw>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: change default terminal and browser
-
-
-@DPATCH@
-diff -urNad lxde-common-0.4.2~/lxpanel/panel.in lxde-common-0.4.2/lxpanel/panel.in
---- lxde-common-0.4.2~/lxpanel/panel.in        2008-06-16 04:30:26.000000000 +0800
-+++ lxde-common-0.4.2/lxpanel/panel.in 2009-11-16 13:40:01.862558029 +0800
-@@ -53,7 +53,7 @@
-             id=pcmanfm.desktop
-         }
-         Button {
--            id=firefox.desktop
-+            id=lxde-x-www-browser.desktop
-         }
-     }
- }
-@@ -134,6 +134,9 @@
-     type = launchbar
-     Config {
-         Button {
-+            id=lxde-screenlock.desktop
-+        }
-+        Button {
-             id=lxde-logout.desktop
-         }
-     }
-diff -urNad lxde-common-0.4.2~/pcmanfm/main.lxde.in lxde-common-0.4.2/pcmanfm/main.lxde.in
---- lxde-common-0.4.2~/pcmanfm/main.lxde.in    2008-03-15 05:22:08.000000000 +0800
-+++ lxde-common-0.4.2/pcmanfm/main.lxde.in     2009-11-16 13:40:37.858618875 +0800
-@@ -1,3 +1,6 @@
-+[General]
-+terminal=x-terminal-emulator
-+
- [Desktop]
- show_wallpaper=1
- wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
diff --git a/debian/patches/01_default-config.patch b/debian/patches/01_default-config.patch
new file mode 100644 (file)
index 0000000..96e3fc3
--- /dev/null
@@ -0,0 +1,34 @@
+Author: Andrew Lee <andrew@linux.org.tw>
+Description: change default terminal and browser
+--- a/lxpanel/panel.in
++++ b/lxpanel/panel.in
+@@ -53,7 +53,7 @@
+             id=pcmanfm.desktop
+         }
+         Button {
+-            id=firefox.desktop
++            id=lxde-x-www-browser.desktop
+         }
+     }
+ }
+@@ -110,10 +110,6 @@
+ }
+ Plugin {
+-    type = netstat
+-}
+-
+-Plugin {
+     type = cpu
+ }
+@@ -134,6 +130,9 @@
+     type = launchbar
+     Config {
+         Button {
++            id=lxde-screenlock.desktop
++        }
++        Button {
+             id=lxde-logout.desktop
+         }
+     }
diff --git a/debian/patches/02_lxsession_0.4.1.dpatch b/debian/patches/02_lxsession_0.4.1.dpatch
deleted file mode 100644 (file)
index 5b06fba..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_lxsession_0.4.1.dpatch by Andrew Lee (李健秋) <ajqlee@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support new command line argument for lxsession 0.4.1
-
-@DPATCH@
-diff -urNad lxde-common-0.5.0~/startlxde.in lxde-common-0.5.0/startlxde.in
---- lxde-common-0.5.0~/startlxde.in    2009-09-04 17:46:53.000000000 +0800
-+++ lxde-common-0.5.0/startlxde.in     2009-12-18 22:52:50.098199115 +0800
-@@ -25,4 +25,4 @@
- export SAL_USE_VCLPLUGIN=gtk
- # Start the LXDE session
--exec @prefix@/bin/lxsession -s LXDE
-+exec @prefix@/bin/lxsession -s LXDE -e LXDE
diff --git a/debian/patches/02_lxsession_0.4.1.patch b/debian/patches/02_lxsession_0.4.1.patch
new file mode 100644 (file)
index 0000000..a6b834d
--- /dev/null
@@ -0,0 +1,10 @@
+Author: Andrew Lee (李健秋) <ajqlee@debian.org>
+Description: Support new command line argument for lxsession 0.4.1
+--- a/startlxde.in
++++ b/startlxde.in
+@@ -25,4 +25,4 @@
+ export SAL_USE_VCLPLUGIN=gtk
+ # Start the LXDE session
+-exec @prefix@/bin/lxsession -s LXDE
++exec @prefix@/bin/lxsession -s LXDE -e LXDE
diff --git a/debian/patches/03_menu-xdg.dpatch b/debian/patches/03_menu-xdg.dpatch
deleted file mode 100644 (file)
index 2c24bc1..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_menu-xdg.dpatch by Andrew Lee (李健秋) <ajqlee@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad lxde-common-0.5.0~/startlxde.in lxde-common-0.5.0/startlxde.in
---- lxde-common-0.5.0~/startlxde.in    2009-09-04 17:46:53.000000000 +0800
-+++ lxde-common-0.5.0/startlxde.in     2010-02-08 15:03:09.328809464 +0800
-@@ -1,5 +1,7 @@
- #!/bin/sh
-+export XDG_DATA_DIRS="/usr/local/share/:/usr/share/:/usr/share/gdm/:/var/lib/menu-xdg/"
-+
- if [ -z "$XDG_CONFIG_HOME" ]; then
-     export XDG_CONFIG_HOME="$HOME/.config"
- fi
diff --git a/debian/patches/03_menu-xdg.patch b/debian/patches/03_menu-xdg.patch
new file mode 100644 (file)
index 0000000..8cdca7f
--- /dev/null
@@ -0,0 +1,12 @@
+Author: Andrew Lee (李健秋) <ajqlee@debian.org>
+Description: No description.
+--- a/startlxde.in
++++ b/startlxde.in
+@@ -1,5 +1,7 @@
+ #!/bin/sh
++export XDG_DATA_DIRS="/usr/local/share/:/usr/share/:/usr/share/gdm/:/var/lib/menu-xdg/"
++
+ if [ -z "$XDG_CONFIG_HOME" ]; then
+     export XDG_CONFIG_HOME="$HOME/.config"
+ fi
diff --git a/debian/patches/04_pcmanfm0.9.patch b/debian/patches/04_pcmanfm0.9.patch
new file mode 100644 (file)
index 0000000..72af71e
--- /dev/null
@@ -0,0 +1,161 @@
+--- a/autostart
++++ b/autostart
+@@ -1,3 +1,3 @@
+ @xscreensaver -no-splash
+ @lxpanel --profile LXDE
+-@pcmanfm -d
++@pcmanfm --desktop --profile LXDE
+--- a/configure
++++ b/configure
+@@ -2385,7 +2385,7 @@
+ fi
+-ac_config_files="$ac_config_files Makefile startlxde lxde-logout LXDE.desktop lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde pcmanfm/main.lxde man/Makefile"
++ac_config_files="$ac_config_files Makefile startlxde lxde-logout LXDE.desktop lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde pcmanfm/LXDE.conf man/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -3097,7 +3097,7 @@
+     "lxpanel/panel") CONFIG_FILES="$CONFIG_FILES lxpanel/panel" ;;
+     "openbox/rc.xml") CONFIG_FILES="$CONFIG_FILES openbox/rc.xml" ;;
+     "openbox-lxde") CONFIG_FILES="$CONFIG_FILES openbox-lxde" ;;
+-    "pcmanfm/main.lxde") CONFIG_FILES="$CONFIG_FILES pcmanfm/main.lxde" ;;
++    "pcmanfm/LXDE.conf") CONFIG_FILES="$CONFIG_FILES pcmanfm/LXDE.conf" ;;
+     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,7 @@
+   lxpanel/panel
+   openbox/rc.xml
+   openbox-lxde
+-  pcmanfm/main.lxde
++  pcmanfm/LXDE.conf
+   man/Makefile
+ ])
+--- /dev/null
++++ b/pcmanfm/LXDE.conf.in
+@@ -0,0 +1,21 @@
++[config]
++bm_open_method=0
++su_cmd=gksu '%s'
++
++[desktop]
++wallpaper_mode=1
++wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
++desktop_bg=#000000
++desktop_fg=#ffffff
++desktop_shadow=#000000
++
++[ui]
++always_show_tabs=0
++hide_close_btn=0
++win_width=640
++win_height=480
++view_mode=0
++show_hidden=0
++sort_type=0
++sort_by=0
++
+--- a/startlxde.in
++++ b/startlxde.in
+@@ -8,9 +8,9 @@
+ # Ensure the existance of pcmanfm config file
+ PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
+-if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
++if [ ! -f "$PCMANFM_CONF_DIR/LXDE.conf" ]; then
+     mkdir -p "$PCMANFM_CONF_DIR"
+-    cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
++    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/LXDE.conf"
+ fi
+ # Ensure the existance of openbox config file
+--- a/openbox/menu.xml
++++ b/openbox/menu.xml
+@@ -25,7 +25,7 @@
+   <item label="Desktop Settings">
+     <action name="Execute">
+       <startupnotify><enabled>yes</enabled></startupnotify>
+-      <command>pcmanfm --show-pref 2</command>
++      <command>pcmanfm --desktop-pref</command>
+     </action>
+   </item>
+   <item label="Window Management Settings">
+@@ -43,4 +43,4 @@
+   </item>
+ </menu>
+-</openbox_menu>
+\ No newline at end of file
++</openbox_menu>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,7 +33,7 @@
+ pcmanfmdir=$(datadir)/lxde/pcmanfm
+ pcmanfm_DATA= \
+-      pcmanfm/main.lxde
++      pcmanfm/LXDE.conf
+ EXTRA_DIST = \
+       autostart \
+@@ -45,7 +45,7 @@
+       openbox/rc.xml.in \
+       openbox/menu.xml \
+       openbox-lxde.in \
+-      pcmanfm/main.lxde.in \
++      pcmanfm/LXDE.conf.in \
+       $(lxpanel_DATA) \
+       lxpanel/panel.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,7 @@
+       $(srcdir)/openbox-lxde.in $(srcdir)/startlxde.in \
+       $(top_srcdir)/configure $(top_srcdir)/lxpanel/panel.in \
+       $(top_srcdir)/openbox/rc.xml.in \
+-      $(top_srcdir)/pcmanfm/main.lxde.in AUTHORS COPYING ChangeLog \
++      $(top_srcdir)/pcmanfm/LXDE.conf.in AUTHORS COPYING ChangeLog \
+       INSTALL NEWS compile depcomp install-sh missing mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+@@ -52,7 +52,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = startlxde lxde-logout LXDE.desktop \
+       lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde \
+-      pcmanfm/main.lxde
++      pcmanfm/LXDE.conf
+ CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+@@ -244,7 +244,7 @@
+ pcmanfmdir = $(datadir)/lxde/pcmanfm
+ pcmanfm_DATA = \
+-      pcmanfm/main.lxde
++      pcmanfm/LXDE.conf
+ EXTRA_DIST = \
+       autostart \
+@@ -256,7 +256,7 @@
+       openbox/rc.xml.in \
+       openbox/menu.xml \
+       openbox-lxde.in \
+-      pcmanfm/main.lxde.in \
++      pcmanfm/LXDE.conf.in \
+       $(lxpanel_DATA) \
+       lxpanel/panel.in
+@@ -312,7 +312,7 @@
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+ openbox-lxde: $(top_builddir)/config.status $(srcdir)/openbox-lxde.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+-pcmanfm/main.lxde: $(top_builddir)/config.status $(top_srcdir)/pcmanfm/main.lxde.in
++pcmanfm/LXDE.conf: $(top_builddir)/config.status $(top_srcdir)/pcmanfm/LXDE.conf.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+       @$(NORMAL_INSTALL)
diff --git a/debian/patches/05_default_terminal.patch b/debian/patches/05_default_terminal.patch
new file mode 100644 (file)
index 0000000..5bb2792
--- /dev/null
@@ -0,0 +1,8 @@
+--- a/lxpanel/config
++++ b/lxpanel/config
+@@ -1,4 +1,4 @@
+ [Command]
+ FileManager=pcmanfm %s
+-Terminal=xterm -e
++Terminal=x-terminal-emulator
+ Logout=lxde-logout
diff --git a/debian/patches/10_ensure-dbus-launch.patch b/debian/patches/10_ensure-dbus-launch.patch
new file mode 100644 (file)
index 0000000..60e9e6d
--- /dev/null
@@ -0,0 +1,15 @@
+# Upstream (http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=847a8e73e658bb9ced5eb7b12242b0064224f49e
+--- a/startlxde.in
++++ b/startlxde.in
+@@ -20,6 +20,11 @@
+     cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
+ fi
++# 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
new file mode 100644 (file)
index 0000000..96c4f46
--- /dev/null
@@ -0,0 +1,18 @@
+#Upstream: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=28309e598478254fa9c918782cf089aea6358abb
+--- a/startlxde.in
++++ b/startlxde.in
+@@ -25,6 +25,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/12_autostart-gnome-polkit.patch b/debian/patches/12_autostart-gnome-polkit.patch
new file mode 100644 (file)
index 0000000..bbc15a4
--- /dev/null
@@ -0,0 +1,11 @@
+# Autostart polkit-gnome-authentication-agent-1 to enable polkit support
+# This should be changed when LXDE will have a polkit-agent.
+Index: lxde-common/autostart
+===================================================================
+--- lxde-common.orig/autostart 2010-05-25 22:58:28.000000000 +0200
++++ lxde-common/autostart      2010-05-25 22:59:13.000000000 +0200
+@@ -1,3 +1,4 @@
+ @xscreensaver -no-splash
+ @lxpanel --profile LXDE
+ @pcmanfm --desktop --profile LXDE
++@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/debian/patches/13_ensure-menu-prefix.patch b/debian/patches/13_ensure-menu-prefix.patch
new file mode 100644 (file)
index 0000000..a4d575b
--- /dev/null
@@ -0,0 +1,20 @@
+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
+@@ -39,5 +39,7 @@
+ # Enable GTK+2 integration for OpenOffice.org, if available.
+ export SAL_USE_VCLPLUGIN=gtk
++export XDG_MENU_PREFIX="lxde-"
++
+ # Start the LXDE session
+ exec @prefix@/bin/lxsession -s LXDE -e LXDE
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..abb66e6
--- /dev/null
@@ -0,0 +1,9 @@
+01_default-config.patch
+02_lxsession_0.4.1.patch
+03_menu-xdg.patch
+04_pcmanfm0.9.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/postinst b/debian/postinst
deleted file mode 100644 (file)
index 86ddd07..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = configure ]; then
-  update-alternatives --install /usr/bin/x-session-manager \
-    x-session-manager /usr/bin/startlxde 50 \
-    --slave /usr/share/man/man1/x-session-manager.1.gz \
-    x-session-manager.1.gz /usr/share/man/man1/startlxde.1.gz 
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644 (file)
index 9d0d4d2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
-  update-alternatives --remove x-session-manager /usr/bin/startlxde 
-fi
-
-#DEBHELPER#
-
-exit 0
index be5d0fd..84fe38c 100755 (executable)
@@ -1,99 +1,21 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-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
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-config.status: configure patch-stamp
-       dh_testdir
-       # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/lxde-common.sgml > lxde-common.1
 
-       touch $@
+%:
+       dh $@
 
-clean: unpatch
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
+override_dh_auto_configure:
+       dh_auto_configure -- --enable-man 
+       
+override_dh_install:
+       dh_install --fail-missing
 
-       # Add here commands to clean up after the build process.
-       [ ! -f Makefile ] || $(MAKE) distclean
-       rm -f config.sub config.guess
+override_dh_auto_clean:
        rm -f lxde-settings/*.gcno
+       dh_auto_clean
 
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # 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
-
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs 
-       dh_installman 
-       dh_link -a
-       dh_compress 
-       dh_fixperms 
-       dh_installdeb
-       dh_gencontrol 
-       dh_md5sums 
-       dh_builddeb 
-
-# Build architecture-dependent files here.
-binary-arch: install
-# We have nothing to do here.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_auto_test:
+       :
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
index c17b947..34e86af 100644 (file)
@@ -7,6 +7,6 @@
 version=3
 
 # Uncomment to find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/lxde/lxde-common-(.*)\.tar\.(gz|bz2)
+http://sf.net/lxde/lxde-common-(.*)\.tar\.(?:gz|bz2)