[Pkg-xfce-commits] r5197 - desktop/trunk/xfce4-appfinder/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-31 12:48:08 +0000 (Thu, 31 Mar 2011)
New Revision: 5197

Added:
   desktop/trunk/xfce4-appfinder/debian/source/
Modified:
   desktop/trunk/xfce4-appfinder/debian/changelog
   desktop/trunk/xfce4-appfinder/debian/control
   desktop/trunk/xfce4-appfinder/debian/copyright
   desktop/trunk/xfce4-appfinder/debian/rules
Log:
merge 4.8 branch from experimental


Modified: desktop/trunk/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/changelog	2011-03-31 12:22:19 UTC (rev 5196)
+++ desktop/trunk/xfce4-appfinder/debian/changelog	2011-03-31 12:48:08 UTC (rev 5197)
@@ -1,3 +1,39 @@
+xfce4-appfinder (4.8.0-3) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add versionned xfconf build-dep too.                      Closes: #617375
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 08 Mar 2011 06:50:37 +0100
+
+xfce4-appfinder (4.8.0-2) experimental; urgency=low
+
+  * debian/control:
+    - add build-dep on libxfce4util-dev 4.8.
+    - remove Emanuele Roca and Simon Huggins from Uploaders, thanks to them!
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 07 Mar 2011 21:57:54 +0100
+
+xfce4-appfinder (4.8.0-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/control:
+    - refresh build-deps for Xfce 4.7.
+    - update standards version to 3.9.1
+    - add build-dep on libgarcon-1-0-dev.
+    - add build-dep on hardening-includes.
+  * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - build with --as-needed.
+    - add hardening flags to {C,LD}FLAGS
+  * debian/copyright updated for new release.
+
+  [ Lionel Le Folgoc ]
+  * debian/control: drop build-deps on libxfce4menu-0.1-dev (ported to garcon)
+    and libthunar-vfs-1-dev (ported to gio).
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Feb 2011 22:28:37 +0100
+
 xfce4-appfinder (4.6.2-1) unstable; urgency=low
 
   [ Stefan Ott ]
@@ -13,7 +49,7 @@
   * debian/rules: switch to rules.tiny + overrides.
   * debian/menu: update section.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 23 May 2010 14:24:34 +0200
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 22 May 2010 18:48:12 +0200
 
 xfce4-appfinder (4.6.1-1) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-appfinder/debian/control
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/control	2011-03-31 12:22:19 UTC (rev 5196)
+++ desktop/trunk/xfce4-appfinder/debian/control	2011-03-31 12:48:08 UTC (rev 5197)
@@ -2,12 +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>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libxfcegui4-dev (>= 4.6.0), libxft-dev,
- libxml-parser-perl, libxfce4menu-0.1-dev, libgtk2.0-dev, libxfconf-0-dev,
- libthunar-vfs-1-dev (>= 1.0.0), intltool
-Standards-Version: 3.8.4
+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
+Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-appfinder/

Modified: desktop/trunk/xfce4-appfinder/debian/copyright
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/copyright	2011-03-31 12:22:19 UTC (rev 5196)
+++ desktop/trunk/xfce4-appfinder/debian/copyright	2011-03-31 12:48:08 UTC (rev 5197)
@@ -3,9 +3,22 @@
 
 It was downloaded from http://www.xfce.org/
 
-Files: src/*
-Copyright: © 2008 Jasper Huijsmans <jasper at xfce.org>
+Files: src/frap-icon-entry.c
+ src/frap-icon-entry.h
+Copyright: 2004-2006, Benedikt Meurer <benny at xfce.org>
+ 2005-2006, Benedikt Meurer <benny at xfce.org>
 License: GPL-2+
 
+Files: src/main.c
+ src/xfce-appfinder-window.h
+Copyright: 2008, Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
+
+Files: src/xfce-appfinder-window.c
+Copyright: 2008, Jasper Huijsmans <jasper at xfce.org>
+ 2008-2010, Jannis Pohlmann <jannis at xfce.org>
+License: GPL-2+
+
+
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.

Modified: desktop/trunk/xfce4-appfinder/debian/rules
===================================================================
--- desktop/trunk/xfce4-appfinder/debian/rules	2011-03-31 12:22:19 UTC (rev 5196)
+++ desktop/trunk/xfce4-appfinder/debian/rules	2011-03-31 12:48:08 UTC (rev 5197)
@@ -1,5 +1,13 @@
 #!/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 CFLAGS LDFLAGS
+
 override_dh_install:
 	# install menu pixmap
 	install -d $(CURDIR)/debian/xfce4-appfinder/usr/share/pixmaps