[Pkg-xfce-commits] r4862 - in desktop/branches/experimental/xfce4-terminal/debian: . source
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sun Jan 30 04:47:24 UTC 2011
Author: mrpouit-guest
Date: 2011-01-30 16:47:20 +0000 (Sun, 30 Jan 2011)
New Revision: 4862
Added:
desktop/branches/experimental/xfce4-terminal/debian/source/
desktop/branches/experimental/xfce4-terminal/debian/source/format
Modified:
desktop/branches/experimental/xfce4-terminal/debian/changelog
desktop/branches/experimental/xfce4-terminal/debian/control
desktop/branches/experimental/xfce4-terminal/debian/rules
Log:
* New upstream release.
- drop cdbs from b-deps, and bump debhelper to >= 7.0.50~.
- b-dep on hardening-includes.
* Switch to 3.0 (quilt) source format.
* debian/rules:
- switch to dh.
- add hardening CFLAGS/LDFLAGS.
Modified: desktop/branches/experimental/xfce4-terminal/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/changelog 2011-01-29 20:24:48 UTC (rev 4861)
+++ desktop/branches/experimental/xfce4-terminal/debian/changelog 2011-01-30 16:47:20 UTC (rev 4862)
@@ -1,10 +1,17 @@
-xfce4-terminal (0.4.5-2) UNRELEASED; urgency=low
+xfce4-terminal (0.4.6-1) UNRELEASED; urgency=low
+ * New upstream release.
* debian/control:
+ - drop cdbs from b-deps, and bump debhelper to >= 7.0.50~.
- change libexo-0.3-dev b-dep to libexo-1-dev.
+ - b-dep on hardening-includes.
- bump Standards-Version to 3.9.1.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - switch to dh.
+ - add hardening CFLAGS/LDFLAGS.
- -- Lionel Le Folgoc <mrpouit at gmail.com> Wed, 15 Dec 2010 21:55:30 +0100
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 30 Jan 2011 17:30:26 +0100
xfce4-terminal (0.4.5-1) unstable; urgency=low
Modified: desktop/branches/experimental/xfce4-terminal/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/control 2011-01-29 20:24:48 UTC (rev 4861)
+++ desktop/branches/experimental/xfce4-terminal/debian/control 2011-01-30 16:47:20 UTC (rev 4862)
@@ -4,10 +4,10 @@
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>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), libdbus-glib-1-dev,
+Build-Depends: debhelper (>= 7.0.50~), libdbus-glib-1-dev,
libexo-1-dev (>= 0.5.0), libvte-dev (>= 1:0.17.1), libxml-perl,
- libstartup-notification0-dev, cdbs, chrpath, intltool,
- libgtk2.0-dev (>= 2.14)
+ libstartup-notification0-dev, chrpath, intltool, libgtk2.0-dev (>= 2.14),
+ hardening-includes
Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/projects/applications/terminal
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-terminal/
Modified: desktop/branches/experimental/xfce4-terminal/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/rules 2011-01-29 20:24:48 UTC (rev 4861)
+++ desktop/branches/experimental/xfce4-terminal/debian/rules 2011-01-30 16:47:20 UTC (rev 4862)
@@ -1,20 +1,33 @@
#!/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
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-final --enable-startup-notification --program-transform-name='s/Terminal/xfce4-terminal/' --docdir=\$${prefix}/share/doc/xfce4-terminal
-
-binary-post-install/xfce4-terminal::
- install -c -m 0755 debian/xfce4-terminal.wrapper debian/xfce4-terminal/usr/bin/xfce4-terminal.wrapper
+include /usr/share/hardening-includes/hardening.make
+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
+
+override_dh_auto_install:
+ dh_auto_install --fail-missing
+
+ install -c -m 0755 $(CURDIR)/debian/xfce4-terminal.wrapper $(CURDIR)/debian/xfce4-terminal/usr/bin/xfce4-terminal.wrapper
+
#.desktop file
- mv debian/xfce4-terminal/usr/share/applications/Terminal.desktop debian/xfce4-terminal/usr/share/applications/xfce4-terminal.desktop
-
+ mv $(CURDIR)/debian/xfce4-terminal/usr/share/applications/Terminal.desktop $(CURDIR)/debian/xfce4-terminal/usr/share/applications/xfce4-terminal.desktop
+
#rename manpages
- find debian/xfce4-terminal/usr/share/man -name 'Terminal*' -exec \
+ find $(CURDIR)/debian/xfce4-terminal/usr/share/man -name 'Terminal*' -exec \
rename 's/Terminal/xfce4-terminal/' '{}' \;
- cd debian/xfce4-terminal/usr/share/man/man1/ && ln -s xfce4-terminal.1.gz xfce4-terminal.wrapper.1.gz
+ cd $(CURDIR)/debian/xfce4-terminal/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/xfce4-terminal/usr/share/pixmaps/
- #install pixmap for debian menu
- install -m 0644 debian/terminal.xpm debian/xfce4-terminal/usr/share/pixmaps/
+%:
+ dh $@
Added: desktop/branches/experimental/xfce4-terminal/debian/source/format
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/source/format (rev 0)
+++ desktop/branches/experimental/xfce4-terminal/debian/source/format 2011-01-30 16:47:20 UTC (rev 4862)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-xfce-commits
mailing list