[Pkg-xfce-commits] r5160 - desktop/trunk/exo/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Wed Mar 30 04:08:44 UTC 2011
Author: corsac
Date: 2011-03-30 16:08:38 +0000 (Wed, 30 Mar 2011)
New Revision: 5160
Added:
desktop/trunk/exo/debian/exo-utils.manpages
desktop/trunk/exo/debian/libexo-1-0.docs
desktop/trunk/exo/debian/libexo-1-0.install
desktop/trunk/exo/debian/libexo-1-0.symbols
desktop/trunk/exo/debian/libexo-1-dev.install
desktop/trunk/exo/debian/libexo-common.postinst
desktop/trunk/exo/debian/libexo-common.postrm
desktop/trunk/exo/debian/libexo-common.preinst
desktop/trunk/exo/debian/patches/
Removed:
desktop/trunk/exo/debian/README.Debian
desktop/trunk/exo/debian/README.source
desktop/trunk/exo/debian/exo-eject.1
desktop/trunk/exo/debian/exo-mount.1
desktop/trunk/exo/debian/exo-unmount.1
desktop/trunk/exo/debian/libexo-0.3-0.docs
desktop/trunk/exo/debian/libexo-0.3-0.install
desktop/trunk/exo/debian/libexo-0.3-0.shlibs
desktop/trunk/exo/debian/libexo-0.3-dev.install
desktop/trunk/exo/debian/python2.3-exo0.3.examples
desktop/trunk/exo/debian/python2.3-exo0.3.install
desktop/trunk/exo/debian/python2.3-exo0.3.postinst
desktop/trunk/exo/debian/python2.3-exo0.3.prerm
Modified:
desktop/trunk/exo/debian/changelog
desktop/trunk/exo/debian/compat
desktop/trunk/exo/debian/control
desktop/trunk/exo/debian/copyright
desktop/trunk/exo/debian/libexo-common.install
desktop/trunk/exo/debian/rules
Log:
merge 4.8 branch from experimental
Deleted: desktop/trunk/exo/debian/README.Debian
===================================================================
--- desktop/trunk/exo/debian/README.Debian 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/README.Debian 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,8 +0,0 @@
-exo for Debian
------------------
-
-This version is an svn snapshot of exo, and thus can have lots of bugs. This
-version is mandatory for Thunar, but xfmedia and xfce4-terminal should work
-fine. Please report bugs if you encounter any problem.
-
- -- Yves-Alexis Perez <corsac at corsac.net>, Tue, 06 Dec 2005 23:41:35 +0100
Deleted: desktop/trunk/exo/debian/README.source
===================================================================
--- desktop/trunk/exo/debian/README.source 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/README.source 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,2 +0,0 @@
-exo uses quilt patch system to apply patch at build-time. More information
-can be found in /usr/share/doc/quilt/README.source.
Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/changelog 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,18 +1,35 @@
-exo (0.3.107-2) UNRELEASED; urgency=low
+exo (0.6.0-3) UNRELEASED; urgency=low
* debian/control:
- bump debhelper build-dep to 7.2.7 for --remaining-packages.
-- Yves-Alexis Perez <corsac at debian.org> Sat, 08 Jan 2011 17:26:41 +0100
-exo (0.3.107-1) unstable; urgency=low
+exo (0.6.0-2) experimental; urgency=low
+ * debian/control:
+ - update build-dependencies to Xfce 4.8. closes: #612395
+ - add debhelper 8.1.0 build-conflicts since we use --remaining-packages in
+ an override target.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Feb 2011 10:43:38 +0100
+
+exo (0.6.0-1) experimental; urgency=low
+
* New upstream release.
* debian/patches:
- 01_fix-treeview-gtk2.20.patch dropped, included upstream.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 23 May 2010 13:26:28 +0200
+exo (0.3.107-1) unstable; urgency=low
+
+ * debian/control:
+ - drop debhelper build-conflict, not supported for that purpose and 8.1.0
+ is not available anywhere anymore anyway.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Feb 2011 18:43:40 +0100
+
exo (0.3.106-2) unstable; urgency=low
[ Lionel Le Folgoc ]
@@ -74,6 +91,130 @@
exo (0.3.105-1) unstable; urgency=low
* New upstream release.
+=======
+ - this releases doesn't use HAL anymore. closes: #604793
+ * debian/rules:
+ - adapt rules to changed soname.
+ - get *FLAGS from dpkg-buildflags.
+ - don't pass libexecdir, not used anymore
+ - correct exo-helper path in chrpath call
+ - add hardening flags to {C,LD}FLAGS
+ * debian/control:
+ - change binary packages name to match updated soname.
+ - use proper relation in conflict.
+ - drop build-dep on libxfcegui4, add one on libxfce4ui.
+ - add build-dep on libxfce4util-dev.
+ - add dep on ${misc:Depends} for libexo-1-dev.
+ - update standards version to 3.9.1.
+ - add build-dep on hardening-includes
+ - build-dep on experimental glib since we don't install the GIO module
+ anymore.
+ - bump debhelper build-dep to 7.2.7 for --remaining-packages.
+ * debian/libexo-common.{preinst,postinst,prerm}:
+ - use dpkg-maintscript-helper to remove /etc/xdg/xfce4/mount.rc.
+ * debian/libexo-0-1.install:
+ - update helpers path
+
+ [ Lionel Le Folgoc ]
+ * debian/exo-utils.manpages: added.
+ * debian/control:
+ - drop liburi-perl from Depends to Recommends. It's only needed for the
+ mail composition script for mailto:// hyperlinks, which is not a strictly
+ required feature, and allows small projects to get rid of Perl
+ - exo-utils breaks some versions of panel plugins that rely on exo-mount
+ (xfce4-volstatus-icon and xfce4-cddrive-plugin, only in ubuntu)
+ - drop some trailing spaces.
+ * debian/rules:
+ - switch to rules.tiny + overrides
+ * debian/compat: bump to 7.
+ * debian/README.*: dropped, contain outdated info.
+ * Hal support removed upstream:
+ - debian/control:
+ + drop hal (and eject) build and binary dependencies (use GIO instead)
+ + drop libnotify-dev build-dep, exo-mount-notify has been dropped upstream
+ + drop references to exo-mount, exo-unmount, exo-eject and mountrc from
+ long descriptions
+ - debian/exo-{eject,mount,unmount}.1: dropped
+ - debian/exo-utils.manpages: refreshed
+ - debian/libexo-1-0.shlibs: dropped libexo-hal
+ - debian/rules:
+ + do not pass --enable-notifications, does not exist anymore
+ + drop remaining references to exo-hal
+ - debian/libexo-common.preinst: added to delete obsolete mount.rc conffile.
+ * debian/patches:
+ - 01_fix-treeview-gtk2.20.patch: dropped, included upstream
+ - series: dropped, no patch left.
+ * debian/libexo-common.install: ship usr/share/doc/exo/html as well.
+ * debian/libexo-1-0.symbols: added.
+ * debian/libexo-1-0.shlibs: dropped.
+ * debian/copyright: refreshed.
+ * Bugs fixed by 0.5.x/0.6.x series:
+ - FTBFS with binutils-gold Closes: #554276
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 06 Feb 2011 17:04:43 +0100
+
+exo (0.3.106-2) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/control: fix typos in exo-utils-dbg and libexo-common long descs.
+ * debian/patches:
+ - 01_fix-treeview-gtk2.20.patch: make the treeview work again with gtk 2.20
+ (Xfce #6230, lp: #520118, closes: #576706).
+ - series: add this patch.
+ * debian/control:
+ - add myself to Uploaders.
+
+ [Stefan Ott]
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update standards version to 3.8.4.
+ - add ${misc:Depends} to Depends.
+ - update conflicts relation forms.
+ * switch format to 3.0 (quilt).
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 11 May 2010 23:26:05 +0200
+
+exo (0.3.106-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - fix typo in -dbg long description. closes: #557529
+ - drop build-dep on quilt.
+ - update Homepage url to point to xfce.org.
+ * debian/patches:
+ - 01_mount-async dropped, merged upstream.
+ * debian/rules:
+ - drop quilt rules.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 12 Dec 2009 16:06:26 +0100
+
+exo (0.3.105-3) unstable; urgency=low
+
+ * debian/control:
+ - add an exo-utils-dbg package containing debug symbols for the exo-utils
+ binaries.
+ * debian/rules:
+ - use variables for library name, soversion and version.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 19 Oct 2009 14:30:01 +0200
+
+exo (0.3.105-2) unstable; urgency=low
+
+ * debian/control:
+ - add build-dep on quilt
+ * debian/rules:
+ - call {,un}patch targets when needed, include quilt rules.
+ * debian/patches:
+ - 01_mount-async added, don't mount all volumes with sync.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 18 Oct 2009 23:20:26 +0200
+
+exo (0.3.105-1) unstable; urgency=low
+
+ * New upstream release.
+>>>>>>> .merge-right.r5159
* add a new libexo-common packages containing mount options file,
documentation, helper files.
* debian/rules:
Modified: desktop/trunk/exo/debian/compat
===================================================================
--- desktop/trunk/exo/debian/compat 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/compat 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1 +1 @@
-5
+7
Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/control 2011-03-30 16:08:38 UTC (rev 5160)
@@ -3,73 +3,72 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
- Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
+ Yves-Alexis Perez <corsac at debian.org>,
+ Michael Casadevall <sonicmctails at gmail.com>,
Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.2.7), libxfcegui4-dev (>= 4.6.0),
- liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.2.7), libxfce4util-dev (>= 4.8.0),
+ libxfce4ui-1-dev (>= 4.8.0), liburi-perl, chrpath, intltool,
+ hardening-includes, libglib2.0-dev (>= 2.27)
+Standards-Version: 3.9.1
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/exo/
-Package: libexo-0.3-dev
+Package: libexo-1-dev
Section: libdevel
Architecture: any
Depends: libexo-0.3-0 (= ${binary:Version}), libxfce4util-dev (>= 4.6.0),
libhal-storage-dev, libgtk2.0-dev, ${misc:Depends}
Description: Development files for libexo
This package contains the headers and the static library
- for libexo-0.3-0.
+ for libexo-1-0.
-Package: libexo-0.3-0
+Package: libexo-1-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, liburi-perl, libexo-common, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libexo-common
+Recommends: liburi-perl
Description: Library with extensions for Xfce
- libexo is a library for Xfce that contains a bunch of additional widgets and
- a framework for editable toolbars (an improved version of the framework
- present in GNOME), light-weight session management support, functions to
- automatically synchronize object properties (based on GObject Binding
- Properties) and several miscellaneous utility and helper functions for
+ libexo is a library for Xfce that contains a bunch of additional widgets and
+ a framework for editable toolbars (an improved version of the framework
+ present in GNOME), light-weight session management support, functions to
+ automatically synchronize object properties (based on GObject Binding
+ Properties) and several miscellaneous utility and helper functions for
application developers.
.
- While Xfce ships with quite a few libraries that are primarily targeted at
- desktop development, libexo is targeted at application development, with a
+ While Xfce ships with quite a few libraries that are primarily targeted at
+ desktop development, libexo is targeted at application development, with a
focus on applications for Xfce.
Package: exo-utils
Section: xfce
-Conflicts: libexo-0.3-0 (<< 0.3.4-1), xfce4-mcs-manager (<< 4.4.2-3)
-Replaces: libexo-0.3-0 (<< 0.3.4-1)
Architecture: any
-Depends: libexo-0.3-0 (= ${binary:Version}), ${shlibs:Depends}, eject [!hurd-i386],
- ${misc:Depends}
+Depends: libexo-1-0 (= ${binary:Version}), ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: xfce4-volstatus-icon (<= 0.1.0-0ubuntu5),
+ xfce4-cddrive-plugin (<= 0.0.1-0ubuntu2)
Description: Utility files for libexo
This package contains the Xfce settings plugin and the utility files for
- libexo-0.3-0 which are:
+ libexo-1-0 which are:
- exo-csource
- exo-desktop-item-edit
- - exo-mount
- exo-open
- exo-preferred-applications
- - exo-eject
- - exo-unmount
-Package: libexo-0.3-0-dbg
+Package: libexo-1-0-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, libexo-0.3-0 (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libexo-1-0 (= ${binary:Version})
Description: debugging informations for libexo
- This package contains the debugging symbols for libexo, additional library
+ This package contains the debugging symbols for libexo, additional library
for Xfce.
Package: exo-utils-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, exo-utils (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, exo-utils (= ${binary:Version})
Conflicts: libexo-0.3-0-dbg (<< 0.3.105-3)
Description: debugging informations for exo-utils
This package contains the debugging symbols for the utilities shipped in
@@ -77,7 +76,6 @@
- exo-csource
- exo-open
- exo-desktop-item-edit
- - exo-mount
Package: libexo-common
Section: libs
@@ -87,5 +85,4 @@
Replaces: libexo-0.3-0 (<< 0.3.104-3)
Description: libexo common files
This package contains the common files in use by exo library. It ships
- various helpers and desktop files, along with mountrc (mount options file),
- and documentation.
+ various helpers, desktop files and documentation.
Modified: desktop/trunk/exo/debian/copyright
===================================================================
--- desktop/trunk/exo/debian/copyright 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/copyright 2011-03-30 16:08:38 UTC (rev 5160)
@@ -17,40 +17,50 @@
Copyrights:
===========
-This software is copyright © 2004-2007 by Benedikt Meurer, os-cillation,
+This software is copyright © 2003-2007 by Benedikt Meurer, os-cillation,
except some parts:
-exo/exo-pango-extensions contains code © 2000 Anders Carlsson <andersca at gnu.org>
-exo/exo-binding contains code © 2004 Victor Porton
-exo/exo-toolbars-editor
-exo/exo-toolbars-private
-exo/exo-toolbars-editor-dialog
-exo/exo-toolbars-view
-exo/exo-toolbars-model contain code © 2003 Marco Pesenti Gritti
-exo/exo-wrap-table contains code © 2000 Ramiro Estrugo <ramiro at eazel.com>
-exo/exo-icon-view contains code © 2002,2004 Anders Carlsson <andersca at gnu.org>
-exo/exo-md5 contains code © 2004 James M. Cape <jcape at ignore-your.tv>
-exo-csource/main contains code © 2007 Nick Schermer <nick at xfce.org>
-exo/exo-icon-view.c:
+exo/abicheck.sh
+exo/make-exo-alias.pl contain code © 2004 The GLib Development Team
+exo/exo-binding.[ch] contains code © 2004 Victor Porton
+exo/exo-toolbars-editor-dialog.[ch]
+exo/exo-toolbars-private.[ch]
+exo/exo-toolbars-editor.[ch]
+exo/exo-toolbars-view.[ch]
+exo/exo-toolbars-model.[ch] contain code © 2003 Marco Pesenti Gritti
+exo/exo-wrap-table.[ch] contain code © 2000 Ramiro Estrugo <ramiro at eazel.com>
+exo/exo-icon-view.h contains code © 2002,2004 Anders Carlsson <andersca at gnu.org>
+exo-csource/main.c contains code © 2007 Nick Schermer <nick at xfce.org>
+tests/test-exo-noop.c
+tests/test-exo-string.c
+exo-gio-module/exo-module.c contain code © 2009 Nick Schermer <nick at xfce.org>
+exo/exo-cell-renderer-icon.c
+exo/exo-job.[ch]
+exo/exo-simple-job.[ch] contain code © 2009 Jannis Pohlmann <jannis at xfce.org>
+exo/exo-icon-view.c contains code:
© 2008 Jannis Pohlmann <jannis at xfce.org>
© 2004-2006 os-cillation e.K.
© 2002,2004 Anders Carlsson <andersca at gnu.org>
+python/__init__.py
+python/pyexo.py contain code © 1998-2002 James Henstridge
+ltmain.sh contains code © 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
Licensing:
==========
-The documentation is released under the GNU Free Documentation License, version
+The documentation is released under the GNU Free Documentation License, version
1.1 or later, with no invariant sections, using the following statement:
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
- Texts.
+ Texts.
You are free to distribute this software under the terms of the GNU General
-Public License.
+Public License.
On Debian systems, the complete text of the GNU General Public License can be
found in the file `/usr/share/common-licenses/GPL'.
Deleted: desktop/trunk/exo/debian/exo-eject.1
===================================================================
--- desktop/trunk/exo/debian/exo-eject.1 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/exo-eject.1 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,52 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH EXO-EJECT "1" "January 2007" "exo-eject 0.3.2" "User Commands"
-.SH NAME
-exo-eject \- eject volumes based on their HAL UDIs or their device files
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-exo\-eject [OPTION...] Xfce mount
-.SS "Help Options:"
-.TP
-\-?, \fB\-\-help\fR
-Show help options
-.TP
-\fB\-\-help\-all\fR
-Show all help options
-.TP
-\fB\-\-help\-gtk\fR
-Show GTK+ Options
-.SS "Application Options:"
-.TP
-\fB\-e\fR, \fB\-\-eject\fR
-Eject rather than mount
-.TP
-\fB\-u\fR, \fB\-\-unmount\fR
-Unmount rather than mount
-.TP
-\fB\-h\fR, \fB\-\-hal\-udi\fR
-Mount by HAL device UDI
-.TP
-\fB\-d\fR, \fB\-\-device\fR
-Mount by device file
-.TP
-\fB\-n\fR, \fB\-\-no\-ui\fR
-Don't show any dialogs
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Print version information and exit
-.TP
-\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use
-.SH AUTHOR
-Written by Benedikt Meurer <benny at xfce.org>.
-.PP
-exo\-eject comes with ABSOLUTELY NO WARRANTY,
-You may redistribute copies of exo\-eject under the terms of
-the GNU Lesser General Public License which can be found in the
-exo source package.
-.PP
-Please report bugs to <http://bugzilla.xfce.org/>.
-.SH COPYRIGHT
-Copyright \(co 2006-2007
- os-cillation e.K. All rights reserved.
Deleted: desktop/trunk/exo/debian/exo-mount.1
===================================================================
--- desktop/trunk/exo/debian/exo-mount.1 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/exo-mount.1 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,52 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH EXO-MOUNT "1" "January 2007" "exo-mount 0.3.2" "User Commands"
-.SH NAME
-exo-mount \- mount volumes based on their HAL UDIs or their device files
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-exo\-mount [OPTION...] Xfce mount
-.SS "Help Options:"
-.TP
-\-?, \fB\-\-help\fR
-Show help options
-.TP
-\fB\-\-help\-all\fR
-Show all help options
-.TP
-\fB\-\-help\-gtk\fR
-Show GTK+ Options
-.SS "Application Options:"
-.TP
-\fB\-e\fR, \fB\-\-eject\fR
-Eject rather than mount
-.TP
-\fB\-u\fR, \fB\-\-unmount\fR
-Unmount rather than mount
-.TP
-\fB\-h\fR, \fB\-\-hal\-udi\fR
-Mount by HAL device UDI
-.TP
-\fB\-d\fR, \fB\-\-device\fR
-Mount by device file
-.TP
-\fB\-n\fR, \fB\-\-no\-ui\fR
-Don't show any dialogs
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Print version information and exit
-.TP
-\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use
-.SH AUTHOR
-Written by Benedikt Meurer <benny at xfce.org>.
-.PP
-exo\-mount comes with ABSOLUTELY NO WARRANTY,
-You may redistribute copies of exo\-mount under the terms of
-the GNU Lesser General Public License which can be found in the
-exo source package.
-.PP
-Please report bugs to <http://bugzilla.xfce.org/>.
-.SH COPYRIGHT
-Copyright \(co 2006-2007
- os-cillation e.K. All rights reserved.
Deleted: desktop/trunk/exo/debian/exo-unmount.1
===================================================================
--- desktop/trunk/exo/debian/exo-unmount.1 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/exo-unmount.1 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,52 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH EXO-UNMOUNT "1" "January 2007" "exo-unmount 0.3.2" "User Commands"
-.SH NAME
-exo-unmount \- umount volumes based on their HAL UDIs or their device files
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-exo\-unmount [OPTION...] Xfce mount
-.SS "Help Options:"
-.TP
-\-?, \fB\-\-help\fR
-Show help options
-.TP
-\fB\-\-help\-all\fR
-Show all help options
-.TP
-\fB\-\-help\-gtk\fR
-Show GTK+ Options
-.SS "Application Options:"
-.TP
-\fB\-e\fR, \fB\-\-eject\fR
-Eject rather than mount
-.TP
-\fB\-u\fR, \fB\-\-unmount\fR
-Unmount rather than mount
-.TP
-\fB\-h\fR, \fB\-\-hal\-udi\fR
-Mount by HAL device UDI
-.TP
-\fB\-d\fR, \fB\-\-device\fR
-Mount by device file
-.TP
-\fB\-n\fR, \fB\-\-no\-ui\fR
-Don't show any dialogs
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Print version information and exit
-.TP
-\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use
-.SH AUTHOR
-Written by Benedikt Meurer <benny at xfce.org>.
-.PP
-exo\-unmount comes with ABSOLUTELY NO WARRANTY,
-You may redistribute copies of exo\-unmount under the terms of
-the GNU Lesser General Public License which can be found in the
-exo source package.
-.PP
-Please report bugs to <http://bugzilla.xfce.org/>.
-.SH COPYRIGHT
-Copyright \(co 2006-2007
- os-cillation e.K. All rights reserved.
Copied: desktop/trunk/exo/debian/exo-utils.manpages (from rev 5159, desktop/branches/experimental/exo/debian/exo-utils.manpages)
===================================================================
--- desktop/trunk/exo/debian/exo-utils.manpages (rev 0)
+++ desktop/trunk/exo/debian/exo-utils.manpages 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,2 @@
+debian/exo-preferred-applications.1
+debian/exo-desktop-item-edit.1
Deleted: desktop/trunk/exo/debian/libexo-0.3-0.docs
===================================================================
--- desktop/trunk/exo/debian/libexo-0.3-0.docs 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/libexo-0.3-0.docs 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,4 +0,0 @@
-NEWS
-README
-TODO
-THANKS
Deleted: desktop/trunk/exo/debian/libexo-0.3-0.install
===================================================================
--- desktop/trunk/exo/debian/libexo-0.3-0.install 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/libexo-0.3-0.install 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,4 +0,0 @@
-usr/lib/libexo-0.3-0/*
-usr/lib/lib*.so.*
-usr/share/locale/*/*/*.mo
-usr/share/pixmaps
Deleted: desktop/trunk/exo/debian/libexo-0.3-0.shlibs
===================================================================
--- desktop/trunk/exo/debian/libexo-0.3-0.shlibs 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/libexo-0.3-0.shlibs 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,2 +0,0 @@
-libexo-0.3 0 libexo-0.3-0 (>= 0.3.100)
-libexo-hal-0.3 0 libexo-0.3-0 (>= 0.3.100)
Deleted: desktop/trunk/exo/debian/libexo-0.3-dev.install
===================================================================
--- desktop/trunk/exo/debian/libexo-0.3-dev.install 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/libexo-0.3-dev.install 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/pkgconfig/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/share/gtk-doc/html/exo-0.3/*
Copied: desktop/trunk/exo/debian/libexo-1-0.docs (from rev 5159, desktop/branches/experimental/exo/debian/libexo-1-0.docs)
===================================================================
--- desktop/trunk/exo/debian/libexo-1-0.docs (rev 0)
+++ desktop/trunk/exo/debian/libexo-1-0.docs 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,4 @@
+NEWS
+README
+TODO
+THANKS
Copied: desktop/trunk/exo/debian/libexo-1-0.install (from rev 5159, desktop/branches/experimental/exo/debian/libexo-1-0.install)
===================================================================
--- desktop/trunk/exo/debian/libexo-1-0.install (rev 0)
+++ desktop/trunk/exo/debian/libexo-1-0.install 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,4 @@
+usr/lib/xfce4/exo-1/*
+usr/lib/lib*.so.*
+usr/share/locale/*/*/*.mo
+usr/share/pixmaps
Copied: desktop/trunk/exo/debian/libexo-1-0.symbols (from rev 5159, desktop/branches/experimental/exo/debian/libexo-1-0.symbols)
===================================================================
--- desktop/trunk/exo/debian/libexo-1-0.symbols (rev 0)
+++ desktop/trunk/exo/debian/libexo-1-0.symbols 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,203 @@
+libexo-1.so.0 libexo-1-0 #MINVER#
+ exo_atomic_dec at Base 0.5.0
+ exo_atomic_inc at Base 0.5.0
+ exo_binding_new at Base 0.5.0
+ exo_binding_new_full at Base 0.5.0
+ exo_binding_new_with_negation at Base 0.5.0
+ exo_binding_unbind at Base 0.5.0
+ exo_cell_renderer_ellipsized_text_get_type at Base 0.5.0
+ exo_cell_renderer_ellipsized_text_new at Base 0.5.0
+ exo_cell_renderer_icon_get_type at Base 0.5.0
+ exo_cell_renderer_icon_new at Base 0.5.0
+ exo_check_version at Base 0.5.0
+ exo_execute_preferred_application at Base 0.5.0
+ exo_execute_preferred_application_on_screen at Base 0.5.0
+ exo_execute_terminal_shell at Base 0.5.0
+ exo_execute_terminal_shell_on_screen at Base 0.5.0
+ exo_g_value_transform_negate at Base 0.5.0
+ exo_gdk_pixbuf_colorize at Base 0.5.0
+ exo_gdk_pixbuf_frame at Base 0.5.0
+ exo_gdk_pixbuf_lucent at Base 0.5.0
+ exo_gdk_pixbuf_new_from_file_at_max_size at Base 0.5.0
+ exo_gdk_pixbuf_scale_down at Base 0.5.0
+ exo_gdk_pixbuf_scale_ratio at Base 0.5.0
+ exo_gdk_pixbuf_spotlight at Base 0.5.0
+ exo_gtk_file_chooser_add_thumbnail_preview at Base 0.5.0
+ exo_gtk_object_destroy_later at Base 0.5.0
+ exo_gtk_url_about_dialog_hook at Base 0.5.0
+ exo_icon_bar_get_active at Base 0.5.0
+ exo_icon_bar_get_active_iter at Base 0.5.0
+ exo_icon_bar_get_model at Base 0.5.0
+ exo_icon_bar_get_orientation at Base 0.5.0
+ exo_icon_bar_get_pixbuf_column at Base 0.5.0
+ exo_icon_bar_get_text_column at Base 0.5.0
+ exo_icon_bar_get_type at Base 0.5.0
+ exo_icon_bar_new at Base 0.5.0
+ exo_icon_bar_new_with_model at Base 0.5.0
+ exo_icon_bar_set_active at Base 0.5.0
+ exo_icon_bar_set_active_iter at Base 0.5.0
+ exo_icon_bar_set_model at Base 0.5.0
+ exo_icon_bar_set_orientation at Base 0.5.0
+ exo_icon_bar_set_pixbuf_column at Base 0.5.0
+ exo_icon_bar_set_text_column at Base 0.5.0
+ exo_icon_chooser_dialog_get_icon at Base 0.5.0
+ exo_icon_chooser_dialog_get_type at Base 0.5.0
+ exo_icon_chooser_dialog_new at Base 0.5.0
+ exo_icon_chooser_dialog_set_icon at Base 0.5.0
+ exo_icon_view_create_drag_icon at Base 0.5.0
+ exo_icon_view_drop_position_get_type at Base 0.5.0
+ exo_icon_view_enable_model_drag_dest at Base 0.5.0
+ exo_icon_view_enable_model_drag_source at Base 0.5.0
+ exo_icon_view_get_column_spacing at Base 0.5.0
+ exo_icon_view_get_columns at Base 0.5.0
+ exo_icon_view_get_cursor at Base 0.5.0
+ exo_icon_view_get_dest_item_at_pos at Base 0.5.0
+ exo_icon_view_get_drag_dest_item at Base 0.5.0
+ exo_icon_view_get_enable_search at Base 0.5.0
+ exo_icon_view_get_item_at_pos at Base 0.5.0
+ exo_icon_view_get_item_width at Base 0.5.0
+ exo_icon_view_get_layout_mode at Base 0.5.0
+ exo_icon_view_get_margin at Base 0.5.0
+ exo_icon_view_get_model at Base 0.5.0
+ exo_icon_view_get_orientation at Base 0.5.0
+ exo_icon_view_get_path_at_pos at Base 0.5.0
+ exo_icon_view_get_reorderable at Base 0.5.0
+ exo_icon_view_get_row_spacing at Base 0.5.0
+ exo_icon_view_get_search_column at Base 0.5.0
+ exo_icon_view_get_search_equal_func at Base 0.5.0
+ exo_icon_view_get_search_position_func at Base 0.5.0
+ exo_icon_view_get_selected_items at Base 0.5.0
+ exo_icon_view_get_selection_mode at Base 0.5.0
+ exo_icon_view_get_single_click at Base 0.5.0
+ exo_icon_view_get_single_click_timeout at Base 0.5.0
+ exo_icon_view_get_spacing at Base 0.5.0
+ exo_icon_view_get_type at Base 0.5.0
+ exo_icon_view_get_visible_range at Base 0.5.0
+ exo_icon_view_icon_to_widget_coords at Base 0.5.0
+ exo_icon_view_item_activated at Base 0.5.0
+ exo_icon_view_layout_mode_get_type at Base 0.5.0
+ exo_icon_view_new at Base 0.5.0
+ exo_icon_view_new_with_model at Base 0.5.0
+ exo_icon_view_path_is_selected at Base 0.5.0
+ exo_icon_view_scroll_to_path at Base 0.5.0
+ exo_icon_view_select_all at Base 0.5.0
+ exo_icon_view_select_path at Base 0.5.0
+ exo_icon_view_selected_foreach at Base 0.5.0
+ exo_icon_view_set_column_spacing at Base 0.5.0
+ exo_icon_view_set_columns at Base 0.5.0
+ exo_icon_view_set_cursor at Base 0.5.0
+ exo_icon_view_set_drag_dest_item at Base 0.5.0
+ exo_icon_view_set_enable_search at Base 0.5.0
+ exo_icon_view_set_item_width at Base 0.5.0
+ exo_icon_view_set_layout_mode at Base 0.5.0
+ exo_icon_view_set_margin at Base 0.5.0
+ exo_icon_view_set_model at Base 0.5.0
+ exo_icon_view_set_orientation at Base 0.5.0
+ exo_icon_view_set_reorderable at Base 0.5.0
+ exo_icon_view_set_row_spacing at Base 0.5.0
+ exo_icon_view_set_search_column at Base 0.5.0
+ exo_icon_view_set_search_equal_func at Base 0.5.0
+ exo_icon_view_set_search_position_func at Base 0.5.0
+ exo_icon_view_set_selection_mode at Base 0.5.0
+ exo_icon_view_set_single_click at Base 0.5.0
+ exo_icon_view_set_single_click_timeout at Base 0.5.0
+ exo_icon_view_set_spacing at Base 0.5.0
+ exo_icon_view_unselect_all at Base 0.5.0
+ exo_icon_view_unselect_path at Base 0.5.0
+ exo_icon_view_unset_model_drag_dest at Base 0.5.0
+ exo_icon_view_unset_model_drag_source at Base 0.5.0
+ exo_icon_view_widget_to_icon_coords at Base 0.5.0
+ exo_job_cancel at Base 0.5.0
+ exo_job_emit at Base 0.5.0
+ exo_job_get_cancellable at Base 0.5.0
+ exo_job_get_type at Base 0.5.0
+ exo_job_info_message at Base 0.5.0
+ exo_job_is_cancelled at Base 0.5.0
+ exo_job_launch at Base 0.5.0
+ exo_job_percent at Base 0.5.0
+ exo_job_send_to_mainloop at Base 0.5.0
+ exo_job_set_error_if_cancelled at Base 0.5.0
+ exo_major_version at Base 0.5.0
+ exo_micro_version at Base 0.5.0
+ exo_minor_version at Base 0.5.0
+ exo_mutual_binding_new at Base 0.5.0
+ exo_mutual_binding_new_full at Base 0.5.0
+ exo_mutual_binding_new_with_negation at Base 0.5.0
+ exo_mutual_binding_unbind at Base 0.5.0
+ exo_noop at Base 0.5.0
+ exo_noop_false at Base 0.5.0
+ exo_noop_null at Base 0.5.0
+ exo_noop_one at Base 0.5.0
+ exo_noop_true at Base 0.5.0
+ exo_noop_zero at Base 0.5.0
+ exo_simple_job_get_type at Base 0.5.0
+ exo_simple_job_launch at Base 0.5.0
+ exo_str_elide_underscores at Base 0.5.0
+ exo_str_is_equal at Base 0.5.0
+ exo_str_looks_like_an_uri at Base 0.5.0
+ exo_str_replace at Base 0.5.0
+ exo_strdup_strftime at Base 0.5.0
+ exo_strndupv at Base 0.5.0
+ exo_toolbars_editor_dialog_get_type at Base 0.5.0
+ exo_toolbars_editor_dialog_new_with_model at Base 0.5.0
+ exo_toolbars_editor_get_model at Base 0.5.0
+ exo_toolbars_editor_get_type at Base 0.5.0
+ exo_toolbars_editor_get_ui_manager at Base 0.5.0
+ exo_toolbars_editor_new at Base 0.5.0
+ exo_toolbars_editor_new_with_model at Base 0.5.0
+ exo_toolbars_editor_set_model at Base 0.5.0
+ exo_toolbars_editor_set_ui_manager at Base 0.5.0
+ exo_toolbars_model_add_item at Base 0.5.0
+ exo_toolbars_model_add_separator at Base 0.5.0
+ exo_toolbars_model_add_toolbar at Base 0.5.0
+ exo_toolbars_model_flags_get_type at Base 0.5.0
+ exo_toolbars_model_get_actions at Base 0.5.0
+ exo_toolbars_model_get_flags at Base 0.5.0
+ exo_toolbars_model_get_item_data at Base 0.5.0
+ exo_toolbars_model_get_item_id at Base 0.5.0
+ exo_toolbars_model_get_item_type at Base 0.5.0
+ exo_toolbars_model_get_style at Base 0.5.0
+ exo_toolbars_model_get_type at Base 0.5.0
+ exo_toolbars_model_item_nth at Base 0.5.0
+ exo_toolbars_model_load_from_file at Base 0.5.0
+ exo_toolbars_model_move_item at Base 0.5.0
+ exo_toolbars_model_n_items at Base 0.5.0
+ exo_toolbars_model_n_toolbars at Base 0.5.0
+ exo_toolbars_model_new at Base 0.5.0
+ exo_toolbars_model_remove_item at Base 0.5.0
+ exo_toolbars_model_remove_toolbar at Base 0.5.0
+ exo_toolbars_model_save_to_file at Base 0.5.0
+ exo_toolbars_model_set_actions at Base 0.5.0
+ exo_toolbars_model_set_flags at Base 0.5.0
+ exo_toolbars_model_set_style at Base 0.5.0
+ exo_toolbars_model_toolbar_nth at Base 0.5.0
+ exo_toolbars_model_unset_style at Base 0.5.0
+ exo_toolbars_view_get_editing at Base 0.5.0
+ exo_toolbars_view_get_model at Base 0.5.0
+ exo_toolbars_view_get_type at Base 0.5.0
+ exo_toolbars_view_get_ui_manager at Base 0.5.0
+ exo_toolbars_view_new at Base 0.5.0
+ exo_toolbars_view_new_with_model at Base 0.5.0
+ exo_toolbars_view_set_editing at Base 0.5.0
+ exo_toolbars_view_set_model at Base 0.5.0
+ exo_toolbars_view_set_ui_manager at Base 0.5.0
+ exo_tree_view_get_single_click at Base 0.5.0
+ exo_tree_view_get_single_click_timeout at Base 0.5.0
+ exo_tree_view_get_type at Base 0.5.0
+ exo_tree_view_new at Base 0.5.0
+ exo_tree_view_set_single_click at Base 0.5.0
+ exo_tree_view_set_single_click_timeout at Base 0.5.0
+ exo_wrap_table_get_col_spacing at Base 0.5.0
+ exo_wrap_table_get_homogeneous at Base 0.5.0
+ exo_wrap_table_get_row_spacing at Base 0.5.0
+ exo_wrap_table_get_type at Base 0.5.0
+ exo_wrap_table_new at Base 0.5.0
+ exo_wrap_table_set_col_spacing at Base 0.5.0
+ exo_wrap_table_set_homogeneous at Base 0.5.0
+ exo_wrap_table_set_row_spacing at Base 0.5.0
+ exo_xsession_client_get_group at Base 0.5.0
+ exo_xsession_client_get_restart_command at Base 0.5.0
+ exo_xsession_client_get_type at Base 0.5.0
+ exo_xsession_client_new_with_group at Base 0.5.0
+ exo_xsession_client_set_group at Base 0.5.0
+ exo_xsession_client_set_restart_command at Base 0.5.0
Copied: desktop/trunk/exo/debian/libexo-1-dev.install (from rev 5159, desktop/branches/experimental/exo/debian/libexo-1-dev.install)
===================================================================
--- desktop/trunk/exo/debian/libexo-1-dev.install (rev 0)
+++ desktop/trunk/exo/debian/libexo-1-dev.install 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,5 @@
+usr/include/*
+usr/lib/pkgconfig/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/share/gtk-doc/html/exo-1/*
Modified: desktop/trunk/exo/debian/libexo-common.install
===================================================================
--- desktop/trunk/exo/debian/libexo-common.install 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/libexo-common.install 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,3 +1,4 @@
etc
+usr/share/doc/exo/html
usr/share/xfce4
usr/share/icons
Copied: desktop/trunk/exo/debian/libexo-common.postinst (from rev 5159, desktop/branches/experimental/exo/debian/libexo-common.postinst)
===================================================================
--- desktop/trunk/exo/debian/libexo-common.postinst (rev 0)
+++ desktop/trunk/exo/debian/libexo-common.postinst 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+LASTVER="0.5.2-1"
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper rm_conffile \
+ /etc/xdg/xfce4/mount.rc "$LASTVER" -- "$@"
+fi
+
+#DEBHELPER#
Copied: desktop/trunk/exo/debian/libexo-common.postrm (from rev 5159, desktop/branches/experimental/exo/debian/libexo-common.postrm)
===================================================================
--- desktop/trunk/exo/debian/libexo-common.postrm (rev 0)
+++ desktop/trunk/exo/debian/libexo-common.postrm 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+LASTVER="0.5.2-1"
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper rm_conffile \
+ /etc/xdg/xfce4/mount.rc "$LASTVER" -- "$@"
+fi
+
+#DEBHELPER#
Copied: desktop/trunk/exo/debian/libexo-common.preinst (from rev 5159, desktop/branches/experimental/exo/debian/libexo-common.preinst)
===================================================================
--- desktop/trunk/exo/debian/libexo-common.preinst (rev 0)
+++ desktop/trunk/exo/debian/libexo-common.preinst 2011-03-30 16:08:38 UTC (rev 5160)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+LASTVER="0.5.2-1"
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper rm_conffile \
+ /etc/xdg/xfce4/mount.rc "$LASTVER" -- "$@"
+fi
+
+#DEBHELPER#
Deleted: desktop/trunk/exo/debian/python2.3-exo0.3.examples
===================================================================
--- desktop/trunk/exo/debian/python2.3-exo0.3.examples 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/python2.3-exo0.3.examples 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,4 +0,0 @@
-python/examples/README
-python/examples/ellipsizing.py
-python/examples/toolbars.py
-python/examples/toolbars.ui
Deleted: desktop/trunk/exo/debian/python2.3-exo0.3.install
===================================================================
--- desktop/trunk/exo/debian/python2.3-exo0.3.install 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/python2.3-exo0.3.install 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,2 +0,0 @@
-usr/lib/python*.*/site-packages/*
-usr/share/pygtk/2.0/defs/*
Deleted: desktop/trunk/exo/debian/python2.3-exo0.3.postinst
===================================================================
--- desktop/trunk/exo/debian/python2.3-exo0.3.postinst 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/python2.3-exo0.3.postinst 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,33 +0,0 @@
-#!/bin/bash -e
-#
-# Debian postinst script for Python x.y hierarchical modules
-# Written by Gregor Hoffleit <flight at debian.org>
-# Extended by Matthias Klose <doko at debian.org>
-# Modified by Benedikt Meurer <bm at os-cillation.de>
-#
-
-PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
-PV=`dpkg --listfiles $PACKAGE | sed -n -e '/^\/usr\/lib\/python.*\//{
- s,/usr/lib/python\([0-9][0-9.]*\)/.*,\1,p
- q
-}'`
-
-case "$1" in
- configure|abort-upgrade|abort-remove|abort-deconfigure)
- # Get the priority of this packages pygtk.py module
- pyver=`echo $PACKAGE|sed -ne 's/python\([0-9]\)\.\([0-9]\).*/\1\2/p'`
- priority=$((100 + ${pyver:-0}))
-
- # Install the pygtk.py alternative
- update-alternatives \
- --install /usr/lib/python$PV/site-packages/pyexo.py py${PV}exo.py \
- /usr/lib/python$PV/site-packages/pyexo.py.$PACKAGE $priority
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
Deleted: desktop/trunk/exo/debian/python2.3-exo0.3.prerm
===================================================================
--- desktop/trunk/exo/debian/python2.3-exo0.3.prerm 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/python2.3-exo0.3.prerm 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-#
-# Debian prerm script for Python x.y hierarchical modules
-# Written by Gregor Hoffleit <flight at debian.org>
-# Extended by Matthias Klose <doko at debian.org>
-# Modified by Benedikt Meurer <bm at os-cillation.de>
-#
-
-PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
-PV=`dpkg --listfiles $PACKAGE | sed -n -e '/^\/usr\/lib\/python.*\//{
- s,/usr/lib/python\([0-9][0-9.]*\)/.*,\1,p
- q
-}'`
-
-if [ "$1" != "upgrade" ]; then
- update-alternatives --remove py${PV}exo.py \
- /usr/lib/python$PV/site-packages/pyexo.py.$PACKAGE
-fi
-
-#DEBHELPER#
Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules 2011-03-30 15:53:06 UTC (rev 5159)
+++ desktop/trunk/exo/debian/rules 2011-03-30 16:08:38 UTC (rev 5160)
@@ -1,49 +1,28 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/hardening-includes/hardening.make
-EXO_LIBNAME=0.3
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+EXO_LIBNAME=1
EXO_SOVERSION=0
EXO_SONAME=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/$(EXO_SONAME) --enable-final --disable-gtk-doc --disable-python --enable-notifications
+%:
+ dh $@
-build: build-stamp
-build-stamp: config.status
- dh_testdir
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-gtk-doc --disable-python
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+override_dh_install:
# delete the unneeded .a and .la files
- rm -f debian/tmp/usr/lib/libexo-hal-$(EXO_LIBNAME).la
rm -f debian/tmp/usr/lib/libexo-$(EXO_LIBNAME).la
+ rm -f debian/tmp/usr/lib/gio/modules/libexo-module-$(EXO_LIBNAME).la
# Debianise
sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \
@@ -53,43 +32,17 @@
chrpath -d -k debian/tmp/usr/bin/exo-csource \
debian/tmp/usr/bin/exo-desktop-item-edit \
debian/tmp/usr/bin/exo-open \
- debian/tmp/usr/bin/exo-mount \
- debian/tmp/usr/lib/$(EXO_SONAME)/exo-helper-$(EXO_LIBNAME) \
- debian/tmp/usr/lib/libexo-$(EXO_LIBNAME)*.so.* \
- debian/tmp/usr/lib/libexo-hal-$(EXO_LIBNAME)*.so.* \
+ debian/tmp/usr/lib/xfce4/exo-$(EXO_LIBNAME)/exo-helper-$(EXO_LIBNAME) \
+ debian/tmp/usr/lib/libexo-$(EXO_LIBNAME).so.*
# Create a muttng helper from the mutt one
sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \
<debian/tmp/usr/share/xfce4/helpers/mutt.desktop \
>debian/tmp/usr/share/xfce4/helpers/muttng.desktop
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installman -pexo-utils debian/exo-preferred-applications.1\
- debian/exo-desktop-item-edit.1 debian/exo-mount.1 \
- debian/exo-unmount.1 debian/exo-eject.1
- dh_installexamples
dh_install --fail-missing --sourcedir=debian/tmp
- dh_link
+
+override_dh_strip:
dh_strip -p $(EXO_SONAME) --dbg-package=$(EXO_SONAME)-dbg
dh_strip -p exo-utils --dbg-package=exo-utils-dbg
dh_strip --remaining-packages
-
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-xfce-commits
mailing list