[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. 3eef8cab2cb6f039b529ffc89deb21a0dcab03df
kaethorn
kaethorn at alioth.debian.org
Sat May 24 15:07:16 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit 7f608c7ea2487f4a9a6b478510c86846d49b07fb
Author: kaethorn <kaethorn>
Date: Mon May 5 23:21:47 2008 +0000
Merge with Debian files from PkgE.
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..0139bde
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,11 @@
+Enlightenment DR0.17
+--------------------
+About the menu files
+ Enlightenment handles the menus according to the FDO menu specification.
+ In order to have an 'Applications' menu, you need to use a .menu file.
+ Please see http://wiki.enlightenment.org/index.php/E17_and_Efreet for further
+ information.
+ If no menu is found, then /etc/xdg/menus/enlightement-applications.menu,
+ provided by the 'e17-data', package, will be used as a fallback
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com> Thu, 01 May 2008 12:58:45 +0200
diff --git a/debian/changelog.in b/debian/changelog.in
index 117f9a0..c9c9069 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,4 +1,4 @@
-enlightenment (1:@VERSION at -1) unstable; urgency=low
+e17 (1:@VERSION at -1) unstable; urgency=low
* a CVS snapshot release.
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..1e8b314
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/debian/control b/debian/control
index f4cd479..191d114 100644
--- a/debian/control
+++ b/debian/control
@@ -1,39 +1,75 @@
-Source: enlightenment
+Source: e17
Section: x11
Priority: optional
Maintainer: Falko Schmidt <falko at alphagemini.org>
-Build-Depends: cdbs, debhelper (>= 6), libevas-dev, libecore-dev, libeet-dev, libedje-dev, libedje-bin, libembryo-dev, libefreet-dev, libx11-dev, libedbus-dev
+Build-Depends: cdbs, debhelper (>= 6), libevas-dev, libecore-dev, libeet-dev, libedje-dev, libedje-bin, libembryo-dev, libefreet-dev, libx11-dev, libedbus-dev, libpam0g-dev, libxext-dev
Standards-Version: 3.7.3
Homepage: http://www.enlightenment.org
-Package: enlightenment
+Package: e17
Section: x11
Architecture: any
-Depends: ${shlibs:Depends}, libevas-engine-buffer, libevas-engine-software-x11
-Suggests: entrance
-Description: Enlightenment themes, etc.
+Depends: ${shlibs:Depends}, e17-data (= ${source:Version}), libevas-engine-buffer, libevas-engine-software-x11
+Suggests: entrance, emodules-all
+Provides: x-window-manager, enlightenment
+Description: The Enlightenment DR17 Window Manager
+ Enlightenment is an advanced window manager for X11. Unique
+ features include: a fully animated background, nice drop shadows
+ around windows, backed by an extremely clean and optimized
+ foundation of APIs.
+ .
+ This package contains the core files for Enlightenment DR17.
+
+Package: e17-data
+Architecture: all
+Enhances: e17
+Description: Enlightenment Window Manager Run Time Data Files
Enlightenment is an advanced window manager for X11. Unique
features include: a fully animated background, nice drop shadows
around windows, backed by an extremely clean and optimized
foundation of APIs.
+ .
+ These are the architecture independent runtime support files for the
+ Enlightenment DR17 Window Manager.
-Package: enlightenment-dev
+Package: e17-dev
Architecture: any
Section: devel
-Depends: enlightenment (= ${Source-Version}), libevas-dev, libecore-dev, libeet-dev, libedje-dev, libembryo-dev, libefreet-dev, libedbus-dev
+Depends: e17 (= ${binary:Version}), efl-dev
Description: Enlightenment headers, static libraries and documentation
- Headers, static libraries and documentation for enlightenment.
+ Enlightenment is an advanced window manager for X11. Unique
+ features include: a fully animated background, nice drop shadows
+ around windows, backed by an extremely clean and optimized
+ foundation of APIs.
+ .
+ This package contains headers, static libraries and documentation for
+ enlightenment.
-Package: e17
+Package: efl-dev
Architecture: any
-Section: x11
-Depends: enlightenment (>= 0.16.999.000), emodules-all
-Description: Virtual package providing the E17 desktop shell
+Section: devel
+Depends: libeet-dev, libevas-dev, libecore-dev, libedje-dev, libefreet-dev, libedbus-dev
+Description: EFL headers, static libraries and documentation
Enlightenment is an advanced window manager for X11. Unique
features include: a fully animated background, nice drop shadows
around windows, backed by an extremely clean and optimized
foundation of APIs.
.
- This virtual package provides all you need to run E17:
- * the E17 windowmanager
- * all E17 modules.
+ This package contains headers, static libraries and documentation for
+ the enlightenment foundation librairies.
+
+Package: e17-dbg
+Architecture: any
+Section: devel
+Depends: e17 (= ${binary:Version})
+Priority: extra
+Description: The Enlightenment DR17 Window Manager
+ Enlightenment is an advanced window manager for X11. Unique
+ features include: a fully animated background, nice drop shadows
+ around windows, backed by an extremely clean and optimized
+ foundation of APIs
+ .
+ This package contains unstripped shared libraries. It is provided primarily
+ to provide a backtrace with names in a debugger, this makes it somewhat
+ easier to interpret core dumps. The libraries are installed in
+ /usr/lib/debug and are automatically used by gdb.
diff --git a/debian/copyright b/debian/copyright
index 1d86c46..4c20db3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,88 @@
This package was debianized by Blake Barnett <shadoi at soulmachine.net> on
-Sat, 28 Nov 2004 14:26:46 -0700.
+ Sat, 28 Nov 2004 14:26:46 -0700.
-The source code is from the e17/apps/e module of the enlightenment CVS
+The source is downloaded from the e17/apps/e module of the enlightenment CVS
tree. For more information, see:
- http://www.enlightenment.org/cvs.html
+ http://www.enlightenment.org
-Upstream Author: Carsten Haitzler <raster at rasterman.com>
+Files: *
+Copyright: © 2000 Carsten Haitzler and various contributors (see AUTHORS)
+License:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies of the Software, its documentation and marketing & publicity
+ materials, and acknowledgment shall be given in the documentation, materials
+ and software packages that this Software was used.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Copyright:
+Files: data/fonts/Vera*.ttf
+Copyright: © 2003 Bitstream, Inc.
+License:
+ Bitstream Vera is a trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of the fonts accompanying this license (“Fonts”)
+ and associated documentation files (the “Font Software”), to
+ reproduce and distribute the Font Software, including without
+ limitation the rights to use, copy, merge, publish, distribute,
+ and/or sell copies of the Font Software, and to permit persons to
+ whom the Font Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright and trademark notices and this permission
+ notice shall be included in all copies of one or more of the Font
+ Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in
+ particular the designs of glyphs or characters in the Fonts may
+ be modified and additional glyphs or characters may be added to
+ the Fonts, only if the fonts are renamed to names not containing
+ either the words “Bitstream” or the word “Vera”.
+ .
+ This License becomes null and void to the extent applicable to
+ Fonts or Font Software that has been modified and is distributed
+ under the “Bitstream Vera” names.
+ .
+ The Font Software may be sold as part of a larger software
+ package but no copy of one or more of the Font Software typefaces
+ may be sold by itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY
+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER
+ RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY
+ GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR
+ FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising
+ or otherwise to promote the sale, use or other dealings in this
+ Font Software without prior written authorization from the Gnome
+ Foundation or Bitstream Inc., respectively. For further
+ information, contact: fonts at gnome dot org.
-Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+Files: debian/*
+Copyright: © 2006-2008 Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
+License: GPL-2+
+ The Debian packaging information is licensed under the GPL, version 2 or
+ later.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies of the Software, its documentation and marketing & publicity
-materials, and acknowledgment shall be given in the documentation, materials
-and software packages that this Software was used.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License (version 2) can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/e17-data.doc-base b/debian/e17-data.doc-base
new file mode 100644
index 0000000..1d8c2f3
--- /dev/null
+++ b/debian/e17-data.doc-base
@@ -0,0 +1,12 @@
+Document: enlightenment
+Title: Enlightenment DR17 Documentation
+Author: Carsten Haitzler
+Abstract: This document describes what is Enlightenment DR17 and how it works
+Section: Window Managers
+
+Format: text
+Files: /usr/share/doc/enlightenment/*.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/enlightenment/html/documentation.html
+Files: /usr/share/doc/enlightenment/html/documentation.html
diff --git a/debian/e17-data.install b/debian/e17-data.install
new file mode 100644
index 0000000..9b6c12f
--- /dev/null
+++ b/debian/e17-data.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/share/enlightenment
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/xsessions
+debian/enlightenment-applications.menu etc/xdg/menus
+debian/tmp/usr/share/enlightenment/doc/documentation.html usr/share/doc/enlightenment/html
+debian/tmp/usr/share/enlightenment/doc/enlightenment.png usr/share/doc/enlightenment/html
+debian/tmp/usr/share/enlightenment/doc/*.txt.gz usr/share/doc/enlightenment
diff --git a/debian/e17-data.lintian-overrides b/debian/e17-data.lintian-overrides
new file mode 100644
index 0000000..25b9347
--- /dev/null
+++ b/debian/e17-data.lintian-overrides
@@ -0,0 +1 @@
+e17-data: package-contains-empty-directory usr/share/enlightenment/data/fonts/
diff --git a/debian/enlightenment-dev.install b/debian/e17-dev.install
similarity index 100%
copy from debian/enlightenment-dev.install
copy to debian/e17-dev.install
diff --git a/debian/e17.install b/debian/e17.install
new file mode 100644
index 0000000..7965669
--- /dev/null
+++ b/debian/e17.install
@@ -0,0 +1,16 @@
+debian/tmp/usr/bin/enlightenment
+debian/tmp/usr/bin/enlightenment_remote
+debian/tmp/usr/bin/enlightenment_start
+debian/tmp/usr/bin/enlightenment_imc
+debian/tmp/usr/bin/enlightenment_fm usr/lib/enlightenment
+debian/tmp/usr/bin/enlightenment_init usr/lib/enlightenment
+debian/tmp/usr/bin/enlightenment_sys usr/lib/enlightenment
+debian/tmp/usr/bin/enlightenment_thumb usr/lib/enlightenment
+debian/tmp/usr/etc/enlightenment/sysactions.conf etc/enlightenment/sysactions.conf
+debian/tmp/usr/lib/enlightenment/preload/e_precache.so
+debian/tmp/usr/lib/enlightenment/modules/*/*/module.so
+debian/tmp/usr/lib/enlightenment/modules/*/module.desktop
+debian/tmp/usr/lib/enlightenment/modules/*/e-module-*.edj
+#debian/tmp/usr/lib/enlightenment/modules/battery/*/batget
+debian/tmp/usr/lib/enlightenment/modules/cpufreq/*/freqset
+debian/tmp/usr/lib/enlightenment/modules/temperature/*/tempget
diff --git a/debian/e17.lintian-overrides b/debian/e17.lintian-overrides
new file mode 100644
index 0000000..b927362
--- /dev/null
+++ b/debian/e17.lintian-overrides
@@ -0,0 +1 @@
+e17: possible-gpl-code-linked-with-openssl
diff --git a/debian/e17.postinst b/debian/e17.postinst
new file mode 100644
index 0000000..e6725dc
--- /dev/null
+++ b/debian/e17.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+wm=enlightenment_start
+
+update-alternatives --install /usr/bin/x-window-manager x-window-manager \
+ /usr/bin/$wm 90
+
+#DEBHELPER#
diff --git a/debian/e17.prerm b/debian/e17.prerm
new file mode 100644
index 0000000..fe0fc26
--- /dev/null
+++ b/debian/e17.prerm
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+wm=enlightenment_start
+
+case "$1" in
+ remove|upgrade|failed-upgrade)
+ update-alternatives --remove x-window-manager /usr/bin/$wm
+;;
+*)
+;;
+esac
+
+#DEBHELPER#
diff --git a/debian/enlightenment-applications.menu b/debian/enlightenment-applications.menu
new file mode 100644
index 0000000..88c3b5d
--- /dev/null
+++ b/debian/enlightenment-applications.menu
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu
+ PUBLIC '-//freedesktop//DTD Menu 1.0//EN'
+ 'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'>
+
+
+<Menu>
+ <Name>Applications</Name>
+ <DefaultDirectoryDirs/>
+ <DefaultAppDirs/>
+
+ <Layout>
+ <Menuname>Audio-Video</Menuname>
+ <Menuname>Internet</Menuname>
+ <Menuname>Office</Menuname>
+ <Menuname>Graphics</Menuname>
+ <Menuname>Games</Menuname>
+ <Menuname>Development</Menuname>
+ <Separator/>
+ <Menuname>Settings</Menuname>
+ <Menuname>Administration</Menuname>
+ </Layout>
+
+ <Menu>
+ <Name>Audio-Video</Name>
+ <Include> <Category>AudioVideo</Category> </Include>
+ </Menu>
+ <Menu>
+ <Name>Internet</Name>
+ <Include> <Category>Network</Category> </Include>
+ </Menu>
+ <Menu>
+ <Name>Development</Name>
+ <Include> <Category>Development</Category> </Include>
+ </Menu>
+ <Menu>
+ <Name>Office</Name>
+ <Include> <Category>Office</Category> </Include>
+ </Menu>
+ <Menu>
+ <Name>Graphics</Name>
+ <Include> <Category>Graphics</Category> </Include>
+ </Menu>
+ <Menu>
+ <Name>Administration</Name>
+ <Include> <And><Category>System</Category><Category>Settings</Category></And> </Include>
+ </Menu>
+ <Menu>
+ <Name>Settings</Name>
+ <Include> <And><Category>System</Category><Not><Category>Settings</Category></Not></And> </Include>
+ </Menu>
+ <Menu>
+ <Name>Games</Name>
+ <Include><Category>Game</Category></Include>
+ </Menu>
+</Menu>
diff --git a/debian/enlightenment-config.1 b/debian/enlightenment-config.1
new file mode 100644
index 0000000..e55354a
--- /dev/null
+++ b/debian/enlightenment-config.1
@@ -0,0 +1,41 @@
+.TH ENLIGHTENMENT-CONFIG 1 "May 1, 2008" enlightenment
+.SH NAME
+enlighenment-config \- get and set informations about installed enlightenment
+.SH SYNOPSIS
+.B enlightenment-config
+[\fIOPTION\fR] ...
+.br
+.SH DESCRIPTION
+Provides information about the installed enlightenment (e17) program
+.SH OPTION
+Values for OPTION are:
+.TP
+\fB\-\-prefix[=DIR]\fR
+print prefix. If DIR is given, set the prefix to DIR
+.TP
+\fB\-\-exec-prefix[=DIR]\fR
+print path to directory containing executables. If DIR is given, set the prefix to DIR
+.TP
+\fB\-\-libs\fR
+print library linking information
+.TP
+\fB\-\-cflags\fR
+print preprocessor flags and compiler options
+.TP
+\fB\-\-modules-dir\fR
+print installation patch of the modules
+.TP
+\fB\-\-help\fR
+print this help and exit
+.TP
+\fB\-\-version\fR
+print version information
+.SH BUGS
+To report a bug, please visit \fIhttp://bugs.enlightenment.org/\fR
+.SH AUTHOR
+.TP
+enlightenment was written by the Enlightenment Development Team
+.I http://web.enlightenment.org
+.PP
+This manual page was written by Albin Tonnerre <albin.tonnerre at gmail.com>
+for the Debian project (but may be used by others).
diff --git a/debian/enlightenment.1 b/debian/enlightenment.1
new file mode 100644
index 0000000..8fad947
--- /dev/null
+++ b/debian/enlightenment.1
@@ -0,0 +1,36 @@
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ENLIGHTENMENT 1 "May 1, 2008" enlightenment
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+enlightenment \- This is just a placeholder until real man page has been written
+.SH SYNOPSIS
+.B enlightenment
+[\fIOPTION\fR] ...
+.SH DESCRIPTION
+.PP
+\fBenlightenment\fP does not have a man page yet.
+.SH OPTIONS
+.\"These programs follow the usual GNU command line syntax, with long
+.\"options starting with two dashes (`-').
+.\"A summary of options is included below.
+.\"For a complete description, see the Info files.
+.SH SEE ALSO
+.SH AUTHOR
+enlightenment was written by the Enlightenment Development Team
+.I http://web.enlightenment.org
+.PP
+This manual page was written by Albin Tonnerre <albin.tonnerre at gmail.com>
+for the Debian project (but may be used by others).
diff --git a/debian/enlightenment_imc.1 b/debian/enlightenment_imc.1
new file mode 100644
index 0000000..e7001ff
--- /dev/null
+++ b/debian/enlightenment_imc.1
@@ -0,0 +1,36 @@
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ENLIGHTENMENT_IMC 1 "May 1, 2008" enlightenment
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+enlightenment_imc \- This is just a placeholder until real man page has been written
+.SH SYNOPSIS
+.B enlightenment_imc
+[\fIOPTION\fR] ...
+.SH DESCRIPTION
+.PP
+\fBenlightenment_imc\fP does not have a man page yet.
+.SH OPTIONS
+.\"These programs follow the usual GNU command line syntax, with long
+.\"options starting with two dashes (`-').
+.\"A summary of options is included below.
+.\"For a complete description, see the Info files.
+.SH SEE ALSO
+.SH AUTHOR
+enlightenment was written by the Enlightenment Development Team
+.I http://web.enlightenment.org
+.PP
+This manual page was written by Albin Tonnerre <albin.tonnerre at gmail.com>
+for the Debian project (but may be used by others).
diff --git a/debian/enlightenment_remote.1 b/debian/enlightenment_remote.1
new file mode 100644
index 0000000..59743c6
--- /dev/null
+++ b/debian/enlightenment_remote.1
@@ -0,0 +1,36 @@
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ENLIGHTENMENT_REMOTE 1 "May 1, 2008" enlightenment
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+enlightenment_remote \- This is just a placeholder until real man page has been written
+.SH SYNOPSIS
+.B enlightenment_remote
+[\fIOPTION\fR] ...
+.SH DESCRIPTION
+.PP
+\fBenlightenment_remote\fP does not have a man page yet.
+.SH OPTIONS
+.\"These programs follow the usual GNU command line syntax, with long
+.\"options starting with two dashes (`-').
+.\"A summary of options is included below.
+.\"For a complete description, see the Info files.
+.SH SEE ALSO
+.SH AUTHOR
+enlightenment was written by the Enlightenment Development Team
+.I http://web.enlightenment.org
+.PP
+This manual page was written by Albin Tonnerre <albin.tonnerre at gmail.com>
+for the Debian project (but may be used by others).
diff --git a/debian/enlightenment_start.1 b/debian/enlightenment_start.1
new file mode 100644
index 0000000..e8083bf
--- /dev/null
+++ b/debian/enlightenment_start.1
@@ -0,0 +1,36 @@
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ENLIGHTENMENT_START 1 "May 1, 2008" enlightenment
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+enlightenment_start \- This is just a placeholder until real man page has been written
+.SH SYNOPSIS
+.B enlightenment_start
+[\fIOPTION\fR] ...
+.SH DESCRIPTION
+.PP
+\fBenlightenment_start\fP does not have a man page yet.
+.SH OPTIONS
+.\"These programs follow the usual GNU command line syntax, with long
+.\"options starting with two dashes (`-').
+.\"A summary of options is included below.
+.\"For a complete description, see the Info files.
+.SH SEE ALSO
+.SH AUTHOR
+enlightenment was written by the Enlightenment Development Team
+.I http://web.enlightenment.org
+.PP
+This manual page was written by Albin Tonnerre <albin.tonnerre at gmail.com>
+for the Debian project (but may be used by others).
diff --git a/debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff b/debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff
new file mode 100644
index 0000000..3e7c454
--- /dev/null
+++ b/debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff
@@ -0,0 +1,103 @@
+diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
+--- a/src/bin/e_fm.c
++++ b/src/bin/e_fm.c
+@@ -1449,7 +1449,7 @@ _e_fm2_client_spawn(void)
+ char buf[4096];
+
+ if (_e_fm2_client_spawning) return;
+- snprintf(buf, sizeof(buf), "%s/enlightenment_fm", e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_fm", e_prefix_lib_get());
+ exe = ecore_exe_run(buf, NULL);
+ _e_fm2_client_spawning = 1;
+ }
+diff --git a/src/bin/e_init.c b/src/bin/e_init.c
+--- a/src/bin/e_init.c
++++ b/src/bin/e_init.c
+@@ -79,8 +79,8 @@ e_init_show(void)
+ if (version) ver = strdup(e_util_filename_escape(version));
+ else ver = strdup("XvX");
+
+- snprintf(buf, sizeof(buf), "%s/enlightenment_init %s %i %i %s %s",
+- e_prefix_bin_get(),
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_init %s %i %i %s %s",
++ e_prefix_lib_get(),
+ theme,
+ e_canvas_engine_decide(e_config->evas_engine_init),
+ e_config->font_hinting,
+diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
+--- a/src/bin/e_sys.c
++++ b/src/bin/e_sys.c
+@@ -126,13 +126,13 @@ _e_sys_cb_timer(void *data)
+ char buf[4096];
+
+ e_init_status_set(_("Checking System Permissions"));
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t halt", e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t halt", e_prefix_lib_get());
+ _e_sys_halt_check_exe = ecore_exe_run(buf, NULL);
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t reboot", e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t reboot", e_prefix_lib_get());
+ _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL);
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t suspend", e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t suspend", e_prefix_lib_get());
+ _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t hibernate", e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t hibernate", e_prefix_lib_get());
+ _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
+ return 0;
+ }
+@@ -469,8 +469,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+ case E_SYS_HALT:
+ /* shutdown -h now */
+ if (e_util_immortal_check()) return 0;
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys halt",
+- e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys halt",
++ e_prefix_lib_get());
+ if (_e_sys_exe)
+ {
+ _e_sys_current_action();
+@@ -496,8 +496,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+ case E_SYS_REBOOT:
+ /* shutdown -r now */
+ if (e_util_immortal_check()) return 0;
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys reboot",
+- e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys reboot",
++ e_prefix_lib_get());
+ if (_e_sys_exe)
+ {
+ _e_sys_current_action();
+@@ -522,8 +522,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+ break;
+ case E_SYS_SUSPEND:
+ /* /etc/acpi/sleep.sh force */
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys suspend",
+- e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys suspend",
++ e_prefix_lib_get());
+ if (_e_sys_exe)
+ {
+ _e_sys_current_action();
+@@ -548,8 +548,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+ break;
+ case E_SYS_HIBERNATE:
+ /* /etc/acpi/hibernate.sh force */
+- snprintf(buf, sizeof(buf), "%s/enlightenment_sys hibernate",
+- e_prefix_bin_get());
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys hibernate",
++ e_prefix_lib_get());
+ if (_e_sys_exe)
+ {
+ _e_sys_current_action();
+diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
+--- a/src/bin/e_thumb.c
++++ b/src/bin/e_thumb.c
+@@ -134,7 +134,7 @@ e_thumb_icon_begin(Evas_Object *obj)
+ {
+ Ecore_Exe *exe;
+
+- snprintf(buf, sizeof(buf), "%s/enlightenment_thumb --nice=%d", e_prefix_bin_get(),
++ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_thumb --nice=%d", e_prefix_lib_get(),
+ e_config->thumb_nice);
+ exe = ecore_exe_run(buf, NULL);
+ _thumbnailers_exe = evas_list_append(_thumbnailers_exe, exe);
diff --git a/debian/rules b/debian/rules
index 818af3b..73581dd 100644
--- a/debian/rules
+++ b/debian/rules
@@ -2,18 +2,28 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget batget
DEB_MAKE_CLEAN_TARGET := clean
+DEB_INSTALL_MANPAGES_e17 := $(DEB_SRCDIR)/debian/enlightenment.1 $(DEB_SRCDIR)/debian/enlightenment_*.1
+DEB_INSTALL_MANPAGES_e17-dev := $(DEB_SRCDIR)/debian/enlightenment-config.1
+DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
-install/enlightenment::
- mkdir debian/enlightenment/etc
- mv debian/tmp/usr/etc/enlightenment debian/enlightenment/etc/
- find debian/tmp/usr/lib/enlightenment/modules/cpufreq/ -name 'freqset' -exec chmod 4755 {} \;
- find debian/tmp/usr/lib/enlightenment/modules/temperature/ -name 'tempget' -exec chmod 4755 {} \;
- find debian/tmp/usr/lib/enlightenment/modules/temperature/ -name 'batget' -exec chmod 4755 {} \;
- chmod 4555 debian/tmp/usr/bin/enlightenment_sys
+install/e17-data::
+ gzip -9 debian/tmp/usr/share/enlightenment/doc/*.txt
+ rm debian/tmp/usr/share/enlightenment/COPYING
+ rm debian/tmp/usr/share/enlightenment/data/fonts/*
+
+install/e17::
+ #rm -r debian/tmp/usr/lib/enlightenment/modules/layout
+ rm -r debian/tmp/usr/lib/enlightenment/modules/wizard
+
+binary-predeb/e17::
+ chmod 4755 debian/e17/usr/lib/enlightenment/enlightenment_sys
+ chmod 4755 debian/e17/usr/lib/enlightenment/modules/cpufreq/*/freqset
+ chmod 4755 debian/e17/usr/lib/enlightenment/modules/temperature/*/tempget
clean::
./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS)
-
--
Enlightenment 17
More information about the Pkg-e-commits
mailing list