[Pkg-xfce-commits] r5248 - in goodies/trunk/xfburn: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-02 14:54:20 +0000 (Sat, 02 Apr 2011)
New Revision: 5248

Added:
   goodies/trunk/xfburn/debian/xfburn.docs
   goodies/trunk/xfburn/debian/xfburn.manpages
Modified:
   goodies/trunk/xfburn/
   goodies/trunk/xfburn/debian/changelog
   goodies/trunk/xfburn/debian/control
   goodies/trunk/xfburn/debian/rules
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/xfburn
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfburn:4729-5247

Modified: goodies/trunk/xfburn/debian/changelog
===================================================================
--- goodies/trunk/xfburn/debian/changelog	2011-04-02 14:46:40 UTC (rev 5247)
+++ goodies/trunk/xfburn/debian/changelog	2011-04-02 14:54:20 UTC (rev 5248)
@@ -1,5 +1,28 @@
-xfburn (0.4.3-1) unstable; urgency=low
+xfburn (0.4.3-2) experimental; urgency=low
 
+  [ Lionel Le Folgoc ]
+  * debian/control:
+    - change libexo-0.3-dev b-dep to libexo-1-dev.
+    - bump Standards-Version to 3.9.1.
+    - add myself to Uploaders.
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - drop hal depends so we can get rid of it.                 closes: #615194
+    - update debhelper build-dep to 7.0.50~ for overrides
+    - drop thunar-vfs build-dep since we don't use hal anymore.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - switch to debhelper tiny rules.
+    - build with --disable-hal.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS.
+    - add -z,defs, -O1 and --as-needed to LDFLAGS.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 01:28:40 +0100
+
+xfburn (0.4.3-1+b1) unstable; urgency=low
+
   * New upstream release.
   * debian/control:
     - update standards version to 3.8.4.

Modified: goodies/trunk/xfburn/debian/control
===================================================================
--- goodies/trunk/xfburn/debian/control	2011-04-02 14:46:40 UTC (rev 5247)
+++ goodies/trunk/xfburn/debian/control	2011-04-02 14:54:20 UTC (rev 5248)
@@ -2,18 +2,19 @@
 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 (>= 7), cdbs, libxfcegui4-dev (>= 4.3.90.2),
- libexo-0.3-dev (>= 0.3.1.8beta2), libthunar-vfs-1-dev (>= 0.3.2beta2),
- libburn-dev, libisofs-dev, libdbus-glib-1-dev, libgstreamer0.10-dev,
- intltool, libgstreamer-plugins-base0.10-dev
-Standards-Version: 3.8.4
+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.0.50~), cdbs, libxfcegui4-dev (>= 4.6.0),
+ libexo-1-dev (>= 0.5.0), libburn-dev, libisofs-dev, libdbus-glib-1-dev,
+ libgstreamer0.10-dev, intltool, libgstreamer-plugins-base0.10-dev,
+ hardening-includes
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfburn/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfburn/
 
 Package: xfburn
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CD-burner application for Xfce Desktop Environment
  Xfburn is a tool to help burning CDs and DVDs. It fits well in the Xfce
  Desktop Environment but can be used anywhere.

Modified: goodies/trunk/xfburn/debian/rules
===================================================================
--- goodies/trunk/xfburn/debian/rules	2011-04-02 14:46:40 UTC (rev 5247)
+++ goodies/trunk/xfburn/debian/rules	2011-04-02 14:54:20 UTC (rev 5248)
@@ -1,10 +1,15 @@
 #!/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_INSTALL_MANPAGES_xfburn := debian/xfburn.1
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
 
-binary-post-install/xfburn::
-	dh_icons
+export CFLAGS LDFLAGS
+
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-hal
+
+%:
+	dh $@

Copied: goodies/trunk/xfburn/debian/xfburn.docs (from rev 5247, goodies/branches/experimental/xfburn/debian/xfburn.docs)
===================================================================
--- goodies/trunk/xfburn/debian/xfburn.docs	                        (rev 0)
+++ goodies/trunk/xfburn/debian/xfburn.docs	2011-04-02 14:54:20 UTC (rev 5248)
@@ -0,0 +1 @@
+AUTHORS NEWS README TODO

Copied: goodies/trunk/xfburn/debian/xfburn.manpages (from rev 5247, goodies/branches/experimental/xfburn/debian/xfburn.manpages)
===================================================================
--- goodies/trunk/xfburn/debian/xfburn.manpages	                        (rev 0)
+++ goodies/trunk/xfburn/debian/xfburn.manpages	2011-04-02 14:54:20 UTC (rev 5248)
@@ -0,0 +1 @@
+debian/xfburn.1