[Pkg-xfce-commits] r4225 - desktop/branches/lenny-backports/exo/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Aug 15 04:47:14 UTC 2010
Author: corsac
Date: 2010-08-15 16:47:12 +0000 (Sun, 15 Aug 2010)
New Revision: 4225
Added:
desktop/branches/lenny-backports/exo/debian/README.source
desktop/branches/lenny-backports/exo/debian/libexo-common.install
desktop/branches/lenny-backports/exo/debian/source/
Removed:
desktop/branches/lenny-backports/exo/debian/patches/
Modified:
desktop/branches/lenny-backports/exo/debian/changelog
desktop/branches/lenny-backports/exo/debian/control
desktop/branches/lenny-backports/exo/debian/libexo-0.3-0.install
desktop/branches/lenny-backports/exo/debian/libexo-0.3-dev.install
desktop/branches/lenny-backports/exo/debian/rules
desktop/branches/lenny-backports/exo/debian/watch
Log:
merge changes from latest version in squeeze to backports
Copied: desktop/branches/lenny-backports/exo/debian/README.source (from rev 4066, desktop/trunk/exo/debian/README.source)
===================================================================
--- desktop/branches/lenny-backports/exo/debian/README.source (rev 0)
+++ desktop/branches/lenny-backports/exo/debian/README.source 2010-08-15 16:47:12 UTC (rev 4225)
@@ -0,0 +1,2 @@
+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/lenny-backports/exo/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/exo/debian/changelog 2010-08-15 16:29:38 UTC (rev 4224)
+++ desktop/branches/lenny-backports/exo/debian/changelog 2010-08-15 16:47:12 UTC (rev 4225)
@@ -1,9 +1,145 @@
-exo (0.3.101-2~bpo50+1) lenny-backports; urgency=low
+exo (0.3.107-1~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 03 Jul 2009 08:06:17 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Aug 2010 18:29:04 +0200
+exo (0.3.107-1) unstable; 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.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.
+ * add a new libexo-common packages containing mount options file,
+ documentation, helper files.
+ * debian/rules:
+ - simplify rules file.
+ * debian/patches:
+ - 01_fix-exo-csource-manpage dropped, upstream manpage fixed.
+ - 02_fix-exo-open-manpage as well.
+ * debian/control:
+ - drop quilt build-dep.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 18 Oct 2009 18:22:22 +0200
+
+exo (0.3.104-2) unstable; urgency=low
+
+ * debian/patches really refreshed, to avoid re-introducing fixed bugs.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 11 Oct 2009 11:57:05 +0200
+
+exo (0.3.104-1) unstable; urgency=low
+
+ * New upstream release
+ - fix device eject in some cases. closes: #469425
+ - fix typo in exo-open.1. closes: #525259
+ * debian/patches:
+ - 01_fix-exo-csource-manpage refreshd.
+ - 02_fix-exo-open-manpage refreshd.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 10 Oct 2009 18:15:43 +0200
+
+exo (0.3.103-1) unstable; urgency=low
+
+ * New upstream release.
+ - support iocharset mount option. closes: #470412
+ * debian/patches:
+ - 01_fix-exo-csource-manpage updated.
+ - 02_fix-exo-open-manpage updated.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 09 Oct 2009 17:33:42 +0200
+
+exo (0.3.102-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ - 01_exo-open-ignore-unknown-options dropped, included upstream.
+ - 02_exo-open-fix-quotes-in-url dropped, included upstream.
+ - 01_fix-exo-csource-manpage added, fix manpage for exo-open.
+ - 02_fix-exo-open-manpage added, same thing for exo-open.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 21 Aug 2009 10:40:26 +0200
+
+exo (0.3.101-4) unstable; urgency=low
+
+ * Brown paper bag: add 02_exo-open-fix-quotes-in-url to patch series.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 20 Aug 2009 17:17:11 +0200
+
+exo (0.3.101-3) unstable; urgency=low
+
+ * debian/patches
+ - 02_exo-open-fix-quotes-in-url added, fix opening url with quotes in
+ them. (Xfce [f578ac2], #5461). closes: #526619, #535659
+ * debian/control:
+ - update standards version to 3.8.3.
+ * add a debian/README.source.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 20 Aug 2009 15:08:20 +0200
+
exo (0.3.101-2) unstable; urgency=low
* debian/patches:
Modified: desktop/branches/lenny-backports/exo/debian/control
===================================================================
--- desktop/branches/lenny-backports/exo/debian/control 2010-08-15 16:29:38 UTC (rev 4224)
+++ desktop/branches/lenny-backports/exo/debian/control 2010-08-15 16:47:12 UTC (rev 4225)
@@ -2,12 +2,14 @@
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>, Michael Casadevall <sonicmctails at gmail.com>
+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>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.6.0),
liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool, quilt
-Standards-Version: 3.8.1
-Homepage: http://libexo.os-cillation.com/
+ intltool
+Standards-Version: 3.8.4
+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/
@@ -15,7 +17,7 @@
Section: libdevel
Architecture: any
Depends: libexo-0.3-0 (= ${binary:Version}), libxfce4util-dev (>= 4.6.0),
- libhal-storage-dev, libgtk2.0-dev
+ 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.
@@ -23,7 +25,7 @@
Package: libexo-0.3-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, liburi-perl
+Depends: ${shlibs:Depends}, liburi-perl, libexo-common, ${misc:Depends}
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
@@ -38,10 +40,11 @@
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)
+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]
+Depends: libexo-0.3-0 (= ${binary:Version}), ${shlibs:Depends}, eject [!hurd-i386],
+ ${misc:Depends}
Description: Utility files for libexo
This package contains the Xfce settings plugin and the utility files for
libexo-0.3-0 which are:
@@ -57,7 +60,32 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, libexo-0.3-0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libexo-0.3-0 (= ${binary:Version}), ${misc:Depends}
Description: debugging informations for libexo
- This packages 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}
+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
+ exo-utils:
+ - exo-csource
+ - exo-open
+ - exo-desktop-item-edit
+ - exo-mount
+
+Package: libexo-common
+Section: libs
+Priority: extra
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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.
Modified: desktop/branches/lenny-backports/exo/debian/libexo-0.3-0.install
===================================================================
--- desktop/branches/lenny-backports/exo/debian/libexo-0.3-0.install 2010-08-15 16:29:38 UTC (rev 4224)
+++ desktop/branches/lenny-backports/exo/debian/libexo-0.3-0.install 2010-08-15 16:47:12 UTC (rev 4225)
@@ -1,7 +1,4 @@
-etc/
usr/lib/libexo-0.3-0/*
usr/lib/lib*.so.*
-usr/share/icons
usr/share/locale/*/*/*.mo
usr/share/pixmaps
-usr/share/xfce4
Modified: desktop/branches/lenny-backports/exo/debian/libexo-0.3-dev.install
===================================================================
--- desktop/branches/lenny-backports/exo/debian/libexo-0.3-dev.install 2010-08-15 16:29:38 UTC (rev 4224)
+++ desktop/branches/lenny-backports/exo/debian/libexo-0.3-dev.install 2010-08-15 16:47:12 UTC (rev 4225)
@@ -2,4 +2,4 @@
usr/lib/pkgconfig/*
usr/lib/lib*.a
usr/lib/lib*.so
-usr/share/gtk-doc/html/exo/*
+usr/share/gtk-doc/html/exo-0.3/*
Copied: desktop/branches/lenny-backports/exo/debian/libexo-common.install (from rev 4066, desktop/trunk/exo/debian/libexo-common.install)
===================================================================
--- desktop/branches/lenny-backports/exo/debian/libexo-common.install (rev 0)
+++ desktop/branches/lenny-backports/exo/debian/libexo-common.install 2010-08-15 16:47:12 UTC (rev 4225)
@@ -0,0 +1,3 @@
+etc
+usr/share/xfce4
+usr/share/icons
Modified: desktop/branches/lenny-backports/exo/debian/rules
===================================================================
--- desktop/branches/lenny-backports/exo/debian/rules 2010-08-15 16:29:38 UTC (rev 4224)
+++ desktop/branches/lenny-backports/exo/debian/rules 2010-08-15 16:47:12 UTC (rev 4225)
@@ -4,46 +4,16 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+EXO_LIBNAME=0.3
+EXO_SOVERSION=0
+EXO_SONAME=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-# determine current exo version
-EXOVERS=$(shell sed -ne 's/^Package: libexo-\([0-9]\{1,\}\.[0-9]\{1,\}\)-[0-9]\{1,\}/\1/p' debian/control)
-
-# determine python version in use
-#PYVERS=$(shell sed -ne 's/^Build-Depends:.*python\([0-9]\{1,\}\.[0-9]\{1,\}\)-dev.*/\1/p' debian/control)
-
-# determine library package name
-LIBRARY_PKGNAME=$(shell sed -ne 's/^Package: \(libexo-[0-9]\{1,\}\.[0-9]\{1,\}-[0-9]\{1,\}\)/\1/p' debian/control)
-
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls exo/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls exo/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
config.status: configure
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./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/libexo-0.3-0 --enable-final --disable-gtk-doc --disable-python --enable-notifications
+ ./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
-
-build: patch build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
@@ -52,7 +22,7 @@
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -71,37 +41,22 @@
# Add here commands to install the package into debian/tmp
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- # rename the exo gtk-docs directory to avoid conflicting -dev
- # packages
- #(cd $(CURDIR)/debian/tmp/usr/share/gtk-doc/html \
- # && mv exo exo-$(EXOVERS))
-
- # move the pyexo.py away, will be managed as an alternative
- #-(cd $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages \
- #&& mv pyexo.py pyexo.py.python$(PYVERS)-exo$(EXOVERS))
-
- # delete unused static library
- -rm -f $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages/exo-$(EXOVERS)/_exo.a
-
# delete the unneeded .a and .la files
- rm -f debian/tmp/usr/lib/libexo-hal-0.3.la
- rm -f debian/tmp/usr/lib/libexo-0.3.la
+ rm -f debian/tmp/usr/lib/libexo-hal-$(EXO_LIBNAME).la
+ rm -f debian/tmp/usr/lib/libexo-$(EXO_LIBNAME).la
# Debianise
sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \
-e 's/TerminalEmulator=.*/TerminalEmulator=debian-x-terminal-emulator/' \
debian/tmp/etc/xdg/xfce4/helpers.rc
- # delete all pre-compiled python files
- #-find $(CURDIR)/debian/tmp -name '*.py[co]' -exec rm -f '{}' ';'
-
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/libexo-0.3-0/exo-helper-0.3 \
- debian/tmp/usr/lib/libexo-0.3*.so.* \
- debian/tmp/usr/lib/libexo-hal-0.3*.so.* \
+ 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.* \
# Create a muttng helper from the mutt one
sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \
@@ -123,13 +78,15 @@
dh_installexamples
dh_install --fail-missing --sourcedir=debian/tmp
dh_link
- dh_strip --dbg-package=libexo-0.3-0-dbg
+ 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 -p$(LIBRARY_PKGNAME)
- #dh_python
+ dh_makeshlibs
dh_installdeb
- dh_shlibdeps -L $(LIBRARY_PKGNAME) -l debian/$(LIBRARY_PKGNAME)/usr/lib
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: desktop/branches/lenny-backports/exo/debian/watch
===================================================================
--- desktop/branches/lenny-backports/exo/debian/watch 2010-08-15 16:29:38 UTC (rev 4224)
+++ desktop/branches/lenny-backports/exo/debian/watch 2010-08-15 16:47:12 UTC (rev 4225)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- exo-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/exo/([\d\.]+)/ \
+ exo-([\d\.]+)\.tar\.bz2
More information about the Pkg-xfce-commits
mailing list