[Pkg-xfce-commits] r4732 - in goodies/branches/experimental/xfce4-places-plugin/debian: . patches source
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sat Dec 18 02:29:06 UTC 2010
Author: mrpouit-guest
Date: 2010-12-18 14:29:03 +0000 (Sat, 18 Dec 2010)
New Revision: 4732
Added:
goodies/branches/experimental/xfce4-places-plugin/debian/patches/
goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch
goodies/branches/experimental/xfce4-places-plugin/debian/patches/series
goodies/branches/experimental/xfce4-places-plugin/debian/source/
goodies/branches/experimental/xfce4-places-plugin/debian/source/format
Modified:
goodies/branches/experimental/xfce4-places-plugin/debian/changelog
goodies/branches/experimental/xfce4-places-plugin/debian/control
goodies/branches/experimental/xfce4-places-plugin/debian/rules
Log:
* debian/control:
- b-dep on libexo-1-dev instead of libexo-0.3-dev.
- add myself to Uploaders.
* Switch to 3.0 (quilt).
* debian/rules: add .pc files to POTFILES.skip, and clean it after the build.
* debian/patches:
- 01_port-to-exo-1.patch: added, replaces a dropped exo symbol by a gtk
equivalent.
- series: added.
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/changelog 2010-12-16 21:18:06 UTC (rev 4731)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/changelog 2010-12-18 14:29:03 UTC (rev 4732)
@@ -1,5 +1,6 @@
xfce4-places-plugin (1.2.0-2) UNRELEASED; urgency=low
+ [ Yves-Alexis Perez ]
* debian/control:
- switch to xfce section.
- add exo-utils versionned dependencies since exo-mount is gone in 0.5.
@@ -9,6 +10,17 @@
- switch to dh7 tiny rules.
* debian/compat bumped to 7.
+ [ Lionel Le Folgoc ]
+ * debian/control:
+ - b-dep on libexo-1-dev instead of libexo-0.3-dev.
+ - add myself to Uploaders.
+ * Switch to 3.0 (quilt).
+ * debian/rules: add .pc files to POTFILES.skip, and clean it after the build.
+ * debian/patches:
+ - 01_port-to-exo-1.patch: added, replaces a dropped exo symbol by a gtk
+ equivalent.
+ - series: added.
+
-- Yves-Alexis Perez <corsac at debian.org> Sun, 07 Nov 2010 12:27:21 +0100
xfce4-places-plugin (1.2.0-1) unstable; urgency=low
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/control 2010-12-16 21:18:06 UTC (rev 4731)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/control 2010-12-18 14:29:03 UTC (rev 4732)
@@ -2,11 +2,12 @@
Section: xfce
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>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 7), autotools-dev, pkg-config,
libgtk2.0-dev (>= 2.6.0), libxfce4util-dev (>= 4.4.2),
xfce4-panel-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2),
- libthunar-vfs-1-dev (>= 0.4.0), libexo-0.3-dev (>= 0.3.4),
+ libthunar-vfs-1-dev (>= 0.4.0), libexo-1-dev (>= 0.5.0),
libxml-parser-perl, intltool
Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
Added: goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch (rev 0)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/patches/01_port-to-exo-1.patch 2010-12-18 14:29:03 UTC (rev 4732)
@@ -0,0 +1,100 @@
+Description: Port to exo-1
+Origin: backport, http://bugzilla.xfce.org/show_bug.cgi?id=5754
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=5754
+--- xfce4-places-plugin-1.2.0.orig/configure
++++ xfce4-places-plugin-1.2.0/configure
+@@ -21406,26 +21406,26 @@ echo "${ECHO_T}$xdt_cv_PKG_CONFIG_VERSIO
+ fi
+
+
+- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.1.1" >&5
+-echo $ECHO_N "checking for exo-0.3 >= 0.3.1.1... $ECHO_C" >&6; }
+- if $PKG_CONFIG "--atleast-version=0.3.1.1" "exo-0.3" >/dev/null 2>&1; then
+- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
++ { echo "$as_me:$LINENO: checking for exo-1 >= 0.5.0" >&5
++echo $ECHO_N "checking for exo-1 >= 0.5.0... $ECHO_C" >&6; }
++ if $PKG_CONFIG "--atleast-version=0.5.0" "exo-1" >/dev/null 2>&1; then
++ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
+ { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
+ echo "${ECHO_T}$EXO_VERSION" >&6; }
+
+ { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
+ echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
+- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
++ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
+ { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
+ echo "${ECHO_T}$EXO_CFLAGS" >&6; }
+
+ { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
+ echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
+- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
++ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
+ { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
+ echo "${ECHO_T}$EXO_LIBS" >&6; }
+
+- EXO_REQUIRED_VERSION=0.3.1.1
++ EXO_REQUIRED_VERSION=0.5.0
+
+
+
+@@ -21433,15 +21433,15 @@ echo "${ECHO_T}$EXO_LIBS" >&6; }
+
+
+
+- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
+- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
++ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
++ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
+ { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
+ echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
+
+
+- echo "*** The required package exo-0.3 was found on your system,"
++ echo "*** The required package exo-1 was found on your system,"
+ echo "*** but the installed version ($xdt_cv_version) is too old."
+- echo "*** Please upgrade exo-0.3 to atleast version 0.3.1.1, or adjust"
++ echo "*** Please upgrade exo-1 to atleast version 0.5.0, or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+ echo "*** the new version of the package in a nonstandard prefix so"
+ echo "*** pkg-config is able to find it."
+@@ -21452,8 +21452,8 @@ echo "${ECHO_T}found, but $xdt_cv_versio
+ echo "${ECHO_T}not found" >&6; }
+
+
+- echo "*** The required package exo-0.3 was not found on your system."
+- echo "*** Please install exo-0.3 (atleast version 0.3.1.1) or adjust"
++ echo "*** The required package exo-1 was not found on your system."
++ echo "*** Please install exo-1 (atleast version 0.5.0) or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you"
+ echo "*** installed the package in a nonstandard prefix so that"
+ echo "*** pkg-config is able to find it."
+--- xfce4-places-plugin-1.2.0.orig/panel-plugin/support.c
++++ xfce4-places-plugin-1.2.0/panel-plugin/support.c
+@@ -48,14 +48,11 @@
+ void
+ places_load_file_browser(const gchar *path)
+ {
+- gboolean exo_success;
++ GError *error = NULL;
+
+ if(path != NULL && *path != '\0'){
+
+- DBG("exo_url_show(%s)", path);
+- exo_success = exo_url_show(path, NULL, NULL);
+-
+- if(!exo_success){
++ if(!gtk_show_uri(NULL, path, 0, &error)){
+ gchar *cmd = g_strconcat("thunar \"", path, "\"", NULL);
+ DBG("exec: %s", cmd);
+ places_gui_exec(cmd);
+@@ -114,8 +111,9 @@ places_load_terminal(const gchar *const_
+ void
+ places_load_file(const gchar *path)
+ {
++ GError *error = NULL;
+ if(path != NULL && *path != '\0')
+- exo_url_show(path, NULL, NULL);
++ gtk_show_uri(NULL , path, 0, &error);
+ }
+
+ /**
Added: goodies/branches/experimental/xfce4-places-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/patches/series (rev 0)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/patches/series 2010-12-18 14:29:03 UTC (rev 4732)
@@ -0,0 +1 @@
+01_port-to-exo-1.patch
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/rules 2010-12-16 21:18:06 UTC (rev 4731)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/rules 2010-12-18 14:29:03 UTC (rev 4732)
@@ -1,4 +1,12 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
+ dh_auto_configure
+
+override_dh_auto_clean:
+ rm -f po/POTFILES.skip
+ dh_auto_clean
+
%:
dh $@
Added: goodies/branches/experimental/xfce4-places-plugin/debian/source/format
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/source/format (rev 0)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/source/format 2010-12-18 14:29:03 UTC (rev 4732)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-xfce-commits
mailing list