[Pkg-xfce-commits] r5186 - desktop/trunk/xfwm4/debian

Yves-Alexis Perez corsac at alioth.debian.org
Thu Mar 31 10:33:23 UTC 2011


Author: corsac
Date: 2011-03-31 10:33:18 +0000 (Thu, 31 Mar 2011)
New Revision: 5186

Added:
   desktop/trunk/xfwm4/debian/patches/
   desktop/trunk/xfwm4/debian/xfwm4.install
Modified:
   desktop/trunk/xfwm4/debian/changelog
   desktop/trunk/xfwm4/debian/control
   desktop/trunk/xfwm4/debian/copyright
   desktop/trunk/xfwm4/debian/rules
Log:
merge 4.8 branch from experimental


Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog	2011-03-31 10:26:50 UTC (rev 5185)
+++ desktop/trunk/xfwm4/debian/changelog	2011-03-31 10:33:18 UTC (rev 5186)
@@ -1,3 +1,35 @@
+xfwm4 (4.8.1-2) experimental; urgency=low
+
+  * debian/control:
+    - update xfconf build-dep to 4.8.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 07 Mar 2011 08:03:27 +0100
+
+xfwm4 (4.8.1-1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream bugfix release.
+  * debian/control: add myself to Uploaders.
+  * debian/rules: stop overridding libexecdir; no need to pass
+    --enable-compositor, it's already the default nowadays.
+
+  [ Yves-Alexis Perez ]
+  * New upstream development release.
+  * debian/control:
+    - update standards version to 3.9.1.
+    - refresh build-deps for Xfce 4.7.
+    - build-conflicts against libxfcegui4-dev to be sure to pick kbd headers
+      from libxfce4ui-dev.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS. 
+    - drop useless chrpath call.
+  * add an xfwm4-dbg package.
+  * debian/copyright updated for new release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 14 Feb 2011 23:25:11 +0100
+
 xfwm4 (4.6.2-1) unstable; urgency=low
 
   [ Stefan Ott ]
@@ -15,7 +47,7 @@
   * debian/docs: use dh_installdocs to install docs.
   * debian/manpages: use dh_installman to install manpages.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 May 2010 14:01:51 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 19:04:10 +0200
 
 xfwm4 (4.6.1-1) unstable; urgency=low
 

Modified: desktop/trunk/xfwm4/debian/control
===================================================================
--- desktop/trunk/xfwm4/debian/control	2011-03-31 10:26:50 UTC (rev 5185)
+++ desktop/trunk/xfwm4/debian/control	2011-03-31 10:33:18 UTC (rev 5186)
@@ -2,12 +2,16 @@
 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 (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6),
  libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
- libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.6.0),
- libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, libwnck-dev, intltool
-Standards-Version: 3.8.4
+ libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.8.0),
+ libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), libwnck-dev, intltool,
+ hardening-includes
+Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
+Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/
@@ -28,3 +32,12 @@
  complies to the standards defined at http://www.freedesktop.org/. Without
  xfce4 installed this only gives you a window manager not the full
  environment.
+
+Package: xfwm4-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfwm4 (= ${binary:Version})
+Description: window manager of the Xfce project (debugging symbols)
+ This package contains debugging symbols for xfwm4, the Xfce window manager.
+ Install it if you need to debug issues in xfwm4.

Modified: desktop/trunk/xfwm4/debian/copyright
===================================================================
--- desktop/trunk/xfwm4/debian/copyright	2011-03-31 10:26:50 UTC (rev 5185)
+++ desktop/trunk/xfwm4/debian/copyright	2011-03-31 10:33:18 UTC (rev 5186)
@@ -20,42 +20,215 @@
    --------------------
    Fredrik Hoglund (fredrik at kde.org)
 
