[Pkg-xfce-commits] r4223 - desktop/branches/lenny-backports/libxfcegui4/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Aug 15 03:34:41 UTC 2010
Author: corsac
Date: 2010-08-15 15:34:35 +0000 (Sun, 15 Aug 2010)
New Revision: 4223
Added:
desktop/branches/lenny-backports/libxfcegui4/debian/README.source
desktop/branches/lenny-backports/libxfcegui4/debian/source/
desktop/branches/lenny-backports/libxfcegui4/debian/xfce-keyboard-shortcuts.install
Modified:
desktop/branches/lenny-backports/libxfcegui4/debian/changelog
desktop/branches/lenny-backports/libxfcegui4/debian/control
desktop/branches/lenny-backports/libxfcegui4/debian/libxfcegui4-4.install
desktop/branches/lenny-backports/libxfcegui4/debian/rules
desktop/branches/lenny-backports/libxfcegui4/debian/watch
Log:
merge changes from latest version in squeeze to backports
Copied: desktop/branches/lenny-backports/libxfcegui4/debian/README.source (from rev 4058, desktop/trunk/libxfcegui4/debian/README.source)
===================================================================
--- desktop/branches/lenny-backports/libxfcegui4/debian/README.source (rev 0)
+++ desktop/branches/lenny-backports/libxfcegui4/debian/README.source 2010-08-15 15:34:35 UTC (rev 4223)
@@ -0,0 +1,2 @@
+This package uses quilt patch system to apply patch at build-time. More
+information can be found in /usr/share/doc/quilt/README.source.
Modified: desktop/branches/lenny-backports/libxfcegui4/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/libxfcegui4/debian/changelog 2010-08-15 14:40:55 UTC (rev 4222)
+++ desktop/branches/lenny-backports/libxfcegui4/debian/changelog 2010-08-15 15:34:35 UTC (rev 4223)
@@ -1,9 +1,58 @@
-libxfcegui4 (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+libxfcegui4 (4.6.4-1~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 30 Jun 2009 00:01:59 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Aug 2010 16:28:22 +0200
+libxfcegui4 (4.6.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - don't use quilt addon.
+ * debian/control:
+ - drop quilt build-dep.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 22 May 2010 12:45:17 +0200
+
+libxfcegui4 (4.6.3-2) unstable; urgency=low
+
+ * Override dh_strip so we don't end up with an empty dbg package.
+ * debian/control:
+ - update standards version to 3.8.4.
+ - update debhelper build dep because using override.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 07 Feb 2010 23:30:48 +0100
+
+libxfcegui4 (4.6.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 20 Jan 2010 20:42:37 +0100
+
+libxfcegui4 (4.6.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/watch updated to track new repository organisation.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 05 Jan 2010 18:11:31 +0100
+
+libxfcegui4 (4.6.1-2) unstable; urgency=low
+
+ * Add a new xfce-keyboard-shortcuts containing the xfconf file for keyboard
+ shortcuts. This will enable people to co-install libxfcegui4 and
+ libxfce4ui.
+ * debian/control:
+ - update standards version to 3.8.3 ;
+ - update quilt build-dep to use dh --with quilt ;
+ - add ${misc:Depends} to all Depends: lines ;
+ - drop chrpath build-dep.
+ * debian/README.source added.
+ * debian/rules:
+ - big cleanup, use tiny rule from debhelper 7.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 25 Oct 2009 23:03:30 +0100
+
libxfcegui4 (4.6.1-1) unstable; urgency=low
* debian/control:
Modified: desktop/branches/lenny-backports/libxfcegui4/debian/control
===================================================================
--- desktop/branches/lenny-backports/libxfcegui4/debian/control 2010-08-15 14:40:55 UTC (rev 4222)
+++ desktop/branches/lenny-backports/libxfcegui4/debian/control 2010-08-15 15:34:35 UTC (rev 4223)
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
-Build-Depends: debhelper (>= 7.0.0), libgtk2.0-dev (>= 2.10.6),
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6),
libxfce4util-dev (>= 4.6.0), libxfconf-0-dev (>=4.6.0),
- libstartup-notification0-dev, quilt, libglade2-dev, libgladeui-1-dev,
- intltool, chrpath
-Standards-Version: 3.8.1
+ libstartup-notification0-dev, libglade2-dev,
+ libgladeui-1-dev, intltool
+Standards-Version: 3.8.4
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfcegui4/
@@ -15,7 +15,7 @@
Package: glade-xfce
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: glade, libxfcegui4-dev
Description: glade modules for xfce
This package contains the modules that allow Glade to provide Xfce widgets in
@@ -25,7 +25,7 @@
Section: libdevel
Architecture: any
Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.6.0),
- libgtk2.0-dev
+ libgtk2.0-dev, ${misc:Depends}
Suggests: devhelp
Description: Development files for libxfcegui4-4
This package contains the headers and the static library
@@ -39,7 +39,7 @@
Package: libxfcegui4-4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts
Description: Basic GUI C functions for Xfce4
This package contains a library which provides the very
basic GUI functions used by the Xfce4 desktop suite. If
@@ -50,7 +50,19 @@
Section: debug
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, libxfcegui4-4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libxfcegui4-4 (= ${binary:Version}),
+ ${misc:Depends}
Description: debugging informations for libxfcegui4
This package contains debugging symbols for libxfcegui4, which provides the
very basic GUI functions used by the Xfce4 desktop suite.
+
+Package: xfce-keyboard-shortcuts
+Section: xfce
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libxfcegui4-4
+Conflicts: libxfcegui4-4 (<< 4.6.1-2)
+Replaces: libxfcegui4-4 (<< 4.6.1-2)
+Description: xfce keyboard shortcuts configuration
+ This package only contains the default shortcut configuration for Xfce.
+ .
Modified: desktop/branches/lenny-backports/libxfcegui4/debian/libxfcegui4-4.install
===================================================================
--- desktop/branches/lenny-backports/libxfcegui4/debian/libxfcegui4-4.install 2010-08-15 14:40:55 UTC (rev 4222)
+++ desktop/branches/lenny-backports/libxfcegui4/debian/libxfcegui4-4.install 2010-08-15 15:34:35 UTC (rev 4223)
@@ -2,4 +2,3 @@
usr/lib/libglade/2.0/libxfce4.so
usr/share/locale/*
usr/share/icons/hicolor/*
-etc
Modified: desktop/branches/lenny-backports/libxfcegui4/debian/rules
===================================================================
--- desktop/branches/lenny-backports/libxfcegui4/debian/rules 2010-08-15 14:40:55 UTC (rev 4222)
+++ desktop/branches/lenny-backports/libxfcegui4/debian/rules 2010-08-15 15:34:35 UTC (rev 4223)
@@ -1,84 +1,9 @@
#!/usr/bin/make -f
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-include /usr/share/quilt/quilt.make
-
LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+%:
+ dh $@
-config.status: configure
-
- dh_testdir
- ./configure \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --sysconfdir=/etc --prefix=/usr --enable-final \
- --enable-startup-notification --enable-keyboard-library \
- --enable-gladeui --with-x
-
-build: patch build-stamp
-build-stamp: config.status
-
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean: unpatch
-
- 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
-
- rm -f $(CURDIR)/debian/tmp/usr/lib/libxfcegui4.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4kbd-private.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/libglade/2.0/libxfce4.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/glade3/modules/libgladexfce4.la
-
- chrpath -d -k $(CURDIR)/debian/tmp/usr/lib/*.so.*
-
-binary-indep: build install
-binary-arch: build install
-
- dh_testdir
- dh_testroot
-
- dh_installchangelogs ChangeLog
- dh_installdocs README
-
- dh_install --fail-missing --sourcedir=debian/tmp
+override_dh_strip:
dh_strip --dbg-package=libxfcegui4-4-dbg
-
- dh_compress
- dh_fixperms
-
- dh_makeshlibs
- dh_installdeb
-
- dh_shlibdeps
- dh_gencontrol
-
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
Modified: desktop/branches/lenny-backports/libxfcegui4/debian/watch
===================================================================
--- desktop/branches/lenny-backports/libxfcegui4/debian/watch 2010-08-15 14:40:55 UTC (rev 4222)
+++ desktop/branches/lenny-backports/libxfcegui4/debian/watch 2010-08-15 15:34:35 UTC (rev 4223)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- libxfcegui4-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/libxfcegui4/([\d\.]+)/ \
+ libxfcegui4-([\d\.]+)\.tar\.(?:gz|bz2)
Copied: desktop/branches/lenny-backports/libxfcegui4/debian/xfce-keyboard-shortcuts.install (from rev 4058, desktop/trunk/libxfcegui4/debian/xfce-keyboard-shortcuts.install)
===================================================================
--- desktop/branches/lenny-backports/libxfcegui4/debian/xfce-keyboard-shortcuts.install (rev 0)
+++ desktop/branches/lenny-backports/libxfcegui4/debian/xfce-keyboard-shortcuts.install 2010-08-15 15:34:35 UTC (rev 4223)
@@ -0,0 +1 @@
+etc
More information about the Pkg-xfce-commits
mailing list