[Pkg-xfce-commits] r4088 - in desktop/branches/experimental/libxfce4util/debian: . source

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-05-23 16:10:14 +0000 (Sun, 23 May 2010)
New Revision: 4088

Added:
   desktop/branches/experimental/libxfce4util/debian/libxfce4util-dev.docs
   desktop/branches/experimental/libxfce4util/debian/source/
   desktop/branches/experimental/libxfce4util/debian/source/format
Modified:
   desktop/branches/experimental/libxfce4util/debian/changelog
   desktop/branches/experimental/libxfce4util/debian/control
   desktop/branches/experimental/libxfce4util/debian/rules
   desktop/branches/experimental/libxfce4util/debian/watch
Log:
Resync with trunk

Modified: desktop/branches/experimental/libxfce4util/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/changelog	2010-05-23 14:15:08 UTC (rev 4087)
+++ desktop/branches/experimental/libxfce4util/debian/changelog	2010-05-23 16:10:14 UTC (rev 4088)
@@ -2,14 +2,6 @@
 
   [ Yves-Alexis Perez ]
   * New upstream development release.
-  * debian/control:
-    - update standards version to 3.8.3.
-    - add build-dep on intltool.
-    - add depends on ${misc:Depends}. 
-  * debian/xfce4-kiosk-query.8: fix typo.
-  * debian/rules:
-    - switch to dh7 with quilt addon.
-  * debian/README.source added.
   * debian/libxfce4util.shlibs: bump package version to 4.7.0.
 
   [ Lionel Le Folgoc ]
@@ -20,6 +12,24 @@
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 09 Jan 2010 20:19:25 +0100
 
+libxfce4util (4.6.2-1) unstable; urgency=low
+
+  [Yves-Alexis Perez]
+  * New upstream release.
+  * debian/control:
+    - bump standards version to 3.8.4.
+    - add build-dep on intltool. 
+    - drop quilt and chrpath build-deps.
+    - bump debhelper build-deps for overrides.
+  * debian/rules:
+    - switch to debhelper 7.
+  * switch to 3.0 (quilt) source format.
+
+  [Stefan Ott]
+  * debian/watch edited to track Xfce archive reorganisation.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 May 2010 12:51:37 +0200
+
 libxfce4util (4.6.1-2) unstable; urgency=low
 
   * debian/control:

Modified: desktop/branches/experimental/libxfce4util/debian/control
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/control	2010-05-23 14:15:08 UTC (rev 4087)
+++ desktop/branches/experimental/libxfce4util/debian/control	2010-05-23 16:10:14 UTC (rev 4088)
@@ -4,8 +4,8 @@
 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>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, chrpath, quilt, intltool
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, intltool
+Standards-Version: 3.8.4
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4util/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4util/

Added: desktop/branches/experimental/libxfce4util/debian/libxfce4util-dev.docs
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/libxfce4util-dev.docs	                        (rev 0)
+++ desktop/branches/experimental/libxfce4util/debian/libxfce4util-dev.docs	2010-05-23 16:10:14 UTC (rev 4088)
@@ -0,0 +1,2 @@
+NEWS
+TODO

Modified: desktop/branches/experimental/libxfce4util/debian/rules
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/rules	2010-05-23 14:15:08 UTC (rev 4087)
+++ desktop/branches/experimental/libxfce4util/debian/rules	2010-05-23 16:10:14 UTC (rev 4088)
@@ -1,13 +1,18 @@
 #!/usr/bin/make -f
 
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
-%:
-	dh --with quilt $@
-
 override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4util.la
 	dh_install --fail-missing
 
 override_dh_strip:
 	dh_strip --dbg-package=libxfce4util4-dbg
+
+%:
+	dh $@

Added: desktop/branches/experimental/libxfce4util/debian/source/format
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/source/format	                        (rev 0)
+++ desktop/branches/experimental/libxfce4util/debian/source/format	2010-05-23 16:10:14 UTC (rev 4088)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: desktop/branches/experimental/libxfce4util/debian/watch
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/watch	2010-05-23 14:15:08 UTC (rev 4087)
+++ desktop/branches/experimental/libxfce4util/debian/watch	2010-05-23 16:10:14 UTC (rev 4088)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
-	libxfce4util-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/libxfce4util/([\d\.]+)/ \
+	libxfce4util-([\d\.]+)\.tar\.(?:gz|bz2)