-Files: *
-Copyright: © 2009 Olivier Fourdan <ofourdan at xfce.org>
+
+Files: src/client.c
+ src/client.h
+ src/cycle.c
+ src/cycle.h
+ src/events.c
+ src/events.h
+ src/focus.c
+ src/frame.c
+ src/frame.h
+ src/keyboard.c
+ src/keyboard.h
+ src/main.c
+ src/misc.c
+ src/misc.h
+ src/moveresize.c
+ src/moveresize.h
+ src/mypixmap.h
+ src/mywindow.h
+ src/parserc.c
+ src/parserc.h
+ src/screen.h
+ src/settings.c
+ src/settings.h
+ src/workspaces.c
+ src/workspaces.h
+ src/xsync.h
+Copyright: 2001, Ken Lynch
+ 2002-2011, Olivier Fourdan
+License: GPL
+
+Files: helper-dialog/helper-dialog.c
+ src/display.c
+ src/display.h
+ src/event_filter.c
+ src/event_filter.h
+ src/focus.h
+ src/mywindow.c
+ src/netwm.c
+ src/netwm.h
+ src/placement.c
+ src/placement.h
+ src/poswin.c
+ src/poswin.h
+ src/screen.c
+ src/session.c
+ src/session.h
+ src/stacking.c
+ src/stacking.h
+ src/tabwin.c
+ src/tabwin.h
+ src/transients.c
+ src/transients.h
+ src/ui_style.c
+ src/ui_style.h
+ src/xsync.c
+Copyright: 2002-2008, Olivier Fourdan
+ 2002-2011, Olivier Fourdan
+License: GPL
+
+Files: src/gen-color-table.pl
+Copyright: 2005 Owen Taylor <otaylor at redhat.com>
+License: LGPL
+Comment: Taken from pango, see http://git.gnome.org/browse/pango/commit/?id=b7934ca5b93621b540c9b5e956dc35d4b0700e4f
+
+Files: src/icons.c
+ src/icons.h
+ src/menu.c
+ src/menu.h
+ src/startup_notification.c
+ src/startup_notification.h
+ src/terminate.c
+ src/terminate.h
+Copyright: 2001, Havoc Pennington
+ 2001-2002, Havoc Pennington
+ 2002-2011, Olivier Fourdan
+ 2003, Havoc Pennington
 License: GPL-2+
-Files: settings-dialogs/tweaks-settings.c
-Copyright: © 2008 Stephan Arts <stephan at xfce.org>
-Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
-Copyright: © 2008 Olivier Fourdan <olivier at xfce.org>
+
+Files: src/stock_icons.c
+ src/stock_icons.h
+Copyright: 2002, Havoc Pennington
+ 2002, Jorn Baayen <jorn at nl.linux.org>
+ 2002-2011, Olivier Fourdan
 License: GPL-2+
-Files: settings-dialogs/workspace-settings.c
-Copyright: © 2008 Stephan Arts <stephan at xfce.org>
-Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
-Copyright: © 2008 Olivier Fourdan <olivier at xfce.org>
-Copyright: © 2008 Mike Massonnet <mmassonnet at xfce.org>
-Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
+
+Files: src/hints.c
+ src/hints.h
+Copyright: 2001, Havoc Pennington
+ 2001, Ken Lynch
+ 2002-2011, Olivier Fourdan
 License: GPL-2+
-Files: settings-dialogs/xfce-settings.c
-Copyright: © 2008 Stephan Arts <stephan at xfce.org>
-Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
+
+Files: src/spinning_cursor.c
+ src/spinning_cursor.h
+Copyright: 1998, mozilla.org
+ 2002-2011, Olivier Fourdan
 License: GPL-2+
-Files: settings-dialogs/xfce-settings.h
-Copyright: © 2008 Jannis Pohlmann <jannis at xfce.org>
+
+Files: settings-dialogs/xfwm4-settings.h
+Copyright: 2008, Jannis Pohlmann <jannis at xfce.org>
+ 2009, Jannis Pohlmann <jannis at xfce.org>
 License: GPL-2+
 
