--- lxde-common-0.5.0.orig/debian/watch +++ lxde-common-0.5.0/debian/watch @@ -0,0 +1,12 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to find new files on sourceforge, for debscripts >= 2.9 +http://sf.net/lxde/lxde-common-(.*)\.tar\.(gz|bz2) + + --- lxde-common-0.5.0.orig/debian/prerm +++ lxde-common-0.5.0/debian/prerm @@ -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 --- lxde-common-0.5.0.orig/debian/NEWS +++ lxde-common-0.5.0/debian/NEWS @@ -0,0 +1,27 @@ +lxde-common (0.5.0-2) unstable; urgency=low + + * startlxde script now executes 'lxsession -s LXDE -e LXDE' rather + than 'lxsession -s LXDE' to reflect the changes in lxsession 0.4.1. + + -- Andrew Lee (李健秋) Fri, 18 Dec 2009 22:57:59 +0800 + +lxde-common (0.5.0-1) unstable; urgency=low + + * Since lxde-settings-daemon merged into lxsession, we ship a new autostart + file without launch lxde-settings-daemon for LXDE within this package. + Please update to new autostart file or simply drop '@lxde-settings-daemon' + from it. + + * Reads README.Debian for new file location of lxsession + + -- Andrew Lee (李健秋) Fri, 18 Dec 2009 15:47:42 +0800 + +lxde-common (0.4.1-1) unstable; urgency=low + + * lxde-settings binary split out to lxde-settings-daemon package and + renamed to lxde-settings-daemon. If you have custom config, please + check if it starts with '@lxde-settings-daemon'. + + * Default conffile patch moved from /usr/share to /etc + + -- Andrew Lee Sun, 10 May 2009 16:46:02 +0800 --- lxde-common-0.5.0.orig/debian/README.source +++ lxde-common-0.5.0/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- lxde-common-0.5.0.orig/debian/lxde-screenlock.desktop +++ lxde-common-0.5.0/debian/lxde-screenlock.desktop @@ -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 --- lxde-common-0.5.0.orig/debian/control +++ lxde-common-0.5.0/debian/control @@ -0,0 +1,63 @@ +Source: lxde-common +Section: x11 +Priority: optional +Maintainer: Andrew Lee (李健秋) +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 + +Package: lxde-common +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, lxsession (>= 0.4.1) +Recommends: lxde-core (>= ${source:Version}) +Suggests: lxlauncher +Description: the Lightweight X11 Desktop Environment configuration data + LXDE (the Lightweight X11 Desktop Environment) is a project aimed + to provide a new desktop environment which is lightweight and fast. + . + It's not designed to be powerful and bloated, but to be usable and slim + enough, and keep the resource usage low. Different from other desktop + environments, lxde don't tightly integrate every component. Instead, + lxde tried to make all components independent, and each of them can be + used independently with fewer dependencies. + . + Features: + - Lightweight, runs with reasonable memory usage + - Fast, rund well even on older machines produced in 1999 + - Good-looking, GTK+ 2 internationalized user interface + - Easy-to-use, the user interface is simple, but usable enough + - Desktop independent (suprise! Every component can be used without LXDE) + - Standard compliant, follows the specs on freedesktop.org + +Package: lxde-core +Architecture: all +Depends: lxde-common (>= ${source:Version}), pcmanfm (>=0.3.9.5), lxpanel (>= 0.4), openbox (>= 3.4.6.1) +Recommends: hal, xscreensaver, lxterminal | x-terminal-emulator +Suggests: lxlauncher, 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. + . + This package is a metapackage depends on the recommended core components + of the LXDE. It includes pcmanfm, lxpanel, lxsession, openbox and + xscreensaver. + . + If you just want to pick and choose the core components then feel free + to remove this package. + +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 +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. + . + This package is a metapackage depends on the core components and + recommended components of the LXDE. It includes lxde-core, lxappearance, + lxinput, lxsession-edit, lxshortcut, gpicview, lxterminal, lxmusic, + leafpad and xarchiver. + . + If you just want to pick and choose the core components then feel free + to remove this package. --- lxde-common-0.5.0.orig/debian/copyright +++ lxde-common-0.5.0/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by Andrew Lee on +Mon, 03 Mar 2008 02:12:36 +0800. + +It was downloaded from http://lxde.sourceforge.net + +Upstream Authors: + + Hong Jen Yee (PCMan) + Fred Chien + +Copyright Holder: + + Copyright (C) 2008 Hong Jen Yee (PCMan) + + +The nuoveXT2 icon theme: + http://www.gnome-look.org/content/show.php/nuoveXT+2?content=56625 + + Copyright (C) 2005-2007 Alexandre Moore + + Licensed under the GNU Library General Public License (LGPL), + either version 2, or (at your option) any later version. + +On Debian GNU/Linux systems, the complete text of the GNU Library +General Public License can be found in `/usr/share/common-licenses/LGPL'. + + +Files lxde-settings/xsettings-{common,manager}.* lxde-settings/xutils.*: + + Copyright (C) 2001 Owen Taylor, Matthias Clasen, Red Hat, Inc. + + Licensed under the MIT license + +See 'http://www.opensource.org/licenses/mit-license.php' for full-text. + +License: + + This software is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + + +The Debian packaging is (C) 2008, Andrew Lee and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + --- lxde-common-0.5.0.orig/debian/changelog +++ lxde-common-0.5.0/debian/changelog @@ -0,0 +1,128 @@ +lxde-common (0.5.0-2) unstable; urgency=low + + * Added 02_lxsession_0.4.1.dpatch to support new command line argument in + lxsession 0.4.1 + * debian/control: depends on lxsession (>=0.4.1) + + -- Andrew Lee (李健秋) Fri, 18 Dec 2009 22:53:55 +0800 + +lxde-common (0.5.0-1) unstable; urgency=low + + * New upstream release + - New config files to support new changes in lxsession + - Added some translation to lxde-logout + - Remove icon theme from it (Closes: #545248) + * debian/control: + - lxde-common: remove depends on lxde-setting-daemon + - lxde-core: remove depends on lxsessions + - lxde: move lxmusic from depends to recommends + - lxde: added depends on lxde-icon-theme + * Updated debian/watch + * debian/rules: + - drop desktop.conf(included in upstream) + * Added README.source + * Updated README.Debian and NEWS.Debian + * Bumped Standard-version to 3.8.3 + + -- Andrew Lee (李健秋) Fri, 18 Dec 2009 15:48:43 +0800 + +lxde-common (0.4.2-3) unstable; urgency=low + + * Added desktop.conf for the built-in settings daemon in lxsession (>=0.4) + * See x-terminal-emulator as default terminal for pcmanfm + + -- Andrew Lee (李健秋) Mon, 16 Nov 2009 13:40:44 +0800 + +lxde-common (0.4.2-2) unstable; urgency=low + + * debian/control: + - Update lxde-common depends on lxde-settings-daemon | lxsession (>= 0.4.0) + * Bump Standard-version to 3.8.3 + * Minor update in README.Debian + + -- Andrew Lee (李健秋) Sun, 15 Nov 2009 23:48:37 +0800 + +lxde-common (0.4.2-1) unstable; urgency=low + + * New upstream release + - Remove spurious reference to file "default" + - Use ln -s -f so reinstalling works + - Use Docbook-XML instead of SGML for manpages + - Translation update + * Correct debian/watch + * debian/control: + - Update package descriptions + - Recommends on gdm | x-display-manager + + -- Andrew Lee (李健秋) Sun, 26 Jul 2009 20:08:50 +0200 + +lxde-common (0.4.1-2) unstable; urgency=low + + * debian/control: + - Update depends/recommends/suggests by advices from Jonas Smedegaard + - Bumped Standard-version to 3.8.2 + + -- Andrew Lee Sun, 19 Jul 2009 13:24:07 +0200 + +lxde-common (0.4.1-1) unstable; urgency=low + + * New upstream release (Closes:#517727, #517499, #527079) + - Split lxde-settings-daemon to separate package. + * debian/control: + - Added lxde-core depends on lxsession (>= 0.3.7) + - Added lxde depends on lxinput (>=0.1), lxsession-edit, lxshortcut + and lxmusic + - Suggests on s/x-www-browser/www-browser/ + * Conffiles are now standard at /etc/xdg location (Closes: #517740) + + -- Andrew Lee Fri, 29 May 2009 20:17:55 +0800 + +lxde-common (0.3.2.1+svn20080509-6) unstable; urgency=low + + * Set x-session-manager with priority 50 (same as xfce4) + (Closes:#511577) + * lxde-core: + - Suggests lxterminal, x-www-browser. (Closes:#524177) + - Recommends xscreensaver. (Closes:#524391) + * Minor description fix. (Closes:#502385) + + -- Andrew Lee Thu, 23 Apr 2009 14:23:15 +0800 + +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 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) + + -- Andrew Lee Sat, 12 Jul 2008 11:44:09 +0800 + +lxde-common (0.3.2.1+svn20080509-3) unstable; urgency=low + + * lxde-settings-daemon recommends lxde-common (Closes: #485642) + * new metapackae lxde-core + * Corrected dh_movefiles in debian/rules (Closes: #487854) + * Bumped Standards-Version to 3.8.0.0 + - Supporting the standardized environment variable `DEB_BUILD_OPTIONS' + + -- Andrew Lee Sat, 28 Jun 2008 22:13:52 +0800 + +lxde-common (0.3.2.1+svn20080509-2) unstable; urgency=low + + * debian/copyright: + Point full text of LGPL on the system + + -- Andrew Lee Thu, 29 May 2008 17:24:41 +0800 + +lxde-common (0.3.2.1+svn20080509-1) unstable; urgency=low + + * Initial release (Closes: #471954) + + -- Andrew Lee Thu, 29 May 2008 00:17:30 +0800 --- lxde-common-0.5.0.orig/debian/dirs +++ lxde-common-0.5.0/debian/dirs @@ -0,0 +1 @@ +usr/bin --- lxde-common-0.5.0.orig/debian/postinst +++ lxde-common-0.5.0/debian/postinst @@ -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 --- lxde-common-0.5.0.orig/debian/compat +++ lxde-common-0.5.0/debian/compat @@ -0,0 +1 @@ +5 --- lxde-common-0.5.0.orig/debian/rules +++ lxde-common-0.5.0/debian/rules @@ -0,0 +1,99 @@ +#!/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 $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess + rm -f lxde-settings/*.gcno + + 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 --- lxde-common-0.5.0.orig/debian/README.Debian +++ lxde-common-0.5.0/debian/README.Debian @@ -0,0 +1,17 @@ + lxde-common README.Debian + --------------------- + + +Important Note +-------------- +lxde-common package provides a set of default configuration for LXDE. + +Newer version of lxsession (>=0.4.0) has build-in XSETTINGS daemon. + +File Location +------------- +lxsession reads config file from /etc/xdg/lxsession/LXDE/desktop.conf +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. + --- lxde-common-0.5.0.orig/debian/docs +++ lxde-common-0.5.0/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- lxde-common-0.5.0.orig/debian/lxde-logout.desktop +++ lxde-common-0.5.0/debian/lxde-logout.desktop @@ -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 --- lxde-common-0.5.0.orig/debian/patches/01_default-config.dpatch +++ lxde-common-0.5.0/debian/patches/01_default-config.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_default-config.dpatch by Andrew Lee +## +## 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 --- lxde-common-0.5.0.orig/debian/patches/02_lxsession_0.4.1.dpatch +++ lxde-common-0.5.0/debian/patches/02_lxsession_0.4.1.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_lxsession_0.4.1.dpatch by Andrew Lee (李健秋) +## +## 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 --- lxde-common-0.5.0.orig/debian/patches/00list +++ lxde-common-0.5.0/debian/patches/00list @@ -0,0 +1,2 @@ +01_default-config.dpatch +02_lxsession_0.4.1.dpatch