[Pkg-xfce-commits] r7421 - in desktop/trunk/xfce4-panel: . debian

Yves-Alexis Perez corsac at alioth.debian.org
Tue May 21 08:31:17 UTC 2013 

Author: corsac
Date: 2013-05-21 20:31:16 +0000 (Tue, 21 May 2013)
New Revision: 7421

Modified:
   desktop/trunk/xfce4-panel/
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/control
   desktop/trunk/xfce4-panel/debian/rules
   desktop/trunk/xfce4-panel/debian/xfce4-panel.install
   desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides
   desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs
Log:
merge changes from experimental



Property changes on: desktop/trunk/xfce4-panel
___________________________________________________________________
Added: svn:mergeinfo
   + /desktop/branches/experimental/xfce4-panel:6335-7388

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2013-05-21 20:28:36 UTC (rev 7420)
+++ desktop/trunk/xfce4-panel/debian/changelog	2013-05-21 20:31:16 UTC (rev 7421)
@@ -1,3 +1,51 @@
+xfce4-panel (4.10.0-2) UNRELEASED; urgency=low
+
+  * debian/xfce4-panel.shlibs:
+    - conflicts about a future 4.11 panel.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 14 May 2012 20:30:10 +0200
+
+xfce4-panel (4.10.0-1) experimental; urgency=low
+
+  * New upstream stable release.
+  * debian/control: revert to unversioned libxfce4util-dev, bump required
+    versions for Xfce 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 05 May 2012 13:35:45 +0200
+
+xfce4-panel (4.9.2-1) experimental; urgency=low
+
+  * New upstream development release.
+  * debian/xfce4-panel.shlibs, debian/xfce4-panel.lintian-overrides: updated
+    to the new soname.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 15 Apr 2012 15:54:14 +0200
+
+xfce4-panel (4.9.1-1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream development release, including:
+    - "add items to panel" dialogs aren't on top anymore        Closes: #450910
+    - fix autosaving to avoid lost settings.                    Closes: #646981
+  * debian/xfce4-panel.shlibs: bump to >= 4.9.1, for the new "small" property.
+  * debian/rules, debian/xfce4-panel-dev.install: ignore *.a files, not built
+    anymore.
+  * debian/control:
+    - switch to libxfceutil6-dev for the new api, and bump libxfce4ui-1-dev
+      b-dep to >= 4.9.0 for the new help api.
+  * debian/rules:
+    - drop --sourcedir=debian/tmp from dh_install, unneeded.
+  * debian/xfce4-panel.install: drop the docs, not build anymore.
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - update standards version to 3.9.3
+  * debian/rules:
+    - build with --parallel.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 08 Apr 2012 21:51:34 +0200
+
 xfce4-panel (4.8.6-4) unstable; urgency=low
 
   * debian/xfce4-panel.shlibs:

Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2013-05-21 20:28:36 UTC (rev 7420)
+++ desktop/trunk/xfce4-panel/debian/control	2013-05-21 20:31:16 UTC (rev 7421)
@@ -4,9 +4,9 @@
 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), libxfce4util-dev (>= 4.8.0),
- libgarcon-1-0-dev (>= 0.1.4), libxfce4ui-1-dev (>= 4.8.0),
- libxfconf-0-dev (>= 4.8.0), libexo-1-dev (>= 0.6.0),
+Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.10.0),
+ libgarcon-1-0-dev (>= 0.2.0), libxfce4ui-1-dev (>= 4.10.0),
+ libxfconf-0-dev (>= 4.10.0), libexo-1-dev (>= 0.8.0),
  libgtk2.0-dev (>= 2.14.0), libglib2.0-dev (>= 2.18.0),
  libdbus-glib-1-dev (>= 0.73), libcairo2-dev (>= 1.0.0),
  libwnck-dev (>= 2.22), libxml-parser-perl, intltool
@@ -29,7 +29,7 @@
 Section: xfce
 Architecture: any
 Depends: ${misc:Depends}, xfce4-panel (= ${binary:Version}), pkg-config,
- libxfce4util-dev (>= 4.6.0), libglib2.0-dev (>= 2.18.0),
+ libxfce4util-dev (>= 4.10.0), libglib2.0-dev (>= 2.18.0),
  libgtk2.0-dev (>= 2.14.0)
 Description: Xfce4 panel development files
  In this package, you can find the development files distributed with the

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2013-05-21 20:28:36 UTC (rev 7420)
+++ desktop/trunk/xfce4-panel/debian/rules	2013-05-21 20:31:16 UTC (rev 7421)
@@ -6,8 +6,7 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_install:
-	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/*.a
-	dh_install --fail-missing --sourcedir=debian/tmp -X .la
+	dh_install --fail-missing -X .la
 
 override_dh_strip:
 	dh_strip --dbg-package=xfce4-panel-dbg

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.install
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.install	2013-05-21 20:28:36 UTC (rev 7420)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.install	2013-05-21 20:31:16 UTC (rev 7421)
@@ -5,7 +5,6 @@
 usr/lib/*/xfce4/panel/plugins/*.so
 etc/
 usr/share/applications/
-usr/share/doc/xfce4-panel/
 usr/share/icons/hicolor/
 usr/share/locale/
 usr/share/xfce4/

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides	2013-05-21 20:28:36 UTC (rev 7420)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides	2013-05-21 20:31:16 UTC (rev 7421)
@@ -1,2 +1,2 @@
 #Panel includes its library
-xfce4-panel: package-name-doesnt-match-sonames libxfce4panel-1.0-3
+xfce4-panel: package-name-doesnt-match-sonames libxfce4panel-1.0-4


Property changes on: desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs	2013-05-21 20:28:36 UTC (rev 7420)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs	2013-05-21 20:31:16 UTC (rev 7421)
@@ -1 +1 @@
-libxfce4panel-1.0 3 xfce4-panel (>= 4.7.7), xfce4-panel (<< 4.9)
+libxfce4panel-1.0 4 xfce4-panel (>= 4.9.2), xfce4-panel (<< 4.11)

More information about the Pkg-xfce-commits mailing list