[Pkg-xfce-commits] r7411 - in desktop/trunk/garcon: . debian

Tue May 21 08:07:24 UTC 2013

Author: corsac
Date: 2013-05-21 20:07:24 +0000 (Tue, 21 May 2013)
New Revision: 7411

Modified:
   desktop/trunk/garcon/
   desktop/trunk/garcon/debian/
   desktop/trunk/garcon/debian/changelog
   desktop/trunk/garcon/debian/control
   desktop/trunk/garcon/debian/copyright
Log:
merge changes from experimental



Property changes on: desktop/trunk/garcon
___________________________________________________________________
Added: svn:mergeinfo
   + /desktop/branches/experimental/garcon:6560-7388


Property changes on: desktop/trunk/garcon/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: desktop/trunk/garcon/debian/changelog
===================================================================

--- desktop/trunk/garcon/debian/changelog	2013-05-21 20:01:55 UTC (rev 7410)
+++ desktop/trunk/garcon/debian/changelog	2013-05-21 20:07:24 UTC (rev 7411)
@@ -1,3 +1,18 @@
+garcon (0.2.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: revert b-dep to unversioned libxfce4util -dev package, and
+    require >= 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 05 May 2012 09:43:43 +0200
+
+garcon (0.1.12-1+exp1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/copyright: replace CRLFs with LFs…
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 15 Apr 2012 15:36:53 +0200
+
 garcon (0.1.12-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]
@@ -9,6 +24,22 @@
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 05 May 2012 14:45:29 +0200
 
+garcon (0.1.11-1+exp1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream release.
+  * debian/README.source: dropped, unneeded.
+  * debian/rules: fix path to .la files to ignore.
+  * debian/control: build-dep on libxfce4util6-dev to start using the new API.
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update standards version to 3.9.3.
+  * debian/rules:
+    - build with --parallel.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 08 Apr 2012 16:24:43 +0200
+
 garcon (0.1.11-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Modified: desktop/trunk/garcon/debian/control
===================================================================
--- desktop/trunk/garcon/debian/control	2013-05-21 20:01:55 UTC (rev 7410)
+++ desktop/trunk/garcon/debian/control	2013-05-21 20:07:24 UTC (rev 7411)
@@ -5,7 +5,7 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config,
- libglib2.0-dev, libgtk2.0-dev, libxfce4util-dev (>= 4.8.0), dpkg-dev (>= 1.16.1)
+ libglib2.0-dev, libgtk2.0-dev, libxfce4util-dev (>= 4.10.0), 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/garcon

Modified: desktop/trunk/garcon/debian/copyright
===================================================================
--- desktop/trunk/garcon/debian/copyright	2013-05-21 20:01:55 UTC (rev 7410)
+++ desktop/trunk/garcon/debian/copyright	2013-05-21 20:07:24 UTC (rev 7411)
@@ -1,74 +1,74 @@
-This package was debianized by Yves-Alexis Perez <corsac at debian.org> on
-Sat, 10 Oct 2009 10:33:06 +0200
-
-It was downloaded from http://www.xfce.org
-
-Files: garcon/garcon-config.c
- garcon/garcon-environment.c
- garcon/garcon-environment.h
- garcon/garcon-menu-directory.c
- garcon/garcon-menu-directory.h
- garcon/garcon-menu-element.c
- garcon/garcon-menu-element.h
- garcon/garcon-menu-item-cache.c
- garcon/garcon-menu-item-cache.h
- garcon/garcon-menu-item-pool.c
- garcon/garcon-menu-item-pool.h
- garcon/garcon-menu-merger.c
- garcon/garcon-menu-merger.h
- garcon/garcon-menu-node.c
- garcon/garcon-menu-node.h
- garcon/garcon-menu-parser.c
- garcon/garcon-menu-parser.h
- garcon/garcon-menu-separator.c
- garcon/garcon-menu-separator.h
- garcon/garcon-menu-tree-provider.c
- garcon/garcon-menu-tree-provider.h
- garcon/garcon-menu.c
- garcon/garcon-menu.h
- garcon/garcon.h
- tests/test-display-menu.c
- tests/test-menu-parser.c
- tests/test-menu-spec.c
-Copyright: 2006-2007, Jannis Pohlmann <jannis at xfce.org>
- 2006-2009, Jannis Pohlmann <jannis at xfce.org>
- 2006-2010, Jannis Pohlmann <jannis at xfce.org>
- 2007, Jannis Pohlmann <jannis at xfce.org>
- 2007-2009, Jannis Pohlmann <jannis at xfce.org>
- 2007-2010, Jannis Pohlmann <jannis at xfce.org>
- 2009, Jannis Pohlmann <jannis at xfce.org>
- 2009-2010, Jannis Pohlmann <jannis at xfce.org>
-License: LGPL-2+
-
-Files: garcon/garcon-menu-item.c
- garcon/garcon-menu-item.h
- garcon/garcon-private.c
- garcon/garcon-private.h
-Copyright: 2006-2010, Jannis Pohlmann <jannis at xfce.org>
- 2009, Jannis Pohlmann <jannis at xfce.org>
- 2009, Nick Schermer <nick at xfce.org>
- 2009-2010, Nick Schermer <nick at xfce.org>
-License: LGPL-2+
-
-The Debian packaging is
-  © 2009-2011 Yves-Alexis Perez <corsac at debian.org>
-and is licensed under the GPL, version 2.
-
-The documentation (files in doc/*) is released under the GNU Free Documentation
-License, version  1.1 or later, with no invariant sections, using the following 
-statement:
-
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.1 or
-  any later version published by the Free Software Foundation; with no
-  Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-  Texts. 
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in `/usr/share/common-licenses/LGPL'.
-
-The complete text of the GNU Free Documentation License can be found on the
-file “/usr/share/common-licenses/GFDL”.
-
-The complete text of the GNU General Public License (version 2) can be
-found in `/usr/share/common-licenses/GPL-2'.
+This package was debianized by Yves-Alexis Perez <corsac at debian.org> on
+Sat, 10 Oct 2009 10:33:06 +0200
+
+It was downloaded from http://www.xfce.org
+
+Files: garcon/garcon-config.c
+ garcon/garcon-environment.c
+ garcon/garcon-environment.h
+ garcon/garcon-menu-directory.c
+ garcon/garcon-menu-directory.h
+ garcon/garcon-menu-element.c
+ garcon/garcon-menu-element.h
+ garcon/garcon-menu-item-cache.c
+ garcon/garcon-menu-item-cache.h
+ garcon/garcon-menu-item-pool.c
+ garcon/garcon-menu-item-pool.h
+ garcon/garcon-menu-merger.c
+ garcon/garcon-menu-merger.h
+ garcon/garcon-menu-node.c
+ garcon/garcon-menu-node.h
+ garcon/garcon-menu-parser.c
+ garcon/garcon-menu-parser.h
+ garcon/garcon-menu-separator.c
+ garcon/garcon-menu-separator.h
+ garcon/garcon-menu-tree-provider.c
+ garcon/garcon-menu-tree-provider.h
+ garcon/garcon-menu.c
+ garcon/garcon-menu.h
+ garcon/garcon.h
+ tests/test-display-menu.c
+ tests/test-menu-parser.c
+ tests/test-menu-spec.c
+Copyright: 2006-2007, Jannis Pohlmann <jannis at xfce.org>
+ 2006-2009, Jannis Pohlmann <jannis at xfce.org>
+ 2006-2010, Jannis Pohlmann <jannis at xfce.org>
+ 2007, Jannis Pohlmann <jannis at xfce.org>
+ 2007-2009, Jannis Pohlmann <jannis at xfce.org>
+ 2007-2010, Jannis Pohlmann <jannis at xfce.org>
+ 2009, Jannis Pohlmann <jannis at xfce.org>
+ 2009-2010, Jannis Pohlmann <jannis at xfce.org>
+License: LGPL-2+
+
+Files: garcon/garcon-menu-item.c
+ garcon/garcon-menu-item.h
+ garcon/garcon-private.c
+ garcon/garcon-private.h
+Copyright: 2006-2010, Jannis Pohlmann <jannis at xfce.org>
+ 2009, Jannis Pohlmann <jannis at xfce.org>
+ 2009, Nick Schermer <nick at xfce.org>
+ 2009-2010, Nick Schermer <nick at xfce.org>
+License: LGPL-2+
+
+The Debian packaging is
+  © 2009-2011 Yves-Alexis Perez <corsac at debian.org>
+and is licensed under the GPL, version 2.
+
+The documentation (files in doc/*) is released under the GNU Free Documentation
+License, version  1.1 or later, with no invariant sections, using the following 
+statement:
+
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.1 or
+  any later version published by the Free Software Foundation; with no
+  Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+  Texts. 
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License can be found in `/usr/share/common-licenses/LGPL'.
+
+The complete text of the GNU Free Documentation License can be found on the
+file “/usr/share/common-licenses/GFDL”.
+
+The complete text of the GNU General Public License (version 2) can be
+found in `/usr/share/common-licenses/GPL-2'.


