[Pkg-xfce-commits] r3990 - desktop/branches/experimental/xfce4-panel/debian

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Fri May 14 09:24:40 UTC 2010 

Author: mrpouit-guest
Date: 2010-05-14 09:24:39 +0000 (Fri, 14 May 2010)
New Revision: 3990

Added:
   desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install
   desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.lintian-overrides
   desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst
   desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs
Removed:
   desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install
   desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install
Modified:
   desktop/branches/experimental/xfce4-panel/debian/changelog
   desktop/branches/experimental/xfce4-panel/debian/control
   desktop/branches/experimental/xfce4-panel/debian/watch
   desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.install
Log:
New upstream release, and revert the split.


Modified: desktop/branches/experimental/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/changelog	2010-05-12 05:49:08 UTC (rev 3989)
+++ desktop/branches/experimental/xfce4-panel/debian/changelog	2010-05-14 09:24:39 UTC (rev 3990)
@@ -1,16 +1,15 @@
-xfce4-panel (4.7.0-1) UNRELEASED; urgency=low
+xfce4-panel (4.7.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Split xfce4-panel into progs (xfce4-panel) and libs (libxfce4panel-1.0-3);
-    renamed xfce4-panel-dev to libxfce4panel-1.0-dev.
   * debian/control: refreshed (b-)deps for this new major release.
   * debian/rules: switch to rules.tiny.
   * debian/xfce4-panel.manpages: added.
-  * debian/xfce4-panel.lintian-overrides, debian/xfce4-panel.postinst,
-    debian/NEWS: dropped, unneeded.
+  * debian/NEWS: dropped, unneeded.
+  * debian/xfce4-panel.shlibs: refreshed, bump to (>= 4.7.0).
   * debian/xfce4-panel.preinst: added, handles removal of old conffiles.
+  * debian/control: add myself to Uploaders.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 01 Mar 2010 20:14:58 +0100
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Fri, 14 May 2010 11:20:14 +0200
 
 xfce4-panel (4.6.3-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-panel/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/control	2010-05-12 05:49:08 UTC (rev 3989)
+++ desktop/branches/experimental/xfce4-panel/debian/control	2010-05-14 09:24:39 UTC (rev 3990)
@@ -2,7 +2,8 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0),
  libgarcon-1-0-dev (>=0.1.1), libxfce4ui-1-dev (>= 4.7.1),
  libxfconf-0-dev (>= 4.7.2), libexo-1-dev (>= 0.5.1),
@@ -23,23 +24,12 @@
  multi-functional panel that can even handle plugins and the like, xfce4-panel
  might be worth a try.
 
-Package: libxfce4panel-1.0-3
-Section: libs
+Package: xfce4-panel-dev
+Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: xfce4-panel (<< 4.7.0)
-Description: The Xfce4 panel library
- This is the panel provided by the Xfce4 desktop project.  If you want a
- multi-functional panel that can even handle plugins and the like, xfce4-panel
- might be worth a try.
-
-Package: libxfce4panel-1.0-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}, libxfce4panel-1.0-3 (= ${binary:Version}), pkg-config,
+Depends: ${misc:Depends}, xfce4-panel (= ${binary:Version}), pkg-config,
  libxfce4util-dev (>= 4.6.0), libglib2.0-dev (>= 2.18.0),
  libgtk2.0-dev (>= 2.14.0)
-Replaces: xfce4-panel-dev (<< 4.7.0)
 Description: The Xfce4 panel development files
  In this package, you can find the development files distributed with the
  Xfce4 panel, the main panel of Xfce4 desktop environment. The files in this

Deleted: desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install	2010-05-12 05:49:08 UTC (rev 3989)
+++ desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install	2010-05-14 09:24:39 UTC (rev 3990)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*

Deleted: desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install	2010-05-12 05:49:08 UTC (rev 3989)
+++ desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install	2010-05-14 09:24:39 UTC (rev 3990)
@@ -1,4 +0,0 @@
-usr/include/
-usr/lib/pkgconfig/
-usr/lib/lib*.so
-usr/share/gtk-doc/

Modified: desktop/branches/experimental/xfce4-panel/debian/watch
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/watch	2010-05-12 05:49:08 UTC (rev 3989)
+++ desktop/branches/experimental/xfce4-panel/debian/watch	2010-05-14 09:24:39 UTC (rev 3990)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
-	xfce4-panel-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/xfce4-panel/([\d\.]+)/ \
+	xfce4-panel-([\d\.]+)\.tar\.(?:gz|bz2)

Copied: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install (from rev 3989, desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install)
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install	2010-05-14 09:24:39 UTC (rev 3990)
@@ -0,0 +1,4 @@
+usr/include/
+usr/lib/pkgconfig/
+usr/lib/lib*.so
+usr/share/gtk-doc/

Modified: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.install
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.install	2010-05-12 05:49:08 UTC (rev 3989)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.install	2010-05-14 09:24:39 UTC (rev 3990)
@@ -1,4 +1,5 @@
 usr/bin/
+usr/lib/lib*.so.*
 usr/lib/xfce4/panel-plugins/*.so
 etc/
 usr/share/applications/

Added: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.lintian-overrides
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.lintian-overrides	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.lintian-overrides	2010-05-14 09:24:39 UTC (rev 3990)
@@ -0,0 +1,2 @@
+#Panel includes its library
+xfce4-panel: package-name-doesnt-match-sonames libxfce4panel1

Added: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst	2010-05-14 09:24:39 UTC (rev 3990)
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Run ldconfig to update shared library system
+	ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0


Property changes on: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst
___________________________________________________________________
Added: svn:executable
   + *

Added: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs	2010-05-14 09:24:39 UTC (rev 3990)
@@ -0,0 +1 @@
+libxfce4panel-1.0 3 xfce4-panel (>= 4.7.0)

More information about the Pkg-xfce-commits mailing list