[Pkg-xfce-commits] r4097 - in desktop/branches/experimental/exo/debian: . source

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-05-23 17:16:28 +0000 (Sun, 23 May 2010)
New Revision: 4097

Added:
   desktop/branches/experimental/exo/debian/README.source
   desktop/branches/experimental/exo/debian/source/
   desktop/branches/experimental/exo/debian/source/format
Modified:
   desktop/branches/experimental/exo/debian/changelog
   desktop/branches/experimental/exo/debian/control
   desktop/branches/experimental/exo/debian/rules
   desktop/branches/experimental/exo/debian/watch
Log:
Partially resync with trunk

Added: desktop/branches/experimental/exo/debian/README.source
===================================================================
--- desktop/branches/experimental/exo/debian/README.source	                        (rev 0)
+++ desktop/branches/experimental/exo/debian/README.source	2010-05-23 17:16:28 UTC (rev 4097)
@@ -0,0 +1,2 @@
+exo 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/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog	2010-05-23 17:05:13 UTC (rev 4096)
+++ desktop/branches/experimental/exo/debian/changelog	2010-05-23 17:16:28 UTC (rev 4097)
@@ -10,22 +10,32 @@
     - drop build-dep on libxfcegui4, add one on libxfce4ui.
     - add build-dep on libxfce4util-dev.
     - add dep on ${misc:Depends} for libexo-1-dev.
-    - fix typo in long description.
-    - update standards version to 3.8.4.
-  * debian/watch updated.
 
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 11 May 2010 21:44:39 +0200
+
+exo (0.3.106-2) unstable; urgency=low
+
   [ Lionel Le Folgoc ]
+  * debian/control: fix typos in exo-utils-dbg and libexo-common long descs.
   * debian/patches:
     - 01_fix-treeview-gtk2.20.patch: make the treeview work again with gtk 2.20
       (Xfce #6230, lp: #520118, closes: #576706).
     - series: add this patch.
   * debian/control:
-    - build-depends on quilt (>= 0.46-7)
     - add myself to Uploaders.
-  * debian/rules: enable quilt.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 11 May 2010 21:44:39 +0200
+  [Stefan Ott]
+  * debian/watch edited to track Xfce archive reorganisation.
 
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update standards version to 3.8.4.
+    - add ${misc:Depends} to Depends.
+    - update conflicts relation forms.
+  * switch format to 3.0 (quilt).
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 11 May 2010 23:26:05 +0200
+
 exo (0.3.106-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2010-05-23 17:05:13 UTC (rev 4096)
+++ desktop/branches/experimental/exo/debian/control	2010-05-23 17:16:28 UTC (rev 4097)
@@ -7,7 +7,7 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), libxfce4util-dev, libxfce4ui-1-dev (>= 4.7.0),
  liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool, quilt (>= 0.46-7)
+ intltool
 Standards-Version: 3.8.4
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/

Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules	2010-05-23 17:05:13 UTC (rev 4096)
+++ desktop/branches/experimental/exo/debian/rules	2010-05-23 17:16:28 UTC (rev 4097)
@@ -10,7 +10,6 @@
 
 config.status: configure
 	dh_testdir
-	dh_quilt_patch
 	# Add here commands to configure the package.
 	 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/$(EXO_SONAME) --disable-gtk-doc --disable-python --enable-notifications
 
@@ -31,7 +30,6 @@
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 
-	dh_quilt_unpatch
 	dh_clean 
 
 install: build

Added: desktop/branches/experimental/exo/debian/source/format
===================================================================
--- desktop/branches/experimental/exo/debian/source/format	                        (rev 0)
+++ desktop/branches/experimental/exo/debian/source/format	2010-05-23 17:16:28 UTC (rev 4097)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: desktop/branches/experimental/exo/debian/watch
===================================================================
--- desktop/branches/experimental/exo/debian/watch	2010-05-23 17:05:13 UTC (rev 4096)
+++ desktop/branches/experimental/exo/debian/watch	2010-05-23 17:16:28 UTC (rev 4097)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/src/xfce/exo/([\d\.]+)/ \
-	exo-([\d\.]+)\.tar\.(?:gz|bz2)
+http://archive.xfce.org/src/xfce/exo/([\d\.]+)/ \
+	exo-([\d\.]+)\.tar\.bz2