[Pkg-xfce-commits] r7389 - in desktop/trunk/gtk2-engines-xfce: . debian

Yves-Alexis Perez corsac at alioth.debian.org
Tue May 21 06:40:58 UTC 2013


Author: corsac
Date: 2013-05-21 18:40:58 +0000 (Tue, 21 May 2013)
New Revision: 7389

Added:
   desktop/trunk/gtk2-engines-xfce/debian/gtk2-engines-xfce.install
   desktop/trunk/gtk2-engines-xfce/debian/gtk3-engines-xfce.install
   desktop/trunk/gtk2-engines-xfce/debian/patches/
Modified:
   desktop/trunk/gtk2-engines-xfce/
   desktop/trunk/gtk2-engines-xfce/debian/changelog
   desktop/trunk/gtk2-engines-xfce/debian/compat
   desktop/trunk/gtk2-engines-xfce/debian/control
   desktop/trunk/gtk2-engines-xfce/debian/copyright
   desktop/trunk/gtk2-engines-xfce/debian/rules
Log:
merge changes from experimental



Property changes on: desktop/trunk/gtk2-engines-xfce
___________________________________________________________________
Added: svn:mergeinfo
   + /desktop/branches/experimental/gtk2-engines-xfce:6006-7388

Modified: desktop/trunk/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/changelog	2013-05-17 21:12:21 UTC (rev 7388)
+++ desktop/trunk/gtk2-engines-xfce/debian/changelog	2013-05-21 18:40:58 UTC (rev 7389)
@@ -1,3 +1,68 @@
+gtk2-engines-xfce (3.0.1-1) experimental; urgency=low
+
+  * New upstream stable release:
+    - fix graduent pattern leak at each draw.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 31 Dec 2012 09:28:10 +0100
+
+gtk2-engines-xfce (3.0.0-1) experimental; urgency=low
+
+  * New upstream stable release.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Fri, 04 May 2012 07:56:22 +0200
+
+gtk2-engines-xfce (2.99.3-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream development release.
+  * debian/patches:
+    - 01_link-against-libm dropped, included upstream.
+
+  [ Lionel Le Folgoc ]
+  * debian/control: drop build-deps on xfce4-dev-tools, autoconf, automake
+    and libtool, not used anymore.
+  * debian/rules: no need to run xdt-autogen, libm patch has been upstreamed.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 15 Apr 2012 15:25:11 +0200
+
+gtk2-engines-xfce (2.99.2-1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream development release, introducing gtk+3.0 support.
+  * Add a new gtk3-engines-xfce binary package for the new ported themes.
+  * debian/rules:
+    - run xdt-autogen since we patch configure.in/Makefile.am files
+    - updated the path to clean up .la files.
+    - pass --fail-missing to dh_install.
+  * debian/patches:
+    - 01_link-against-libm.patch: added, fix missing -lm for the gtk2 engine.
+  * debian/control: add b-dep on libgtk-3-dev (>= 3.0.0), xfce4-dev-tools,
+    autoconf, automake and libtool.
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - build with --parallel.
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+  * 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. 
+  * debian/*.install:
+    - use multiarch paths.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 08 Apr 2012 22:37:25 +0200
+
+gtk2-engines-xfce (2.9.0-1) experimental; urgency=low
+
+  * New upstream unstable release.
+  * debian/copyright updated.
+  * debian/copyright:
+    - build-dep refreshed for new upstream release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 18 Nov 2011 16:58:57 +0100
+
 gtk2-engines-xfce (2.8.1-3) unstable; urgency=low
 
   * debian/control:

Modified: desktop/trunk/gtk2-engines-xfce/debian/compat
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/compat	2013-05-17 21:12:21 UTC (rev 7388)
+++ desktop/trunk/gtk2-engines-xfce/debian/compat	2013-05-21 18:40:58 UTC (rev 7389)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/control	2013-05-17 21:12:21 UTC (rev 7388)
+++ desktop/trunk/gtk2-engines-xfce/debian/control	2013-05-21 18:40:58 UTC (rev 7389)
@@ -3,9 +3,10 @@
 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.0.50~), libgtk2.0-dev (>= 2.10.1), 
- libx11-dev (>> 2:1.0.0-6), chrpath, hardening-includes
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.24.0),
+ libgtk2.0-dev (>= 2.20.0), libgtk-3-dev (>= 3.0.0), libx11-dev (>> 2:1.0.0-6),
+ dpkg-dev (>= 1.16.1)
+Standards-Version: 3.9.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
@@ -19,3 +20,12 @@
  This package contains a theme engine allowing users to apply various GTK2.0
  themes to Xfce. It also contains some ready themes, but users are of course
  free to use other themes or design their own.
+
+Package: gtk3-engines-xfce
+Section: xfce
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: GTK+-3.0 theme engine for Xfce
+ This package contains a theme engine allowing users to apply various GTK3.0
+ themes to Xfce. It also contains some ready themes, but users are of course
+ free to use other themes or design their own.

Modified: desktop/trunk/gtk2-engines-xfce/debian/copyright
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/copyright	2013-05-17 21:12:21 UTC (rev 7388)
+++ desktop/trunk/gtk2-engines-xfce/debian/copyright	2013-05-21 18:40:58 UTC (rev 7389)
@@ -1,42 +1,61 @@
-This package was debianized by Martin Loschwitz <madkiss at madkiss.org> on
-Sat, 09 Nov 2002 10:41:34 +0100.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: gtk2-engines-xfce
+Upstream-Contact: Peter de Ridder
 
-You can fetch this package from from http://www.xfce.org/
+Files: ./src/xfce_rc_style.c
+ ./src/xfce_rc_style.h
+ ./src/xfce_style.h
+ ./src/xfce_theme_main.c
+Copyright: 1999-2004, Olivier Fourdan (fourdan at xfce.org)
+License: GPL-2+
 
-Upstream Author is Olivier Fourdan <fourdan at xfce.org>, various code
-portions were taken out of the following projects:
+Files: ./src/cairo-support.c
+ ./src/cairo-support.h
+Copyright: 2006, Andrew Johnson <acjgenius at earthlink.net>
+ 2006, Thomas Wood <thos at gnome.org>
+ 2006-2007, Benjamin Berg <benjamin at sipsolutions.net>
+ 2007, Andrea Cimitan <andrea.cimitan at gmail.com>
+ 2011, Peter de Ridder <peter at xfce.org>
+License: GPL-2+
 
-   Work based on Thinice port by Tim Gerla <timg at rrv.net>,
-   Tomas Ögren <stric at ing.umu.se> and Richard Hult.
-   Portions based on Raleigh theme by Owen Taylor
-   Portions based on Notif theme
-   Portions based on Notif2 theme
-   Portions based on original GTK theme
-   Portions based on Smooth theme by Andrew Johnson <ajgenius at ajgenius.us>
-   Portions based on IceGradient theme by  Tim Gerla <timg at means.net>
-       Tomas Ögren <stric at ing.umu.se>
-       JM Perez <jose.perez at upcnet.es>
-   Portions based on Wonderland theme by Garrett LeSage
-    Alexander Larsson
-    Owen Taylor <otaylor at redhat.com>
+Files: ./src/gradient_draw.c
+ ./src/gradient_draw.h
+Copyright: 1999-2004, Olivier Fourdan (fourdan at xfce.org)
+ 2011, Peter de Ridder <peter at xfce.org>
+License: GPL-2+
 
-gtk2-engines-xfce is © 1999-2011 Olivier Fourdan
+Files: ./src/general-support.h
+Copyright: 2006, Andrew Johnson <acjgenius at earthlink.net>
+ 2006-2007, Benjamin Berg <benjamin at sipsolutions.net>
+ 2011, Peter de Ridder <peter at xfce.org>
+License: GPL-2+
 
-License:
+Files: ./src/ge-support.h
+Copyright: 2006, Benjamin Berg <benjamin at sipsolutions.net>
+ 2011, Peter de Ridder <peter at xfce.org>
+License: GPL-2+
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+Files: ./src/xfce_theme_draw.c
+Copyright: 1999-2004, Olivier Fourdan (fourdan at xfce.org)
+ 2011, Peter de Ridder (peter at xfce.org)
+License: GPL-2+
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+Files: debian/*
+Copyright: 2009-2011, Debian Xfce Maintainer (pkg-xfce-devel at lists.alioth.debian.org)
+License: GPL-2
+  
+License: GPL
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in
+ `/usr/share/common-licenses/GPL'.
 
-On Debian systems, the complete text of the GNU General Public 
-License can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-2
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General
+ Public License (version 2 or later) can be found in
+ `/usr/share/common-licenses/GPL'.
+

Copied: desktop/trunk/gtk2-engines-xfce/debian/gtk2-engines-xfce.install (from rev 7388, desktop/branches/experimental/gtk2-engines-xfce/debian/gtk2-engines-xfce.install)
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/gtk2-engines-xfce.install	                        (rev 0)
+++ desktop/trunk/gtk2-engines-xfce/debian/gtk2-engines-xfce.install	2013-05-21 18:40:58 UTC (rev 7389)
@@ -0,0 +1,2 @@
+usr/lib/*/gtk-2.0
+usr/share/themes/*/gtk-2.0

Copied: desktop/trunk/gtk2-engines-xfce/debian/gtk3-engines-xfce.install (from rev 7388, desktop/branches/experimental/gtk2-engines-xfce/debian/gtk3-engines-xfce.install)
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/gtk3-engines-xfce.install	                        (rev 0)
+++ desktop/trunk/gtk2-engines-xfce/debian/gtk3-engines-xfce.install	2013-05-21 18:40:58 UTC (rev 7389)
@@ -0,0 +1,2 @@
+usr/lib/*/gtk-3.0
+usr/share/themes/*/gtk-3.0

Modified: desktop/trunk/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/trunk/gtk2-engines-xfce/debian/rules	2013-05-17 21:12:21 UTC (rev 7388)
+++ desktop/trunk/gtk2-engines-xfce/debian/rules	2013-05-21 18:40:58 UTC (rev 7389)
@@ -1,18 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)-Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 override_dh_install:
-	rm -f debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.a
-	rm -f debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.la
-	dh_install
+	dh_install --fail-missing -X .la
 
 %:
-	dh $@
+	dh $@ --parallel




More information about the Pkg-xfce-commits mailing list