[Pkg-xfce-commits] r4173 - in desktop/branches/experimental/exo/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sun Jul 25 06:20:56 UTC 2010
Author: mrpouit-guest
Date: 2010-07-25 18:20:51 +0000 (Sun, 25 Jul 2010)
New Revision: 4173
Removed:
desktop/branches/experimental/exo/debian/README.Debian
desktop/branches/experimental/exo/debian/README.source
desktop/branches/experimental/exo/debian/exo-eject.1
desktop/branches/experimental/exo/debian/exo-mount.1
desktop/branches/experimental/exo/debian/exo-unmount.1
desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch
desktop/branches/experimental/exo/debian/patches/series
Modified:
desktop/branches/experimental/exo/debian/changelog
desktop/branches/experimental/exo/debian/control
desktop/branches/experimental/exo/debian/exo-utils.manpages
desktop/branches/experimental/exo/debian/libexo-1-0.shlibs
desktop/branches/experimental/exo/debian/rules
Log:
* debian/control:
- b-deps on debhelper >= 7.0.50~
- 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
- drop some trailing spaces.
* 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/patches:
- 01_fix-treeview-gtk2.20.patch: dropped, included upstream
- series: dropped, no patch left.
Deleted: desktop/branches/experimental/exo/debian/README.Debian
===================================================================
--- desktop/branches/experimental/exo/debian/README.Debian 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/README.Debian 2010-07-25 18:20:51 UTC (rev 4173)
@@ -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/branches/experimental/exo/debian/README.source
===================================================================
--- desktop/branches/experimental/exo/debian/README.source 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/README.source 2010-07-25 18:20:51 UTC (rev 4173)
@@ -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/branches/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/changelog 2010-07-25 18:20:51 UTC (rev 4173)
@@ -1,4 +1,4 @@
-exo (0.5.2-1) UNRELEASED; urgency=low
+exo (0.5.3-1) UNRELEASED; urgency=low
[ Yves-Alexis Perez ]
* New upstream release.
@@ -13,9 +13,30 @@
[ Lionel Le Folgoc ]
* debian/exo-utils.manpages: added.
- * debian/control: b-deps on debhelper >= 7.0.50~.
+ * debian/control:
+ - b-deps on debhelper >= 7.0.50~
+ - 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
+ - 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/patches:
+ - 01_fix-treeview-gtk2.20.patch: dropped, included upstream
+ - series: dropped, no patch left.
-- Lionel Le Folgoc <mrpouit at gmail.com> Tue, 11 May 2010 21:44:39 +0200
Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/control 2010-07-25 18:20:51 UTC (rev 4173)
@@ -6,9 +6,8 @@
Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev, libxfce4ui-1-dev (>= 4.7.0),
- liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool
-Standards-Version: 3.8.4
+ liburi-perl, chrpath, intltool
+Standards-Version: 3.9.0
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/
@@ -17,7 +16,7 @@
Section: libdevel
Architecture: any
Depends: libexo-1-0 (= ${binary:Version}), libxfce4util-dev (>= 4.6.0),
- ${misc:Depends}, libhal-storage-dev, libgtk2.0-dev
+ ${misc:Depends}, libgtk2.0-dev
Description: Development files for libexo
This package contains the headers and the static library
for libexo-1-0.
@@ -25,34 +24,32 @@
Package: libexo-1-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, liburi-perl, libexo-common
+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
Architecture: any
-Depends: libexo-1-0 (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}, eject [!hurd-i386]
+Depends: libexo-1-0 (= ${binary:Version}), ${shlibs:Depends},
+ ${misc:Depends}
Description: Utility files for libexo
This package contains the Xfce settings plugin and the utility files for
libexo-1-0 which are:
- exo-csource
- exo-desktop-item-edit
- - exo-mount
- exo-open
- exo-preferred-applications
- - exo-eject
- - exo-unmount
Package: libexo-1-0-dbg
Section: debug
@@ -60,7 +57,7 @@
Architecture: any
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
@@ -75,7 +72,6 @@
- exo-csource
- exo-open
- exo-desktop-item-edit
- - exo-mount
Package: libexo-common
Section: libs
@@ -85,5 +81,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.
Deleted: desktop/branches/experimental/exo/debian/exo-eject.1
===================================================================
--- desktop/branches/experimental/exo/debian/exo-eject.1 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/exo-eject.1 2010-07-25 18:20:51 UTC (rev 4173)
@@ -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/branches/experimental/exo/debian/exo-mount.1
===================================================================
--- desktop/branches/experimental/exo/debian/exo-mount.1 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/exo-mount.1 2010-07-25 18:20:51 UTC (rev 4173)
@@ -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/branches/experimental/exo/debian/exo-unmount.1
===================================================================
--- desktop/branches/experimental/exo/debian/exo-unmount.1 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/exo-unmount.1 2010-07-25 18:20:51 UTC (rev 4173)
@@ -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.
Modified: desktop/branches/experimental/exo/debian/exo-utils.manpages
===================================================================
--- desktop/branches/experimental/exo/debian/exo-utils.manpages 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/exo-utils.manpages 2010-07-25 18:20:51 UTC (rev 4173)
@@ -1,5 +1,2 @@
debian/exo-preferred-applications.1
debian/exo-desktop-item-edit.1
-debian/exo-mount.1
-debian/exo-unmount.1
-debian/exo-eject.1
Modified: desktop/branches/experimental/exo/debian/libexo-1-0.shlibs
===================================================================
--- desktop/branches/experimental/exo/debian/libexo-1-0.shlibs 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/libexo-1-0.shlibs 2010-07-25 18:20:51 UTC (rev 4173)
@@ -1,2 +1 @@
libexo-1 0 libexo-1-0 (>= 0.5.0)
-libexo-hal-1 0 libexo-1-0 (>= 0.5.0)
Deleted: desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch
===================================================================
--- desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/patches/01_fix-treeview-gtk2.20.patch 2010-07-25 18:20:51 UTC (rev 4173)
@@ -1,50 +0,0 @@
-From cd80ae7747aa87ab6d72f08386b0fd4bea7f05b3 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Tue, 11 May 2010 18:57:11 +0000
-Subject: Make the treeview work again with gtk 2.20 (bug #6230).
-
----
-Index: po/POTFILES.skip
-===================================================================
---- a/po/POTFILES.skip (revision 0)
-+++ b/po/POTFILES.skip (revision 0)
-@@ -0,0 +1 @@
-+.pc/01_fix-treeview-gtk2.20.patch/exo/exo-tree-view.c
-diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
-index f7baa56..159f5b1 100644
---- a/exo/exo-tree-view.c
-+++ b/exo/exo-tree-view.c
-@@ -365,14 +365,7 @@ exo_tree_view_button_press_event (GtkWidget *widget,
- && path != NULL && gtk_tree_selection_path_is_selected (selection, path))
- {
- /* check if we have to restore paths */
-- if (G_LIKELY (selection->user_func == (GtkTreeSelectionFunc) exo_noop_false))
-- {
-- /* just reset the select function (previously set to exo_noop_false),
-- * there's no clean way to do this, so what the heck.
-- */
-- selection->user_func = NULL;
-- }
-- else
-+ if (G_LIKELY (selection->user_func != (GtkTreeSelectionFunc) exo_noop_false))
- {
- /* select all previously selected paths */
- for (lp = selected_paths; lp != NULL; lp = lp->next)
-@@ -380,6 +373,15 @@ exo_tree_view_button_press_event (GtkWidget *widget,
- }
- }
-
-+ /* see bug http://bugzilla.xfce.org/show_bug.cgi?id=6230 for more information */
-+ if (G_LIKELY (selection->user_func == (GtkTreeSelectionFunc) exo_noop_false))
-+ {
-+ /* just reset the select function (previously set to exo_noop_false),
-+ * there's no clean way to do this, so what the heck.
-+ */
-+ selection->user_func = NULL;
-+ }
-+
- /* release the path (if any) */
- if (G_LIKELY (path != NULL))
- gtk_tree_path_free (path);
---
-cgit v0.8.2.1
Deleted: desktop/branches/experimental/exo/debian/patches/series
===================================================================
--- desktop/branches/experimental/exo/debian/patches/series 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/patches/series 2010-07-25 18:20:51 UTC (rev 4173)
@@ -1 +0,0 @@
-01_fix-treeview-gtk2.20.patch
Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules 2010-07-25 17:46:53 UTC (rev 4172)
+++ desktop/branches/experimental/exo/debian/rules 2010-07-25 18:20:51 UTC (rev 4173)
@@ -15,11 +15,10 @@
dh $@
override_dh_auto_configure:
- dh_auto_configure -- --libexecdir=/usr/lib/$(EXO_SONAME) --disable-gtk-doc --disable-python --enable-notifications
+ dh_auto_configure -- --libexecdir=/usr/lib/$(EXO_SONAME) --disable-gtk-doc --disable-python
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
@@ -31,10 +30,8 @@
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/libexo-$(EXO_LIBNAME).so.*
# Create a muttng helper from the mutt one
sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \
More information about the Pkg-xfce-commits
mailing list