[Pkg-xfce-commits] r7029 - in desktop/trunk/xfce4-dev-tools: . debian debian/patches

Yves-Alexis Perez corsac at alioth.debian.org
Mon May 21 05:17:01 UTC 2012 

Author: corsac
Date: 2012-05-21 05:17:00 +0000 (Mon, 21 May 2012)
New Revision: 7029

Added:
   desktop/trunk/xfce4-dev-tools/debian/xdt-csource.1
Removed:
   desktop/trunk/xfce4-dev-tools/debian/patches/series
Modified:
   desktop/trunk/xfce4-dev-tools/
   desktop/trunk/xfce4-dev-tools/debian/changelog
   desktop/trunk/xfce4-dev-tools/debian/compat
   desktop/trunk/xfce4-dev-tools/debian/control
   desktop/trunk/xfce4-dev-tools/debian/rules
   desktop/trunk/xfce4-dev-tools/debian/xfce4-dev-tools.manpages
Log:
merge xdt from experimental



Property changes on: desktop/trunk/xfce4-dev-tools
___________________________________________________________________
Added: svn:mergeinfo
   + /desktop/branches/experimental/xfce4-dev-tools:6128-7025

Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog	2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog	2012-05-21 05:17:00 UTC (rev 7029)
@@ -1,9 +1,46 @@
-xfce4-dev-tools (4.8.0-3) UNRELEASED; urgency=low
+xfce4-dev-tools (4.10.0-1) experimental; urgency=low
 
-  * debian/patches: add missing DEP3 headers.
+  * New upstream stable release.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 20 Feb 2012 21:40:26 +0100
+ -- 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:

Modified: desktop/trunk/xfce4-dev-tools/debian/compat
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/compat	2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/trunk/xfce4-dev-tools/debian/compat	2012-05-21 05:17:00 UTC (rev 7029)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfce4-dev-tools/debian/control
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/control	2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/trunk/xfce4-dev-tools/debian/control	2012-05-21 05:17:00 UTC (rev 7029)
@@ -4,15 +4,16 @@
 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
+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: all
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: autoconf, automake, intltool, libtool
 Description: Script to help building Xfce from git

Deleted: desktop/trunk/xfce4-dev-tools/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/series	2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/series	2012-05-21 05:17:00 UTC (rev 7029)
@@ -1 +0,0 @@
-0001-Use-pkg-config-macro-for-detection-bug-7787.patch

Modified: desktop/trunk/xfce4-dev-tools/debian/rules
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/rules	2012-05-21 05:13:41 UTC (rev 7028)
+++ desktop/trunk/xfce4-dev-tools/debian/rules	2012-05-21 05:17:00 UTC (rev 7029)
@@ -1,13 +1,7 @@
 #!/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 DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
-
 %:
-	dh $@
+	dh $@ --parallel

Copied: desktop/trunk/xfce4-dev-tools/debian/xdt-csource.1 (from rev 7025, desktop/branches/experimental/xfce4-dev-tools/debian/xdt-csource.1)
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/xdt-csource.1	                        (rev 0)
+++ desktop/trunk/xfce4-dev-tools/debian/xdt-csource.1	2012-05-21 05:17:00 UTC (rev 7029)
@@ -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>.

Modified: desktop/trunk/xfce4-dev-tools/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/trunk/xfce4-dev-tools/debian/xfce4-dev-tools.manpages	2012-05-21 05:17:00 UTC (rev 7029)
@@ -1 +1,2 @@
 debian/xdt-autogen.1
+debian/xdt-csource.1

More information about the Pkg-xfce-commits mailing list