-Files: src/*
-Copyright: © 2002-2009 Olivier Fourdan <ofourdan at xfce.org>
-Copyright: ©      2001 Ken Lynch
+Files: src/wireframe.c
+Copyright: 2001, Anders Carlsson, Havoc Pennington
+ 2002-2011, Olivier Fourdan
 License: GPL-2+
+
+Files: src/wireframe.h
+Copyright: 2001, Anders Carlsson, Havoc Pennington
+ 2002-2011, Olivier Fourdan
+License: GPL-2+
+
+Files: settings-dialogs/tweaks-settings.c
+Copyright: 2008, Jannis Pohlmann <jannis at xfce.org>
+ 2008, Olivier Fourdan <olivier at xfce.org>
+ 2008, Stephan Arts <stephan at xfce.org>
+License: GPL-2+
+
+Files: src/compositor.h
+Copyright: 2003, Keith Packard
+ 2005-2011, Olivier Fourdan
+License: GPL-2+
+
+Files: src/compositor.c
+Copyright: 2003, Keith Packard
+ 2003-2004, Red Hat, Inc
+ 2005-2011, Olivier Fourdan
+License: GPL-2+
+
 Files: src/mypixmap.c
-Copyright: © 2002-2009 Olivier Fourdan <ofourdan at xfce.org>
-Copyright: ©      2001 Ken Lynch
-Copyright: ©      1999 Mark Crichton <crichton at gimp.org>
-License: GPL-2+, BSD
-Files: src/stock_icons.c
-Copyright: © 2002-2009 Olivier Fourdan <ofourdan at xfce.org>
-Copyright: ©      2002 Havoc Pennington
-Copyright: ©      2002 2002 Jorn Baayen <jorn at nl.linux.org>
+Copyright: 1999, Mark Crichton
+ 1999, The Free Software Foundation
+ 2001, Ken Lynch
+ 2002-2011, Olivier Fourdan
+License: GPL-2+
 
+Files: settings-dialogs/workspace-settings.c
+Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
+ 2008, Jannis Pohlmann <jannis at xfce.org>
+ 2008, Mike Massonnet <mmassonnet at xfce.org>
+ 2008, Olivier Fourdan <olivier at xfce.org>
+ 2008, Stephan Arts <stephan at xfce.org>
+License: GPL-2+
+
+Files: settings-dialogs/xfwm4-settings.c
+Copyright: 2008, Jannis Pohlmann <jannis at xfce.org>
+ 2008, Stephan Arts <stephan at xfce.org>
+License: GPL-2+
+
+Files: src/*.png
+	icons/*.png
+  settings-dialogs/monitor-icon.png
+Copyright: 2003-2008 Olivier Fourdan <fourdan at xfce.org>
+License: GPL-2+
+
+Files: themes/Daloa/*
+Copyright: © 2006 Mike Massonnet <mmassonnet at gmail.com>
+	© 2006 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/default-4.0/*
+Copyright: © 2003 Olivier Fourdan <fourdan.olivier at wanadoo.fr>
+License: GPL
+
+Files: themes/default-4.2/*
+Copyright: © 2004 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/default-4.4/*
+Copyright: © 2006 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/default-4.6/*
+Copyright: © 2006-2008 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/kokodi/*
+Copyright: © 2006 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/moheli/*
+Copyright: © 2004-2006 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/sassandra/*
+Copyright: © 2005-2006 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/stoneage/*
+Copyright: © 2005 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/therapy/*
+Copyright: © 2004-2006 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/tyrex/*
+Copyright: © 2004 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+Files: themes/wallis/*
+Copyright: © 2005-2006 Olivier Fourdan <fourdan at xfce.org>
+License: GPL
+
+
+
+
+
 On Debian systems, the complete text of the GNU General Public 
 License can be found in `/usr/share/common-licenses/GPL'.

Modified: desktop/trunk/xfwm4/debian/rules
===================================================================
--- desktop/trunk/xfwm4/debian/rules	2011-03-31 10:26:50 UTC (rev 5185)
+++ desktop/trunk/xfwm4/debian/rules	2011-03-31 10:33:18 UTC (rev 5186)
@@ -1,17 +1,16 @@
 #!/usr/bin/make -f
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+include /usr/share/hardening-includes/hardening.make
 
-override_dh_auto_configure:
-	dh_auto_configure -- --enable-compositor --libexecdir=\$${prefix}/lib
+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)
 
-override_dh_install:
-	chrpath -d -k `pwd`/debian/xfwm4/usr/bin/*
+export CFLAGS LDFLAGS
 
+override_dh_strip:
+	dh_strip --dbg-package=xfwm4-dbg
+
 %:
 	dh $@

Copied: desktop/trunk/xfwm4/debian/xfwm4.install (from rev 5185, desktop/branches/experimental/xfwm4/debian/xfwm4.install)
===================================================================
--- desktop/trunk/xfwm4/debian/xfwm4.install	                        (rev 0)
+++ desktop/trunk/xfwm4/debian/xfwm4.install	2011-03-31 10:33:18 UTC (rev 5186)
@@ -0,0 +1 @@
+usr




More information about the Pkg-xfce-commits mailing list