[Pkg-xfce-commits] r7461 - in desktop/trunk/xfce4-terminal: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-21 22:13:41 +0000 (Tue, 21 May 2013)
New Revision: 7461

Modified:
   desktop/trunk/xfce4-terminal/
   desktop/trunk/xfce4-terminal/debian/changelog
   desktop/trunk/xfce4-terminal/debian/compat
   desktop/trunk/xfce4-terminal/debian/control
   desktop/trunk/xfce4-terminal/debian/menu
   desktop/trunk/xfce4-terminal/debian/rules
   desktop/trunk/xfce4-terminal/debian/watch
Log:
merge changes from experimental



Property changes on: desktop/trunk/xfce4-terminal
___________________________________________________________________
Added: svn:mergeinfo
   + /desktop/branches/experimental/xfce4-terminal:7242-7429

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2013-05-21 22:13:09 UTC (rev 7460)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2013-05-21 22:13:41 UTC (rev 7461)
@@ -1,5 +1,28 @@
-xfce4-terminal (0.4.8-1) unstable; urgency=low
+xfce4-terminal (0.6.1-1) experimental; urgency=low
 
+  * New upstream release.                                       closes: #697746
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 01 Jan 2013 15:04:31 +0100
+
+xfce4-terminal (0.6.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/watch updated for new naming.
+  * debian/rules:
+    - remove the renaming, done upstream now.
+    - use dh --parallel.
+    - use debhelper 9 hardening support.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - add build-dep on libxfce4ui-dev.
+    - update debhelper build-dep to 9.
+    - update standards version to 3.9.3.
+  * debian/menu updated for new naming.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 30 Dec 2012 20:54:13 +0100
+
+xfce4-terminal (0.4.8-1+b1) unstable; urgency=low
+
   * New upstream bugfix release.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 22 Jun 2011 00:03:08 +0200

Modified: desktop/trunk/xfce4-terminal/debian/compat
===================================================================
--- desktop/trunk/xfce4-terminal/debian/compat	2013-05-21 22:13:09 UTC (rev 7460)
+++ desktop/trunk/xfce4-terminal/debian/compat	2013-05-21 22:13:41 UTC (rev 7461)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfce4-terminal/debian/control
===================================================================
--- desktop/trunk/xfce4-terminal/debian/control	2013-05-21 22:13:09 UTC (rev 7460)
+++ desktop/trunk/xfce4-terminal/debian/control	2013-05-21 22:13:41 UTC (rev 7461)
@@ -4,11 +4,11 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libdbus-glib-1-dev, 
- libexo-1-dev (>= 0.5.0), libvte-dev (>= 1:0.17.1), libxml-perl,
+Build-Depends: debhelper (>= 9), libdbus-glib-1-dev, 
+ libexo-1-dev (>= 0.10.0), libvte-dev (>= 1:0.28), libxml-perl,
  libstartup-notification0-dev, chrpath, intltool, libgtk2.0-dev (>= 2.14),
- hardening-includes
-Standards-Version: 3.9.2
+ hardening-includes, libxfce4ui-1-dev (>= 4.10)
+Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/projects/applications/terminal
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-terminal/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-terminal/

Modified: desktop/trunk/xfce4-terminal/debian/menu
===================================================================
--- desktop/trunk/xfce4-terminal/debian/menu	2013-05-21 22:13:09 UTC (rev 7460)
+++ desktop/trunk/xfce4-terminal/debian/menu	2013-05-21 22:13:41 UTC (rev 7461)
@@ -3,4 +3,4 @@
   command="/usr/bin/xfce4-terminal"\
   title="Xfce Terminal"\
   longtitle="Xfce Terminal Emulator"\
-  icon="/usr/share/pixmaps/terminal.xpm"
+  icon="/usr/share/pixmaps/xfce4-terminal.xpm"

Modified: desktop/trunk/xfce4-terminal/debian/rules
===================================================================
--- desktop/trunk/xfce4-terminal/debian/rules	2013-05-21 22:13:09 UTC (rev 7460)
+++ desktop/trunk/xfce4-terminal/debian/rules	2013-05-21 22:13:41 UTC (rev 7461)
@@ -1,36 +1,25 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-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_auto_configure:
-	dh_auto_configure -- --enable-dbus --program-transform-name='s/Terminal/xfce4-terminal/' --docdir=\$${prefix}/share/doc/xfce4-terminal
+	dh_auto_configure -- --enable-dbus 
 
-override_dh_auto_install:
-	dh_auto_install --fail-missing
+override_dh_install:
+	dh_install --fail-missing
 	
+override_dh_auto_install:
+	dh_auto_install
+
 	install -c -m 0755 $(CURDIR)/debian/xfce4-terminal.wrapper $(CURDIR)/debian/tmp/usr/bin/xfce4-terminal.wrapper
 	
-	#.desktop file
-	mv $(CURDIR)/debian/tmp/usr/share/applications/Terminal.desktop $(CURDIR)/debian/tmp/usr/share/applications/xfce4-terminal.desktop
-	
-	#rename manpages
-	find $(CURDIR)/debian/tmp/usr/share/man -name 'Terminal*' -exec \
-		rename 's/Terminal/xfce4-terminal/' '{}' \;
-	cd $(CURDIR)/debian/tmp/usr/share/man/man1/ && ln -s xfce4-terminal.1.gz xfce4-terminal.wrapper.1.gz
-	
 	#install pixmap for debian menu
-	install -m 0644 $(CURDIR)/debian/terminal.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
+	install -m 0644 -D $(CURDIR)/debian/terminal.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/xfce4-terminal.xpm
 
 override_dh_strip:
 	dh_strip --dbg-package=xfce4-terminal-dbg
 
 %:
-	dh $@
+	dh $@ --parallel

Modified: desktop/trunk/xfce4-terminal/debian/watch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/watch	2013-05-21 22:13:09 UTC (rev 7460)
+++ desktop/trunk/xfce4-terminal/debian/watch	2013-05-21 22:13:41 UTC (rev 7461)
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/apps/terminal/([\d\.]+)/ \
-	Terminal-([\d\.]+)\.tar\.(?:gz|bz2)
+http://archive.xfce.org/src/apps/xfce4-terminal/([\d\.]+)/ \
+	xfce4-terminal-([\d\.]+)\.tar\.(?:gz|bz2)