[Pkg-xfce-commits] r7036 - in desktop/tags/xfce4-dev-tools: . 4.10.0-2 4.10.0-2/debian 4.10.0-2/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon May 21 07:41:15 UTC 2012
Author: corsac
Date: 2012-05-21 19:41:15 +0000 (Mon, 21 May 2012)
New Revision: 7036
Added:
desktop/tags/xfce4-dev-tools/4.10.0-2/
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/changelog
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/compat
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/control
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/rules
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xdt-csource.1
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.lintian-overrides
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.manpages
Removed:
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/changelog
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/compat
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/control
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/patches/series
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/rules
desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.manpages
Log:
[svn-buildpackage] Tagging xfce4-dev-tools 4.10.0-2
Property changes on: desktop/tags/xfce4-dev-tools/4.10.0-2
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/xfce4-dev-tools:6128-7025
Deleted: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog 2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/changelog 2012-05-21 19:41:15 UTC (rev 7036)
@@ -1,197 +0,0 @@
-xfce4-dev-tools (4.8.0-3) UNRELEASED; urgency=low
-
- * debian/patches: add missing DEP3 headers.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 20 Feb 2012 21:40:26 +0100
-
-xfce4-dev-tools (4.8.0-2) unstable; urgency=low
-
- * debian/patches:
- - 0001-Use-pkg-config-macro-for-detection-bug-7787 cherry picked from
- upstream, fix Makefile generation for multi-arch. closes: #632502
-
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 05 Sep 2011 21:29:33 +0200
-
-xfce4-dev-tools (4.8.0-1) unstable; urgency=low
-
- [ Lionel Le Folgoc ]
- * New upstream release.
- * debian/patches/01_support-automake1.11.patch: dropped, included upstream.
- * debian/control: add myself to Uploaders.
-
- [ Yves-Alexis Perez ]
- * Switch to 3.0 (quilt) source format.
- * debian/control:
- - update standards version to 3.9.2.
- - add build-dep on hardening-includes.
- - remove Simon and Emanuele from uploaders, thanks to them.
- * debian/rules:
- - switch to dh7 tiny rules.
- - pick {C,LD}FLAGS from dpkg-buildflags.
- - add hardening flags to {C,LD}FLAGS.
- - add -z,defs, -O1, --as-needed to LDFLAGS
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 17:19:25 +0200
-
-xfce4-dev-tools (4.7.2-3) unstable; urgency=low
-
- * debian/control:
- - update short description too.
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 24 Feb 2010 07:54:44 +0100
-
-xfce4-dev-tools (4.7.2-2) unstable; urgency=low
-
- * debian/patches:
- - 01_support-automake1.11 added, add support for automake 1.11, thanks
- Cyril Brulebois for the patch. closes: #571158
- * debian/control:
- - update long description, Xfce now uses git.
- - update standards version to 3.8.4.
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 24 Feb 2010 00:12:22 +0100
-
-xfce4-dev-tools (4.7.2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Sep 2009 21:58:40 +0200
-
-xfce4-dev-tools (4.7.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Sep 2009 11:25:30 +0200
-
-xfce4-dev-tools (4.7.0-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control:
- - update standards version to 3.8.3.
- * debian/watch updated to match upstream archive reorganisation.
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 19 Aug 2009 07:50:12 +0200
-
-xfce4-dev-tools (4.6.0-2) unstable; urgency=low
-
- * Upload to unstable.
- * debian/control:
- - move to xfce section.
- - update standards version to 3.8.1.
- - update debhelper build-dep to 7.
- * debian/compat bumped to 7.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 02:08:09 +0200
-
-xfce4-dev-tools (4.6.0-1) experimental; urgency=low
-
- [ Xfce 4.6 Alpha “Pinkie”]
- * new upstream alpha release.
-
- [ Xfce 4.6 Beta 1 “Fuzzy”]
- * new upstream beta release.
-
- [ Xfce 4.6 Beta 2 “Hopper”]
- * new upstream beta release.
- * debian/patches:
- - 01-fix-bashism-in-xdt-commit dropped, fixed upstream.
-
- [ Xfce 4.6 Beta 3 “Tuco-Tuco”]
- * new upstream beta release.
-
- [ Xfce 4.6 RC1 “Capybara” ]
- * new upstream release candidate.
-
- [ Xfce 4.6 ]
- * new upstream release.
- * debian/copyright:
- - update dates.
- - update licensing informations.
-
- [ Michael Casadevall ]
- * debian/watch:
- - Added to help track upstream and download tarballs
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 15:23:28 +0100
-
-xfce4-dev-tools (4.4.0.1-6) unstable; urgency=low
-
- * debian/patches:
- - refresh 01-fix-bashism-in-xdt-commit to catch one more bashism.
- * debian/control:
- - remove Rudy Godoy and Martin Loschwitz from Uploaders.
- - update standards version to 3.8.0.
- - add Homepage.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 05 Jul 2008 14:43:03 +0200
-
-xfce4-dev-tools (4.4.0.1-5) unstable; urgency=low
-
- * debian/control: add Recommends on autoconf, automake, intltool, libtool.
- Those tools are useful with xdt-autogen. closes: #466554
- * debian/copyright: use © sign and update url.
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 21 Feb 2008 07:56:08 +0100
-
-xfce4-dev-tools (4.4.0.1-4) unstable; urgency=low
-
- * Fix /dev/nulli -> /dev/null in the patch to fix bashisms.
-
- -- Simon Huggins <huggie at earth.li> Tue, 12 Feb 2008 08:56:49 +0000
-
-xfce4-dev-tools (4.4.0.1-3) unstable; urgency=low
-
- * debian/patches: 01-fix-bashism-in-xdt-commit renamed and completed to
- really fix bashisms. closes: #465380
- * debian/control:
- - update standards version to 3.7.3.
- - update my email address.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Feb 2008 08:09:12 +0100
-
-xfce4-dev-tools (4.4.0.1-2) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * debian/control: make package arch:all.
-
- [ Simon Huggins ]
- * Fix bashism in xdt-commit
-
- -- Simon Huggins <huggie at earth.li> Wed, 30 Jan 2008 12:06:30 +0000
-
-xfce4-dev-tools (4.4.0.1-1) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * New upstream release.
-
- [ Simon Huggins ]
- * Add Vcs-* headers to debian/control
-
- -- Simon Huggins <huggie at earth.li> Tue, 27 Nov 2007 16:39:18 +0000
-
-xfce4-dev-tools (4.4.0-1) unstable; urgency=low
-
- * New upstream release.
- * debian/copyright: update copyright holder.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 15 Apr 2007 15:28:17 +0100
-
-xfce4-dev-tools (4.3.99.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Sep 2006 15:40:16 +0100
-
-xfce4-dev-tools (4.3.90.2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 27 Aug 2006 16:22:12 +0100
-
-xfce4-dev-tools (4.3.90.1svn-r21976-1) unstable; urgency=low
-
- * Initial release closes: #363467
- * Written manpage for xdt-autogen
-
- -- Emanuele Rocca <ema at debian.org> Sun, 04 Jun 2006 14:39:00 +0200
-
Copied: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/changelog (from rev 7035, desktop/trunk/xfce4-dev-tools/debian/changelog)
===================================================================
--- desktop/tags/xfce4-dev-tools/4.10.0-2/debian/changelog (rev 0)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/changelog 2012-05-21 19:41:15 UTC (rev 7036)
@@ -0,0 +1,242 @@
+xfce4-dev-tools (4.10.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/xfce4-dev-tools.lintian-overrides added, override warning for
+ hardening flags (which we do build with).
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 21 May 2012 21:01:05 +0200
+
+xfce4-dev-tools (4.10.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Thu, 03 May 2012 23:05:29 +0200
+
+xfce4-dev-tools (4.9.2-1) experimental; urgency=low
+
+ * New upstream development release.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 15 Apr 2012 16:22:57 +0200
+
+xfce4-dev-tools (4.9.1-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream development release.
+
+ [ Yves-Alexis Perez ]
+ * debian/rules:
+ - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+ - build with --parallel.
+ * debian/compat bumped to 9.
+ * debian/control:
+ - update debhelper build-dep to 9.
+ - add build-dep on dpkg-dev 1.16.1.
+ - drop hardening-includes build-dep.
+ - update standards version to 3.9.3.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 08 Apr 2012 22:29:30 +0200
+
+xfce4-dev-tools (4.9.0-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch:
+ dropped, included upstream.
+ * debian/control:
+ - b-dep on libglib2.0-dev for the new xdt-source program.
+ - make the package arch: any (xdt-source is a binary).
+ * debian/xdt-csource.1, debian/xfce4-dev-tools.manpages: add a manpage for
+ xdt-csource.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Fri, 18 Nov 2011 17:05:49 +0100
+
+xfce4-dev-tools (4.8.0-2) unstable; urgency=low
+
+ * debian/patches:
+ - 0001-Use-pkg-config-macro-for-detection-bug-7787 cherry picked from
+ upstream, fix Makefile generation for multi-arch. closes: #632502
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 05 Sep 2011 21:29:33 +0200
+
+xfce4-dev-tools (4.8.0-1) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream release.
+ * debian/patches/01_support-automake1.11.patch: dropped, included upstream.
+ * debian/control: add myself to Uploaders.
+
+ [ Yves-Alexis Perez ]
+ * Switch to 3.0 (quilt) source format.
+ * debian/control:
+ - update standards version to 3.9.2.
+ - add build-dep on hardening-includes.
+ - remove Simon and Emanuele from uploaders, thanks to them.
+ * debian/rules:
+ - switch to dh7 tiny rules.
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add hardening flags to {C,LD}FLAGS.
+ - add -z,defs, -O1, --as-needed to LDFLAGS
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 17:19:25 +0200
+
+xfce4-dev-tools (4.7.2-3) unstable; urgency=low
+
+ * debian/control:
+ - update short description too.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 24 Feb 2010 07:54:44 +0100
+
+xfce4-dev-tools (4.7.2-2) unstable; urgency=low
+
+ * debian/patches:
+ - 01_support-automake1.11 added, add support for automake 1.11, thanks
+ Cyril Brulebois for the patch. closes: #571158
+ * debian/control:
+ - update long description, Xfce now uses git.
+ - update standards version to 3.8.4.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 24 Feb 2010 00:12:22 +0100
+
+xfce4-dev-tools (4.7.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Sep 2009 21:58:40 +0200
+
+xfce4-dev-tools (4.7.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Sep 2009 11:25:30 +0200
+
+xfce4-dev-tools (4.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - update standards version to 3.8.3.
+ * debian/watch updated to match upstream archive reorganisation.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 19 Aug 2009 07:50:12 +0200
+
+xfce4-dev-tools (4.6.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control:
+ - move to xfce section.
+ - update standards version to 3.8.1.
+ - update debhelper build-dep to 7.
+ * debian/compat bumped to 7.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 02:08:09 +0200
+
+xfce4-dev-tools (4.6.0-1) experimental; urgency=low
+
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/patches:
+ - 01-fix-bashism-in-xdt-commit dropped, fixed upstream.
+
+ [ Xfce 4.6 Beta 3 “Tuco-Tuco”]
+ * new upstream beta release.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/copyright:
+ - update dates.
+ - update licensing informations.
+
+ [ Michael Casadevall ]
+ * debian/watch:
+ - Added to help track upstream and download tarballs
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 15:23:28 +0100
+
+xfce4-dev-tools (4.4.0.1-6) unstable; urgency=low
+
+ * debian/patches:
+ - refresh 01-fix-bashism-in-xdt-commit to catch one more bashism.
+ * debian/control:
+ - remove Rudy Godoy and Martin Loschwitz from Uploaders.
+ - update standards version to 3.8.0.
+ - add Homepage.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 05 Jul 2008 14:43:03 +0200
+
+xfce4-dev-tools (4.4.0.1-5) unstable; urgency=low
+
+ * debian/control: add Recommends on autoconf, automake, intltool, libtool.
+ Those tools are useful with xdt-autogen. closes: #466554
+ * debian/copyright: use © sign and update url.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 21 Feb 2008 07:56:08 +0100
+
+xfce4-dev-tools (4.4.0.1-4) unstable; urgency=low
+
+ * Fix /dev/nulli -> /dev/null in the patch to fix bashisms.
+
+ -- Simon Huggins <huggie at earth.li> Tue, 12 Feb 2008 08:56:49 +0000
+
+xfce4-dev-tools (4.4.0.1-3) unstable; urgency=low
+
+ * debian/patches: 01-fix-bashism-in-xdt-commit renamed and completed to
+ really fix bashisms. closes: #465380
+ * debian/control:
+ - update standards version to 3.7.3.
+ - update my email address.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Feb 2008 08:09:12 +0100
+
+xfce4-dev-tools (4.4.0.1-2) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/control: make package arch:all.
+
+ [ Simon Huggins ]
+ * Fix bashism in xdt-commit
+
+ -- Simon Huggins <huggie at earth.li> Wed, 30 Jan 2008 12:06:30 +0000
+
+xfce4-dev-tools (4.4.0.1-1) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+
+ [ Simon Huggins ]
+ * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie at earth.li> Tue, 27 Nov 2007 16:39:18 +0000
+
+xfce4-dev-tools (4.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/copyright: update copyright holder.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-dev-tools (4.3.99.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Sep 2006 15:40:16 +0100
+
+xfce4-dev-tools (4.3.90.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 27 Aug 2006 16:22:12 +0100
+
+xfce4-dev-tools (4.3.90.1svn-r21976-1) unstable; urgency=low
+
+ * Initial release closes: #363467
+ * Written manpage for xdt-autogen
+
+ -- Emanuele Rocca <ema at debian.org> Sun, 04 Jun 2006 14:39:00 +0200
+
Deleted: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/compat
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/compat 2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/compat 2012-05-21 19:41:15 UTC (rev 7036)
@@ -1 +0,0 @@
-7
Copied: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/compat (from rev 7029, desktop/trunk/xfce4-dev-tools/debian/compat)
===================================================================
--- desktop/tags/xfce4-dev-tools/4.10.0-2/debian/compat (rev 0)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/compat 2012-05-21 19:41:15 UTC (rev 7036)
@@ -0,0 +1 @@
+9
Deleted: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/control
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/control 2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/control 2012-05-21 19:41:15 UTC (rev 7036)
@@ -1,20 +0,0 @@
-Source: xfce4-dev-tools
-Section: xfce
-Priority: optional
-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), autotools-dev, hardening-includes
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-dev-tools/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-dev-tools/
-Homepage: http://foo-projects.org/~benny/projects/xfce4-dev-tools/
-
-Package: xfce4-dev-tools
-Section: xfce
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: autoconf, automake, intltool, libtool
-Description: Script to help building Xfce from git
- xfce4-dev-tools provide an easy way to handle the setup and maintenance of a
- projects build framework. It's required to build Xfce applications from git.
Copied: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/control (from rev 7029, desktop/trunk/xfce4-dev-tools/debian/control)
===================================================================
--- desktop/tags/xfce4-dev-tools/4.10.0-2/debian/control (rev 0)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/control 2012-05-21 19:41:15 UTC (rev 7036)
@@ -0,0 +1,21 @@
+Source: xfce4-dev-tools
+Section: xfce
+Priority: optional
+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 (>= 9), autotools-dev, libglib2.0-dev,
+ dpkg-dev (>= 1.16.1.)
+Standards-Version: 3.9.3
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-dev-tools/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-dev-tools/
+Homepage: http://foo-projects.org/~benny/projects/xfce4-dev-tools/
+
+Package: xfce4-dev-tools
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: autoconf, automake, intltool, libtool
+Description: Script to help building Xfce from git
+ xfce4-dev-tools provide an easy way to handle the setup and maintenance of a
+ projects build framework. It's required to build Xfce applications from git.
Deleted: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch 2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch 2012-05-21 19:41:15 UTC (rev 7036)
@@ -1,77 +0,0 @@
-From f2eb2c2e9ca7d042eb35fa56f392df4dbaf9924c Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Sun, 3 Jul 2011 19:42:38 +0200
-Subject: [PATCH] Use pkg-config macro for detection (bug #7787).
-
-Use the macro shipped with pkg-config for detection of
-$PKG_CONFIG. This to fix cross-build compatibility.
-
-Origin: upstream, http://git.xfce.org/xfce/xfce4-dev-tools/commit/?id=f2eb2c2e9ca7d042eb35fa56f392df4dbaf9924c
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7787
----
- m4macros/xdt-depends.m4 | 40 +++++++++++++++++-----------------------
- 1 files changed, 17 insertions(+), 23 deletions(-)
-
-diff --git a/m4macros/xdt-depends.m4 b/m4macros/xdt-depends.m4
-index ccf5a44..e5f6b8c 100644
---- a/m4macros/xdt-depends.m4
-+++ b/m4macros/xdt-depends.m4
-@@ -43,11 +43,23 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
- # minimum supported version of pkg-config
- xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
-
-- # lookup pkg-config utility
-- if test x"$PKG_CONFIG" = x""; then
-- AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
--
-- if test x"$PKG_CONFIG" = x"no"; then
-+ m4_ifdef([PKG_PROG_PKG_CONFIG],
-+ [
-+ PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION])
-+
-+ if test x"$PKG_CONFIG" = x""; then
-+ echo
-+ echo "*** Your version of pkg-config is too old. You need atleast"
-+ echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
-+ echo "*** from the freedesktop.org software repository at"
-+ echo "***"
-+ echo "*** http://www.freedesktop.org/software/pkgconfig"
-+ echo "***"
-+ exit 1;
-+ fi
-+ ],
-+ [
-+ echo
- echo "*** The pkg-config utility could not be found on your system."
- echo "*** Make sure it is in your path, or set the PKG_CONFIG"
- echo "*** environment variable to the full path to pkg-config."
-@@ -57,25 +69,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
- echo "*** http://www.freedesktop.org/software/pkgconfig"
- echo "***"
- exit 1
-- fi
--
-- # check pkg-config version
-- AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION])
-- if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
-- xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-- AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
-- else
-- xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-- AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
-- echo "*** Your version of pkg-config is too old. You need atleast"
-- echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
-- echo "*** from the freedesktop.org software repository at"
-- echo "***"
-- echo "*** http://www.freedesktop.org/software/pkgconfig"
-- echo "***"
-- exit 1
-- fi
-- fi
-+ ])
- ])
-
-
---
-1.7.5.4
-
Deleted: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/series 2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/patches/series 2012-05-21 19:41:15 UTC (rev 7036)
@@ -1 +0,0 @@
-0001-Use-pkg-config-macro-for-detection-bug-7787.patch
Deleted: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/rules
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/rules 2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/rules 2012-05-21 19:41:15 UTC (rev 7036)
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-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
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
-
-%:
- dh $@
Copied: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/rules (from rev 7029, desktop/trunk/xfce4-dev-tools/debian/rules)
===================================================================
--- desktop/tags/xfce4-dev-tools/4.10.0-2/debian/rules (rev 0)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/rules 2012-05-21 19:41:15 UTC (rev 7036)
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+%:
+ dh $@ --parallel
Copied: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xdt-csource.1 (from rev 7029, desktop/trunk/xfce4-dev-tools/debian/xdt-csource.1)
===================================================================
--- desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xdt-csource.1 (rev 0)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xdt-csource.1 2012-05-21 19:41:15 UTC (rev 7036)
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
+.TH XDT-CSOURCE "1" "October 2011" "xdt-csource 4.9.0" "User Commands"
+.SH NAME
+xdt-csource \- C code generation utility for arbitrary data
+.SH SYNOPSIS
+.PP
+.B xdt-csource
+[\fIoptions\fR] [\fIfile\fR]
+.PP
+.B xdt-csource
+[\fIoptions\fR] \fB\-\-build\-list\fR [[\fIname file\fR]...]
+.SH DESCRIPTION
+.PP
+\fBxdt\-csource\fR
+is a small utility that generates C code containing arbitrary data, useful for compiling texts or other data directly into programs\&.
+.SH INVOCATION
+.PP
+\fBxdt\-csource\fR
+either takes as input one file name to generate code for, or, using the
+\fB\-\-build\-list\fR
+option, a list of (\fIname\fR,
+\fIfile\fR) pairs to generate code for a list of images into named variables\&.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print this help message and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-\-extern\fR
+Generate extern symbols
+.TP
+\fB\-\-static\fR
+Generate static symbols
+.TP
+\fB\-\-name\fR=\fIidentifier\fR
+C macro/variable name
+.TP
+\fB\-\-build\-list\fR
+Parse (name, file) pairs
+.TP
+\fB\-\-strip\-comments\fR
+Remove comments from XML files
+.TP
+\fB\-\-strip\-content\fR
+Remove node contents from XML files
+.SH COPYRIGHT
+Copyright \(co 2005\-2011
+.IP
+The Xfce development team. All rights reserved.
+.PP
+Please report bugs to <http://bugzilla.xfce.org/enter_bug.cgi?product=Xfce4\-dev\-tools>.
Copied: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.lintian-overrides (from rev 7032, desktop/trunk/xfce4-dev-tools/debian/xfce4-dev-tools.lintian-overrides)
===================================================================
--- desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.lintian-overrides (rev 0)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.lintian-overrides 2012-05-21 19:41:15 UTC (rev 7036)
@@ -0,0 +1,2 @@
+# we do build with hardening flags
+xfce4-dev-tools: hardening-no-stackprotector usr/bin/xdt-csource
Deleted: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.manpages
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/xfce4-dev-tools.manpages 2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.manpages 2012-05-21 19:41:15 UTC (rev 7036)
@@ -1 +0,0 @@
-debian/xdt-autogen.1
Copied: desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.manpages (from rev 7029, desktop/trunk/xfce4-dev-tools/debian/xfce4-dev-tools.manpages)
===================================================================
--- desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.manpages (rev 0)
+++ desktop/tags/xfce4-dev-tools/4.10.0-2/debian/xfce4-dev-tools.manpages 2012-05-21 19:41:15 UTC (rev 7036)
@@ -0,0 +1,2 @@
+debian/xdt-autogen.1
+debian/xdt-csource.1
More information about the Pkg-xfce-commits
mailing list