[Pkg-xfce-commits] r3885 - in desktop/branches/experimental: . xfce4-panel/debian
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Mon Mar 1 08:47:18 UTC 2010
Author: mrpouit-guest
Date: 2010-03-01 20:47:18 +0000 (Mon, 01 Mar 2010)
New Revision: 3885
Added:
desktop/branches/experimental/xfce4-panel/
desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install
desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install
desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.manpages
desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.preinst
Removed:
desktop/branches/experimental/xfce4-panel/debian/NEWS
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
Modified:
desktop/branches/experimental/xfce4-panel/debian/changelog
desktop/branches/experimental/xfce4-panel/debian/control
desktop/branches/experimental/xfce4-panel/debian/rules
desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.install
Log:
New branch: packaging of xfce4-panel 4.7.0.
Deleted: desktop/branches/experimental/xfce4-panel/debian/NEWS
===================================================================
--- desktop/trunk/xfce4-panel/debian/NEWS 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/NEWS 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1,12 +0,0 @@
-xfce4-panel (4.3.90.1-3) unstable; urgency=low
-
- This is the 4.4beta1 release of xfce panel.
-
- This is a major upgrade and as such you will lose your 4.2 panel config
- There is no sane way for us to avoid this. Also as this is a beta please
- consider reporting any bugs to upstream first or to both the BTS and
- upstream's bugzilla at http://bugzilla.xfce.org/
-
- Also #xfce and #debian-xfce on irc.freenode.net can be useful resources.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Mon, 05 Jun 2006 19:51:37 +0200
Modified: desktop/branches/experimental/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/changelog 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1,3 +1,17 @@
+xfce4-panel (4.7.0-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/xfce4-panel.preinst: added, handles removal of old conffiles.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 01 Mar 2010 20:14:58 +0100
+
xfce4-panel (4.6.3-1) unstable; urgency=low
* New upstream release.
Modified: desktop/branches/experimental/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/control 2010-03-01 20:47:18 UTC (rev 3885)
@@ -3,11 +3,13 @@
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>
-Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.6), bison,
- libxft-dev, libxml2-dev, chrpath, libxfce4util-dev (>= 4.6.0),
- libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libwnck-dev,
- libxml-parser-perl, intltool
-Standards-Version: 3.8.3
+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),
+ 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
+Standards-Version: 3.8.4
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/
@@ -15,18 +17,29 @@
Package: xfce4-panel
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libexo-0.3-0 (>= 0.3.100),
- exo-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, exo-utils
Description: The Xfce4 desktop environment panel
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: xfce4-panel-dev
-Section: xfce
+Package: libxfce4panel-1.0-3
+Section: libs
Architecture: any
-Depends: ${misc:Depends}, xfce4-panel (= ${binary:Version}), libxml2-dev,
- pkg-config, libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0)
+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,
+ 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
Added: desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-3.install 2010-03-01 20:47:18 UTC (rev 3885)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
Added: desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/libxfce4panel-1.0-dev.install 2010-03-01 20:47:18 UTC (rev 3885)
@@ -0,0 +1,4 @@
+usr/include/
+usr/lib/pkgconfig/
+usr/lib/lib*.so
+usr/share/gtk-doc/
Modified: desktop/branches/experimental/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/rules 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1,94 +1,7 @@
#!/usr/bin/make -f
-#include /usr/share/quilt/quilt.make
+%:
+ dh $@
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-config.status: configure
-
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib
-
-build: build-stamp
-build-stamp: config.status
-
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
-
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
-
-install: build
-
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- install -d $(CURDIR)/debian/tmp/usr/share/man/man1
- install $(CURDIR)/debian/xfce4-panel.1 $(CURDIR)/debian/tmp/usr/share/man/man1
- install $(CURDIR)/debian/xfce4-popup-windowlist.1 $(CURDIR)/debian/tmp/usr/share/man/man1
-
- perl -i -pe 's/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher*
- rm -f $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher-8.rc
- sed -i '/<item name=\"launcher\" id=\"8\"\/>/d' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/panels.xml
-
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.a
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
- rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4panel.la
-
- dh_lintian
-
- chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/xfce4-panel \
- $(CURDIR)/debian/tmp/usr/bin/xfce4-popup-windowlist \
- $(CURDIR)/debian/tmp/usr/lib/xfce4/*/* \
- $(CURDIR)/debian/tmp/usr/lib/libxfce4panel.so.*1
-
-binary-indep: build install
-binary-arch: build install
-
- dh_testdir
- dh_testroot
-
- dh_install --fail-missing --sourcedir=debian/tmp
-
- dh_installchangelogs ChangeLog
- dh_installdocs NEWS README
-
+override_dh_strip:
dh_strip --dbg-package=xfce4-panel-dbg
- dh_compress
-
- dh_fixperms
- dh_installdeb
-
- dh_shlibdeps
- dh_gencontrol
-
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Deleted: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel-dev.install 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel-dev.install 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1,4 +0,0 @@
-usr/include/
-usr/lib/pkgconfig/
-usr/lib/lib*.so
-usr/share/gtk-doc/
Modified: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.install
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.install 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.install 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1,9 +1,7 @@
usr/bin/
-usr/lib/lib*.so.*
-usr/lib/xfce4/
+usr/lib/xfce4/panel-plugins/*.so
etc/
usr/share/applications/
usr/share/icons/hicolor/
usr/share/locale/
usr/share/xfce4/
-usr/share/man/
Deleted: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.lintian-overrides
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.lintian-overrides 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.lintian-overrides 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1,2 +0,0 @@
-#Panel includes its library
-xfce4-panel: package-name-doesnt-match-sonames libxfce4panel1
Added: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.manpages
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.manpages (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.manpages 2010-03-01 20:47:18 UTC (rev 3885)
@@ -0,0 +1 @@
+debian/*.1
Deleted: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ]; then
- # Run ldconfig to update shared library system
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
Added: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.preinst
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.preinst (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.preinst 2010-03-01 20:47:18 UTC (rev 3885)
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+# Remove a no-longer used conffile
+rm_conffile() {
+ local PKGNAME="$1"
+ local CONFFILE="$2"
+
+ [ -e "$CONFFILE" ] || return 0
+
+ local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
+ local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" lt-nl "4.7.0"; then
+ rm_conffile xfce4-panel "/etc/xdg/xfce4/panel/clock-14.rc"
+ rm_conffile xfce4-panel "/etc/xdg/xfce4/panel/launcher-10.rc"
+ rm_conffile xfce4-panel "/etc/xdg/xfce4/panel/launcher-7.rc"
+ rm_conffile xfce4-panel "/etc/xdg/xfce4/panel/launcher-9.rc"
+ rm_conffile xfce4-panel "/etc/xdg/xfce4/panel/panels.xml"
+ rm_conffile xfce4-panel "/etc/xdg/xfce4/panel/systray-4.rc"
+ rm_conffile xfce4-panel "/etc/xdg/xfce4/panel/xfce4-menu-5.rc"
+ fi
+esac
+
+#DEBHELPER#
Property changes on: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.preinst
___________________________________________________________________
Added: svn:executable
+ *
Deleted: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs 2010-02-28 21:04:29 UTC (rev 3884)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.shlibs 2010-03-01 20:47:18 UTC (rev 3885)
@@ -1 +0,0 @@
-libxfce4panel 1 xfce4-panel (>= 4.6.0)
More information about the Pkg-xfce-commits
mailing list