[Pkg-xfce-commits] r5327 - in goodies/trunk/xfce4-verve-plugin: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-03 12:52:04 +0000 (Sun, 03 Apr 2011)
New Revision: 5327

Added:
   goodies/trunk/xfce4-verve-plugin/debian/manpages
   goodies/trunk/xfce4-verve-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-verve-plugin/
   goodies/trunk/xfce4-verve-plugin/debian/changelog
   goodies/trunk/xfce4-verve-plugin/debian/compat
   goodies/trunk/xfce4-verve-plugin/debian/control
   goodies/trunk/xfce4-verve-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-verve-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-verve-plugin:4419-5325

Modified: goodies/trunk/xfce4-verve-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-verve-plugin/debian/changelog	2011-04-03 12:51:39 UTC (rev 5326)
+++ goodies/trunk/xfce4-verve-plugin/debian/changelog	2011-04-03 12:52:04 UTC (rev 5327)
@@ -1,15 +1,34 @@
-xfce4-verve-plugin (0.3.6-2) UNRELEASED; urgency=low
+xfce4-verve-plugin (1.0.0-1) UNRELEASED; urgency=low
 
   [ Evgeni Golov ]
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
 
   [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/watch edited to track Xfce archive reorganisation.
   * debian/control:
     - switch to xfce section.
+    - add build-dep on libxfcegui4-dev. 
+    - add build-dep on xfce4-dev-tools and libtool
+    - add build-dep on hardening-includes.
+    - update standards version to 3.9.1.
+    - update debhelper build-dep to 7.
+  * debian/rules:
+    - run xdt-autogen after applying patch touching configure.in/Makefile.am
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+    - switch to dh7.
+  * Switch to 3.0 (quilt) source format.
+  * debian/compat bumped to 7.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 19 Jun 2010 13:17:21 +0200
+  [ Lionel Le Folgoc ]
+  * debian/control:
+    - change libexo-0.3-dev b-dep to libexo-1-dev.
+    - add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 27 Dec 2010 21:40:02 +0100
+
 xfce4-verve-plugin (0.3.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: goodies/trunk/xfce4-verve-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-verve-plugin/debian/compat	2011-04-03 12:51:39 UTC (rev 5326)
+++ goodies/trunk/xfce4-verve-plugin/debian/compat	2011-04-03 12:52:04 UTC (rev 5327)
@@ -1 +1 @@
-4
+7

Modified: goodies/trunk/xfce4-verve-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-verve-plugin/debian/control	2011-04-03 12:51:39 UTC (rev 5326)
+++ goodies/trunk/xfce4-verve-plugin/debian/control	2011-04-03 12:52:04 UTC (rev 5327)
@@ -2,12 +2,13 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 4.1.0), autotools-dev, cdbs, 
- libexo-0.3-dev (>= 0.3.2-3), xfce4-panel-dev (>= 4.4.1), libpcre3-dev, 
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
+ Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, 
+ libexo-1-dev (>= 0.5.0), xfce4-panel-dev (>= 4.4.1), libpcre3-dev, 
  libstartup-notification0-dev, libxml-parser-perl, libdbus-glib-1-dev,
- intltool
-Standards-Version: 3.8.0
+ intltool, libxfcegui4-dev, xfce4-dev-tools, libtool, hardening-includes
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-verve-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-verve-plugin/
 

Copied: goodies/trunk/xfce4-verve-plugin/debian/manpages (from rev 5325, goodies/branches/experimental/xfce4-verve-plugin/debian/manpages)
===================================================================
--- goodies/trunk/xfce4-verve-plugin/debian/manpages	                        (rev 0)
+++ goodies/trunk/xfce4-verve-plugin/debian/manpages	2011-04-03 12:52:04 UTC (rev 5327)
@@ -0,0 +1 @@
+debian/verve-focus.1

Modified: goodies/trunk/xfce4-verve-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-verve-plugin/debian/rules	2011-04-03 12:51:39 UTC (rev 5326)
+++ goodies/trunk/xfce4-verve-plugin/debian/rules	2011-04-03 12:52:04 UTC (rev 5327)
@@ -1,8 +1,12 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
-DEB_INSTALL_MANPAGES_xfce4-verve-plugin := debian/verve-focus.1
+export LDFLAGS CFLAGS
+
+%:
+	dh $@