[Pkg-xfce-commits] r7454 - in desktop/trunk/xfce4-appfinder: . debian

Yves-Alexis Perez corsac at alioth.debian.org
Tue May 21 10:00:10 UTC 2013 

Author: corsac
Date: 2013-05-21 22:00:10 +0000 (Tue, 21 May 2013)
New Revision: 7454

Added:
   desktop/trunk/xfce4-appfinder/debian/links
Modified:
   desktop/trunk/xfce4-appfinder/
   desktop/trunk/xfce4-appfinder/debian/changelog
   desktop/trunk/xfce4-appfinder/debian/compat
   desktop/trunk/xfce4-appfinder/debian/control
   desktop/trunk/xfce4-appfinder/debian/rules
   desktop/trunk/xfce4-appfinder/debian/xfce4-appfinder.1
Log:
merge changes from experimental



Property changes on: desktop/trunk/xfce4-appfinder
___________________________________________________________________
Added: svn:mergeinfo
   + /desktop/branches/experimental/xfce4-appfinder:4247-7429
/desktop/tags/xfce4-appfinder/4.6.2-1:4082-4243

Modified: desktop/trunk/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/changelog	2013-05-21 21:58:06 UTC (rev 7453)
+++ desktop/trunk/xfce4-appfinder/debian/changelog	2013-05-21 22:00:10 UTC (rev 7454)
@@ -1,3 +1,44 @@
+xfce4-appfinder (4.10.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 14:13:21 +0200
+
+xfce4-appfinder (4.9.5-1) experimental; urgency=low
+
+  * New upstream development release.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 15 Apr 2012 16:11:40 +0200
+
+xfce4-appfinder (4.9.4-1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream development release.
+  * debian/xfce4-appfinder.1: updated for the new options in 4.9.x.
+  * debian/control:
+    - switch to libxfce4util6-dev for the new api.
+    - bump libxfce4ui-1-dev to >= 4.9.0 for the new help api.
+    - breaks/replaces pre 4.10 xfce4-utils package, as it
+      previously shipped xfrun4.
+  * debian/links: xfrun4 is now a symlink to xfce4-appfinder, so add a symlink
+    for its manpage too.
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - 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.
+    - add buil-dep on libdbus-glib-1-dev.
+  * 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 22:22:48 +0200
+
 xfce4-appfinder (4.8.0-4) UNRELEASED; urgency=low
 
   * debian/watch updated to follow stable releases.

Modified: desktop/trunk/xfce4-appfinder/debian/compat
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/compat	2013-05-21 21:58:06 UTC (rev 7453)
+++ desktop/trunk/xfce4-appfinder/debian/compat	2013-05-21 22:00:10 UTC (rev 7454)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfce4-appfinder/debian/control
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/control	2013-05-21 21:58:06 UTC (rev 7453)
+++ desktop/trunk/xfce4-appfinder/debian/control	2013-05-21 22:00:10 UTC (rev 7454)
@@ -3,10 +3,10 @@
 Priority: optional
 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 (>= 7.0.50~), libxfce4util-dev (>= 4.8.0),
- libxfce4ui-1-dev (>= 4.8.0), libxft-dev, libxml-parser-perl, libgtk2.0-dev,
- libxfconf-0-dev (>= 4.8.0), libgarcon-1-0-dev (>= 0.1.0), intltool, 
- hardening-includes
+Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.10.0),
+ libxfce4ui-1-dev (>= 4.10.0), libxft-dev, libxml-parser-perl, libgtk2.0-dev,
+ libxfconf-0-dev (>= 4.10.0), libgarcon-1-0-dev (>= 0.2.0), intltool,
+ dpkg-dev (>= 1.16.1), libdbus-glib-1-dev
 Standards-Version: 3.9.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/
@@ -16,6 +16,8 @@
 Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: xfce4-utils
+Replaces: xfce4-utils
 Description: Application finder for the Xfce4 Desktop Environment
  This is an application finder for the Xfce4 Desktop Environment.
  It will search for installed applications on your system.

Copied: desktop/trunk/xfce4-appfinder/debian/links (from rev 7429, desktop/branches/experimental/xfce4-appfinder/debian/links)
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/links	                        (rev 0)
+++ desktop/trunk/xfce4-appfinder/debian/links	2013-05-21 22:00:10 UTC (rev 7454)
@@ -0,0 +1 @@
+usr/share/man/man1/xfce4-appfinder.1.gz usr/share/man/man1/xfrun4.1.gz

Modified: desktop/trunk/xfce4-appfinder/debian/rules
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/rules	2013-05-21 21:58:06 UTC (rev 7453)
+++ desktop/trunk/xfce4-appfinder/debian/rules	2013-05-21 22:00:10 UTC (rev 7454)
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
 include /usr/share/hardening-includes/hardening.make
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 override_dh_install:
 	# install menu pixmap
 	install -d $(CURDIR)/debian/xfce4-appfinder/usr/share/pixmaps
@@ -16,4 +12,4 @@
 	dh_install
 
 %:
-	dh $@
+	dh $@ --parallel

Modified: desktop/trunk/xfce4-appfinder/debian/xfce4-appfinder.1
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/xfce4-appfinder.1	2013-05-21 21:58:06 UTC (rev 7453)
+++ desktop/trunk/xfce4-appfinder/debian/xfce4-appfinder.1	2013-05-21 22:00:10 UTC (rev 7454)
@@ -1,16 +1,45 @@
-.\" Copyright (C) 2004 Benedikt Meurer
-.TH XFCE4-APPFINDER "1" "February 2004" "xfce4-appfinder 0.4" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
+.TH XFCE4-APPFINDER "1" "September 2011" "xfce4-appfinder 4.9.1 (Xfce 4.8)" "User Commands"
 .SH NAME
 xfce4-appfinder \- Xfce 4 Appfinder
 .SH SYNOPSIS
-.B xfce4-appfinder
+.B xfce4\-appfinder [OPTION...]
 .SH DESCRIPTION
 .PP
 Searches installed applications on your system.
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \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\-c\fR, \fB\-\-collapsed\fR
+Start in collapsed mode
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-r\fR, \fB\-\-replace\fR
+Replace the existing service
+.TP
+\fB\-q\fR, \fB\-\-quit\fR
+Quit all instances
+.TP
+\fB\-\-disable\-server\fR
+Do not try to use or become a D\-Bus service
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
 .SH "REPORTING BUGS"
-Report bugs to <bm at os-cillation.de>
+Please report bugs to <http://bugzilla.xfce.org/>.
 .SH COPYRIGHT
-Copyright \(co 2004 Benedikt Meurer
+Copyright \(co 2004\-2011 The Xfce development team.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

More information about the Pkg-xfce-commits mailing list