[Pkg-xfce-commits] r5305 - in goodies/trunk/xfce4-radio-plugin: . debian

Sat Apr 2 10:32:32 UTC 2011

Author: mrpouit-guest
Date: 2011-04-02 22:32:32 +0000 (Sat, 02 Apr 2011)
New Revision: 5305

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


Property changes on: goodies/trunk/xfce4-radio-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-radio-plugin:4344-5304
/goodies/tags/xfce4-radio-plugin/0.4.2-1:3062-4343

Modified: goodies/trunk/xfce4-radio-plugin/debian/changelog
===================================================================

--- goodies/trunk/xfce4-radio-plugin/debian/changelog	2011-04-02 22:29:10 UTC (rev 5304)
+++ goodies/trunk/xfce4-radio-plugin/debian/changelog	2011-04-02 22:32:32 UTC (rev 5305)
@@ -1,23 +1,26 @@
-xfce4-radio-plugin (0.4.2-2) UNRELEASED; urgency=low
+xfce4-radio-plugin (0.4.4-1) experimental; urgency=low
 
-  [ Yves-Alexis Perez ]
-  * New upstream release
-    - fix FTBFS by including time.h.                            closes: #614451
+  * New upstream release.
+    - fix FTBFS.                                                closes: #614451
   * debian/control:
-    - move package to xfce section.
-  * debian/watch edited to track Xfce archive reorganisation.
+    - add build-dep on libxfcegui4-dev now that it's not pulled by
+      xfce4-panel-dev anymore.
+    - switch to xfce section.
+    - update standards version to 3.9.1.
+    - update debhelper build-dep to 7.
+    - add build-dep on hardening-includes.
+  * Switch to 3.0 (quilt) source format.
+  * debian/watch updated to track archive reorganization.
+  * debian/compat updated to 7.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+  * debian/copyright updated to include the complete BSD license text instead
+    of a link to the file in base-files.
 
-  [ Evgeni Golov ]
-  * Fix Vcs-* fields, they were missing 'trunk' in the path.
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 01:44:50 +0100
 
-  [ Stefan Ott ]
-  * debian/control:
-    - Update debhelper build-dependency to version >= 5
-    - Update standards version to 3.8.1 (no changes needed)
-    - Remove duplicate section entry
-
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 22 Feb 2011 07:41:30 +0100
-
 xfce4-radio-plugin (0.4.2-1) unstable; urgency=low
 
   * New upstream version

Modified: goodies/trunk/xfce4-radio-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-radio-plugin/debian/compat	2011-04-02 22:29:10 UTC (rev 5304)
+++ goodies/trunk/xfce4-radio-plugin/debian/compat	2011-04-02 22:32:32 UTC (rev 5305)
@@ -1 +1 @@
-5
+7

Modified: goodies/trunk/xfce4-radio-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-radio-plugin/debian/control	2011-04-02 22:29:10 UTC (rev 5304)
+++ goodies/trunk/xfce4-radio-plugin/debian/control	2011-04-02 22:32:32 UTC (rev 5305)
@@ -3,9 +3,9 @@
 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>, Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), xfce4-panel-dev (>= 4.4.2),
- libxml2-dev, libxml-parser-perl, intltool
-Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev (>= 4.4.2),
+ libxml2-dev, libxml-parser-perl, intltool, libxfcegui4-dev, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-radio-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-radio-plugin/

Modified: goodies/trunk/xfce4-radio-plugin/debian/copyright
===================================================================
--- goodies/trunk/xfce4-radio-plugin/debian/copyright	2011-04-02 22:29:10 UTC (rev 5304)
+++ goodies/trunk/xfce4-radio-plugin/debian/copyright	2011-04-02 22:32:32 UTC (rev 5305)
@@ -8,6 +8,33 @@
 © 2006-2008 Stefan Ott <stefan at desire.ch>
 
 Copyright:
-This software is released under the terms of the BSD license.
-On Debian systems, the complete text of the BSD License
-can be found in the file /usr/share/common-licenses/BSD
+This software is released under the terms of the BSD license:
+
+----
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+----

Modified: goodies/trunk/xfce4-radio-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-radio-plugin/debian/rules	2011-04-02 22:29:10 UTC (rev 5304)
+++ goodies/trunk/xfce4-radio-plugin/debian/rules	2011-04-02 22:32:32 UTC (rev 5305)
@@ -1,13 +1,15 @@
 #!/usr/bin/make -f
-# no need to update them since upstream uses latest version (1.9)
-#DEB_AUTO_UPDATE_LIBTOOL := pre
-#DEB_AUTO_UPDATE_ACLOCAL := 1.9
-#DEB_AUTO_UPDATE_AUTOMAKE := 1.9
-#DEB_AUTO_UPDATE_AUTOCONF := yes
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
+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)
+
+export CFLAGS LDFLAGS
+
 binary-post-install/xfce4-radio-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la

Modified: goodies/trunk/xfce4-radio-plugin/debian/watch
===================================================================
--- goodies/trunk/xfce4-radio-plugin/debian/watch	2011-04-02 22:29:10 UTC (rev 5304)
+++ goodies/trunk/xfce4-radio-plugin/debian/watch	2011-04-02 22:32:32 UTC (rev 5305)
@@ -1,3 +1,3 @@
 version=3
 http://archive.xfce.org/src/panel-plugins/xfce4-radio-plugin/([\d\.]+)/ \
-	xfce4-radio-plugin-([\d\.]+)\.tar\.(?:gz|bz2)
+  xfce4-radio-plugin-([\d\.]+)\.tar\.(?:gz|bz2)


