diff -Nru lxde-common-0.5.0/debian/changelog lxde-common-0.5.0/debian/changelog --- lxde-common-0.5.0/debian/changelog 2010-06-01 23:33:06.000000000 +0000 +++ lxde-common-0.5.0/debian/changelog 2010-12-19 11:09:57.000000000 +0000 @@ -1,3 +1,83 @@ +lxde-common (0.5.0-4ubuntu2~maverick1) maverick; urgency=low + + * Backport to maverick. + + -- Julien Lavergne Sun, 19 Dec 2010 12:09:36 +0100 + +lxde-common (0.5.0-4ubuntu2) natty; urgency=low + + * debian/patches/04_pcmanfm0.9.patch: + - Update with correct location. + + -- Julien Lavergne Mon, 06 Dec 2010 01:21:24 +0100 + +lxde-common (0.5.0-4ubuntu1) natty; urgency=low + + * Merge with Debian unstable. + * Ubuntu remaining changes: + - debian/control: + + Recommends lxdm over gdm for lxde to provide the display manager. + + Bump pcmanfm to >= 0.9.8 for the new settings location. + + Add Recommends on galculator, amixer and scrot, for the new openbox + keybindings. + - debian/patches/04_pcmanfm0.9.patch + + Refresh with new location of pcmanfm >= 0.9.8 settings (LP: #684796) + - debian/14_more_openbox_keybindings.patch: + + Add more openbox keybindings to manage volume, screenshots and + calculator (LP: #577957). + + -- Julien Lavergne Sun, 05 Dec 2010 20:55:26 +0100 + +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 (李健秋) Wed, 02 Jun 2010 00:24:55 +0800 + lxde-common (0.5.0-3ubuntu3) maverick; urgency=low * Merge from Debian git. diff -Nru lxde-common-0.5.0/debian/control lxde-common-0.5.0/debian/control --- lxde-common-0.5.0/debian/control 2010-06-01 22:09:44.000000000 +0000 +++ lxde-common-0.5.0/debian/control 2010-12-05 18:31:56.000000000 +0000 @@ -6,7 +6,6 @@ Uploaders: Andrew Lee (李健秋) Build-Depends: debhelper (>= 7.0.50), autotools-dev, - libgtk2.0-dev (>=2.6), quilt (>= 0.40), docbook-to-man, autoconf, @@ -45,7 +44,7 @@ Architecture: all Depends: ${misc:Depends}, lxde-common (>= ${source:Version}), - pcmanfm (>=0.9.5), + pcmanfm (>= 0.9.8), lxpanel (>= 0.5.5), openbox (>= 3.4.6.1) Recommends: xscreensaver, @@ -79,13 +78,16 @@ lxrandr, obconf, lxde-icon-theme -Recommends: lxdm | gdm | x-display-manager, +Recommends: lxdm | x-display-manager, hal, chromium-browser | iceweasel | www-browser, lxmusic, menu-xdg, xserver-xorg, - policykit-1-gnome + policykit-1-gnome, + galculator, + amixer, + scrot Suggests: lxlauncher, lxtask Description: Meta-package for the Lightweight X11 Desktop Environment diff -Nru lxde-common-0.5.0/debian/lxde-common.install lxde-common-0.5.0/debian/lxde-common.install --- lxde-common-0.5.0/debian/lxde-common.install 2010-06-01 19:31:17.000000000 +0000 +++ lxde-common-0.5.0/debian/lxde-common.install 2010-06-11 10:02:34.000000000 +0000 @@ -2,3 +2,4 @@ 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 -Nru lxde-common-0.5.0/debian/lxde-common.lintian-overrides lxde-common-0.5.0/debian/lxde-common.lintian-overrides --- lxde-common-0.5.0/debian/lxde-common.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ lxde-common-0.5.0/debian/lxde-common.lintian-overrides 2010-06-11 10:01:47.000000000 +0000 @@ -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 -Nru lxde-common-0.5.0/debian/patches/04_pcmanfm0.9.patch lxde-common-0.5.0/debian/patches/04_pcmanfm0.9.patch --- lxde-common-0.5.0/debian/patches/04_pcmanfm0.9.patch 2010-06-01 19:10:25.000000000 +0000 +++ lxde-common-0.5.0/debian/patches/04_pcmanfm0.9.patch 2010-12-06 00:26:51.000000000 +0000 @@ -1,12 +1,16 @@ ---- a/autostart -+++ b/autostart +Index: lxde-common-0.5.0/autostart +=================================================================== +--- lxde-common-0.5.0.orig/autostart 2010-12-06 01:26:04.000000000 +0100 ++++ lxde-common-0.5.0/autostart 2010-12-06 01:26:25.000000000 +0100 @@ -1,3 +1,3 @@ @xscreensaver -no-splash @lxpanel --profile LXDE -@pcmanfm -d +@pcmanfm --desktop --profile LXDE ---- a/configure -+++ b/configure +Index: lxde-common-0.5.0/configure +=================================================================== +--- lxde-common-0.5.0.orig/configure 2010-12-06 01:26:04.000000000 +0100 ++++ lxde-common-0.5.0/configure 2010-12-06 01:26:25.000000000 +0100 @@ -2385,7 +2385,7 @@ fi @@ -25,8 +29,10 @@ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ---- a/configure.ac -+++ b/configure.ac +Index: lxde-common-0.5.0/configure.ac +=================================================================== +--- lxde-common-0.5.0.orig/configure.ac 2010-12-06 01:26:04.000000000 +0100 ++++ lxde-common-0.5.0/configure.ac 2010-12-06 01:26:25.000000000 +0100 @@ -48,7 +48,7 @@ lxpanel/panel openbox/rc.xml @@ -36,8 +42,10 @@ man/Makefile ]) ---- /dev/null -+++ b/pcmanfm/LXDE.conf.in +Index: lxde-common-0.5.0/pcmanfm/LXDE.conf.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxde-common-0.5.0/pcmanfm/LXDE.conf.in 2010-12-06 01:26:25.000000000 +0100 @@ -0,0 +1,21 @@ +[config] +bm_open_method=0 @@ -60,22 +68,28 @@ +sort_type=0 +sort_by=0 + ---- a/startlxde.in -+++ b/startlxde.in -@@ -8,9 +8,9 @@ +Index: lxde-common-0.5.0/startlxde.in +=================================================================== +--- lxde-common-0.5.0.orig/startlxde.in 2010-12-06 01:26:04.000000000 +0100 ++++ lxde-common-0.5.0/startlxde.in 2010-12-06 01:26:25.000000000 +0100 +@@ -7,10 +7,10 @@ + fi # Ensure the existance of pcmanfm config file - PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm" +-PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm" -if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then -+if [ ! -f "$PCMANFM_CONF_DIR/LXDE.conf" ]; then ++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/main.lxde "$PCMANFM_CONF_DIR/main.lxde" -+ cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/LXDE.conf" ++ cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" fi # Ensure the existance of openbox config file ---- a/openbox/menu.xml -+++ b/openbox/menu.xml +Index: lxde-common-0.5.0/openbox/menu.xml +=================================================================== +--- lxde-common-0.5.0.orig/openbox/menu.xml 2010-12-06 01:26:04.000000000 +0100 ++++ lxde-common-0.5.0/openbox/menu.xml 2010-12-06 01:26:25.000000000 +0100 @@ -25,7 +25,7 @@ @@ -92,8 +106,10 @@ - \ No newline at end of file + ---- a/Makefile.am -+++ b/Makefile.am +Index: lxde-common-0.5.0/Makefile.am +=================================================================== +--- lxde-common-0.5.0.orig/Makefile.am 2010-12-06 01:26:04.000000000 +0100 ++++ lxde-common-0.5.0/Makefile.am 2010-12-06 01:26:25.000000000 +0100 @@ -33,7 +33,7 @@ pcmanfmdir=$(datadir)/lxde/pcmanfm @@ -112,8 +128,10 @@ $(lxpanel_DATA) \ lxpanel/panel.in ---- a/Makefile.in -+++ b/Makefile.in +Index: lxde-common-0.5.0/Makefile.in +=================================================================== +--- lxde-common-0.5.0.orig/Makefile.in 2010-12-06 01:26:04.000000000 +0100 ++++ lxde-common-0.5.0/Makefile.in 2010-12-06 01:26:25.000000000 +0100 @@ -40,7 +40,7 @@ $(srcdir)/openbox-lxde.in $(srcdir)/startlxde.in \ $(top_srcdir)/configure $(top_srcdir)/lxpanel/panel.in \ diff -Nru lxde-common-0.5.0/debian/patches/14_more_openbox_keybindings.patch lxde-common-0.5.0/debian/patches/14_more_openbox_keybindings.patch --- lxde-common-0.5.0/debian/patches/14_more_openbox_keybindings.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxde-common-0.5.0/debian/patches/14_more_openbox_keybindings.patch 2010-12-05 18:30:41.000000000 +0000 @@ -0,0 +1,84 @@ +Index: lxde-common-0.5.0/openbox/rc.xml.in +=================================================================== +--- lxde-common-0.5.0.orig/openbox/rc.xml.in 2010-12-05 19:29:49.000000000 +0100 ++++ lxde-common-0.5.0/openbox/rc.xml.in 2010-12-05 19:30:35.000000000 +0100 +@@ -287,6 +287,79 @@ + lxtask + + ++ ++ ++ ++ lxterminal ++ ++ ++ ++ ++ ++ ++ ++ true ++ PCManFM ++ ++ pcmanfm ++ ++ ++ ++ ++ ++ ++ scrot ++ ++ ++ ++ ++ ++ scrot -s ++ ++ ++ ++ ++   ++      ++      amixer -q sset Master 3%+ ++    ++   ++ ++   ++      ++       amixer -q sset Master 3%- ++    ++   ++ ++   ++      ++       amixer -q sset Master toggle ++    ++   ++ ++   ++      ++       x-terminal-emulator ++    ++   ++ ++   ++      ++       galculator ++    ++   ++ ++   ++      ++       pcmanfm ++    ++   ++ ++   ++      ++       x-terminal-emulator ++    ++   + + + diff -Nru lxde-common-0.5.0/debian/patches/series lxde-common-0.5.0/debian/patches/series --- lxde-common-0.5.0/debian/patches/series 2010-05-25 21:00:36.000000000 +0000 +++ lxde-common-0.5.0/debian/patches/series 2010-12-06 00:26:19.000000000 +0000 @@ -7,3 +7,4 @@ 11_ensure-desktop-folder.patch 12_autostart-gnome-polkit.patch 13_ensure-menu-prefix.patch +14_more_openbox_keybindings.patch