[Pkg-xfce-commits] r7405 - in desktop/trunk/exo: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 07:55:34 UTC 2013
Author: corsac
Date: 2013-05-21 19:55:34 +0000 (Tue, 21 May 2013)
New Revision: 7405
Removed:
desktop/trunk/exo/debian/patches/01_fix-link-lm.patch
desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch
desktop/trunk/exo/debian/patches/03_fix-es-translation-nautilus-desktop.patch
desktop/trunk/exo/debian/patches/series
Modified:
desktop/trunk/exo/
desktop/trunk/exo/debian/changelog
desktop/trunk/exo/debian/control
desktop/trunk/exo/debian/libexo-1-0.symbols
desktop/trunk/exo/debian/libexo-common.install
desktop/trunk/exo/debian/rules
Log:
merge changes from experimental
Property changes on: desktop/trunk/exo
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/exo:6334-7388
Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/changelog 2013-05-21 19:55:34 UTC (rev 7405)
@@ -1,3 +1,64 @@
+exo (0.10.2-1) experimental; urgency=low
+
+ * New upstream stable release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 30 Dec 2012 20:36:17 +0100
+
+exo (0.10.1-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * debian/libexo-1-0.symbols updated for new release.
+ * debian/control: bumped minimum required glib version to 2.30.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 11 Dec 2012 21:56:35 +0100
+
+exo (0.8.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * debian/control: revert to unversioned libxfce4util-dev, bump required
+ versions for Xfce 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 05 May 2012 09:38:41 +0200
+
+exo (0.7.3-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/rules:
+ - don't run xdt-autogen, we dropped the patches that required it.
+ - drop obsolete --disable-python configure flag.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 15 Apr 2012 15:34:08 +0200
+
+exo (0.7.2-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream development release.
+ * debian/patches:
+ - 01_fix-link-lm.patch, 02_fix-glib-link-test.patch: dropped, included
+ upstream.
+ * debian/libexo-1-dev.install: drop *.a files, not built anymore.
+ * debian/control: bump libxfce4ui-1-dev b-dep to >= 4.9.0 for the new help
+ buttons.
+ * debian/libexo-common.install: updated, docs aren't shipped anymore.
+ * debian/libexo-1-0.symbols: updated for the new symbols.
+ * debian/rules: drop --sourcedir from dh_install, unneeded, and pass -X .la
+ to ignore .la files instead of deleting them manually.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update libxfce4util (build-)dep to libxfce4util6-dev.
+ - update standards version to 3.9.3.
+ - update debhelper build-dep to 9.
+ - add build-dep on dpkg-dev 1.16.1.
+ - drop build-dep on hardening-includes.
+ - make libexo-helpers Multi-Arch: foreign.
+ * debian/compat bumped to 9.
+ * debian/rules:
+ - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+ - build with --parallel.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 08 Apr 2012 16:17:33 +0200
+
exo (0.6.2-6) UNRELEASED; urgency=low
* debian/control:
Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/control 2013-05-21 19:55:34 UTC (rev 7405)
@@ -4,10 +4,10 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>,
Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.8.0),
- libxfce4ui-1-dev (>= 4.8.0), liburi-perl, chrpath, intltool,
- dpkg-dev (>= 1.16.1), libglib2.0-dev (>= 2.27),
- xfce4-dev-tools, libtool, gtk-doc-tools
+Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.10.0),
+ dpkg-dev (>= 1.16.1), libxfce4ui-1-dev (>= 4.10.0), liburi-perl, chrpath,
+ intltool, libglib2.0-dev (>= 2.30), xfce4-dev-tools (>= 4.10.0), libtool,
+ gtk-doc-tools
Standards-Version: 3.9.3
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/
@@ -17,7 +17,7 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libexo-1-0 (= ${binary:Version}), libxfce4util-dev (>= 4.8.0),
+Depends: libexo-1-0 (= ${binary:Version}), libxfce4util-dev (>= 4.10.0),
${misc:Depends}, libgtk2.0-dev
Description: Development files for libexo
This package contains the headers and the static library
@@ -89,11 +89,12 @@
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, desktop files and documentation.
+ desktop files and documentation.
Package: libexo-helpers
Section: libs
Architecture: any
+Multi-arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libexo-0.3-0 (<< 0.3.104-3), libexo-common (<< 0.6.2-3)
Description: libexo helpers
Modified: desktop/trunk/exo/debian/libexo-1-0.symbols
===================================================================
--- desktop/trunk/exo/debian/libexo-1-0.symbols 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/libexo-1-0.symbols 2013-05-21 19:55:34 UTC (rev 7405)
@@ -55,6 +55,8 @@
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_column at Base 0.7.1
+ exo_icon_view_get_item_row at Base 0.7.1
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
@@ -83,6 +85,7 @@
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_selection_invert at Base 0.10.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
Modified: desktop/trunk/exo/debian/libexo-common.install
===================================================================
--- desktop/trunk/exo/debian/libexo-common.install 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/libexo-common.install 2013-05-21 19:55:34 UTC (rev 7405)
@@ -1,3 +1,2 @@
etc
-usr/share/doc/exo/html
usr/share/icons
Deleted: desktop/trunk/exo/debian/patches/01_fix-link-lm.patch
===================================================================
--- desktop/trunk/exo/debian/patches/01_fix-link-lm.patch 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/patches/01_fix-link-lm.patch 2013-05-21 19:55:34 UTC (rev 7405)
@@ -1,18 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Description: link with -lm
-Forwarded: https://bugzilla.xfce.org/show_bug.cgi?id=8492
-
-Index: exo-0.6.2/exo/Makefile.am
-===================================================================
---- exo-0.6.2.orig/exo/Makefile.am 2011-09-05 22:11:21.302991166 +0200
-+++ exo-0.6.2/exo/Makefile.am 2011-09-05 22:26:13.416502894 +0200
-@@ -105,7 +105,8 @@
- $(GIO_LIBS) \
- $(GTK_LIBS) \
- $(LIBX11_LIBS) \
-- $(LIBXFCE4UTIL_LIBS)
-+ $(LIBXFCE4UTIL_LIBS) \
-+ -lm
-
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = exo-$(LIBEXO_VERSION_API).pc
Deleted: desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch
===================================================================
--- desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch 2013-05-21 19:55:34 UTC (rev 7405)
@@ -1,24 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Description: link tests with glib
-Forwarded: https://bugzilla.xfce.org/show_bug.cgi?id=8493
-
-Index: exo-0.6.2/tests/Makefile.am
-===================================================================
---- exo-0.6.2.orig/tests/Makefile.am 2011-06-10 19:05:27.000000000 +0200
-+++ exo-0.6.2/tests/Makefile.am 2011-09-06 07:13:52.064039427 +0200
-@@ -39,6 +39,7 @@
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
-
- test_exo_noop_LDADD = \
-+ $(GLIB_LIBS) \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
-
- test_exo_string_SOURCES = \
-@@ -52,6 +53,7 @@
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
-
- test_exo_string_LDADD = \
-+ $(GLIB_LIBS) \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
-
- test_exo_icon_chooser_dialog_SOURCES = \
Deleted: desktop/trunk/exo/debian/patches/03_fix-es-translation-nautilus-desktop.patch
===================================================================
--- desktop/trunk/exo/debian/patches/03_fix-es-translation-nautilus-desktop.patch 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/patches/03_fix-es-translation-nautilus-desktop.patch 2013-05-21 19:55:34 UTC (rev 7405)
@@ -1,13 +0,0 @@
-Index: exo-0.6.2/po/es.po
-===================================================================
---- exo-0.6.2.orig/po/es.po 2011-06-10 19:05:27.000000000 +0200
-+++ exo-0.6.2/po/es.po 2012-07-26 17:21:13.575393658 +0200
-@@ -1233,7 +1233,7 @@
-
- #: ../exo-helper/helpers/nautilus.desktop.in.in.h:1
- msgid "Nautilus"
--msgstr "Thunar"
-+msgstr "Nautilus"
-
- #: ../exo-helper/helpers/netscape-navigator.desktop.in.in.h:1
- msgid "Netscape Navigator"
Deleted: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/patches/series 2013-05-21 19:55:34 UTC (rev 7405)
@@ -1,3 +0,0 @@
-01_fix-link-lm.patch
-02_fix-glib-link-test.patch
-03_fix-es-translation-nautilus-desktop.patch
Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules 2013-05-21 19:35:18 UTC (rev 7404)
+++ desktop/trunk/exo/debian/rules 2013-05-21 19:55:34 UTC (rev 7405)
@@ -13,14 +13,9 @@
dh $@ --parallel
override_dh_auto_configure:
- NOCONFIGURE=1 xdt-autogen
- MSGFMT="$(MSGFMT)" dh_auto_configure -- --disable-gtk-doc --disable-python
+ MSGFMT="$(MSGFMT)" dh_auto_configure -- --disable-gtk-doc
override_dh_install:
- # delete the unneeded .a and .la files
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexo-$(EXO_LIBNAME).la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gio/modules/libexo-module-$(EXO_LIBNAME).la
-
# Debianise
sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \
-e 's/TerminalEmulator=.*/TerminalEmulator=debian-x-terminal-emulator/' \
@@ -37,7 +32,7 @@
<debian/tmp/usr/share/xfce4/helpers/mutt.desktop \
>debian/tmp/usr/share/xfce4/helpers/muttng.desktop
- dh_install --fail-missing --sourcedir=debian/tmp
+ dh_install --fail-missing -X .la
override_dh_strip:
dh_strip -p $(EXO_SONAME) --dbg-package=$(EXO_SONAME)-dbg
More information about the Pkg-xfce-commits
mailing list