[Pkg-xfce-commits] r3291 - in desktop/trunk/exo/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-06-09 20:30:58 +0000 (Tue, 09 Jun 2009)
New Revision: 3291

Added:
   desktop/trunk/exo/debian/patches/
   desktop/trunk/exo/debian/patches/01_exo-open-ignore-unknown-options.patch
   desktop/trunk/exo/debian/patches/series
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/rules
Log:
* debian/patches:
  - 01_exo-open-ignore-unknown-options added, accept ignore options so it
    can be passed to the called.                              closes: #532422
* debian/control:
  - add build-dep on quilt
* debian/rules:
  - use quilt rules.

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2009-06-09 20:15:30 UTC (rev 3290)
+++ desktop/trunk/exo/debian/changelog	2009-06-09 20:30:58 UTC (rev 3291)
@@ -1,3 +1,15 @@
+exo (0.3.101-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_exo-open-ignore-unknown-options added, accept ignore options so it
+      can be passed to the called.                              closes: #532422
+  * debian/control:
+    - add build-dep on quilt
+  * debian/rules:
+    - use quilt rules.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Jun 2009 21:28:48 +0200
+
 exo (0.3.101-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2009-06-09 20:15:30 UTC (rev 3290)
+++ desktop/trunk/exo/debian/control	2009-06-09 20:30:58 UTC (rev 3291)
@@ -5,7 +5,7 @@
 Uploaders: 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 (>= 5.0.0), libxfcegui4-dev (>= 4.6.0),
  liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool
+ intltool, quilt
 Standards-Version: 3.8.1
 Homepage: http://libexo.os-cillation.com/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/

Added: desktop/trunk/exo/debian/patches/01_exo-open-ignore-unknown-options.patch
===================================================================
--- desktop/trunk/exo/debian/patches/01_exo-open-ignore-unknown-options.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/01_exo-open-ignore-unknown-options.patch	2009-06-09 20:30:58 UTC (rev 3291)
@@ -0,0 +1,22 @@
+commit 27f1f82b3d9218789efdbfd63fd4d96784cc811f
+Author: nick <nick at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date:   Mon May 11 19:42:21 2009 +0000
+
+    	* exo/exo-job.c, exo/exo-cell-renderer-icon.c: Fix compiler warnings.
+    	* exo-open/main.c: Ignore unknown options so the user can send
+    	  arguments to the exo-open terminal parameters.
+    
+    git-svn-id: http://svn.xfce.org/svn/xfce/libexo/trunk@29942 a0aa69c2-05f4-0310-b83c-d5d913b14636
+
+diff --git a/exo-open/main.c b/exo-open/main.c
+index 2736c19..cbf5074 100644
+--- a/exo-open/main.c
++++ b/exo-open/main.c
+@@ -110,6 +110,7 @@ main (int argc, char **argv)
+   g_option_context_set_help_enabled (context, FALSE);
+   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+   g_option_context_add_group (context, gtk_get_option_group (TRUE));
++  g_option_context_set_ignore_unknown_options (context, TRUE);
+   if (!g_option_context_parse (context, &argc, &argv, &err))
+     {
+       g_fprintf (stderr, "exo-open: %s.\n", err->message);

Added: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/series	2009-06-09 20:30:58 UTC (rev 3291)
@@ -0,0 +1 @@
+01_exo-open-ignore-unknown-options.patch

Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules	2009-06-09 20:15:30 UTC (rev 3290)
+++ desktop/trunk/exo/debian/rules	2009-06-09 20:30:58 UTC (rev 3291)
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-#include /usr/share/quilt/quilt.make
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -43,7 +43,7 @@
 	CFLAGS="$(CFLAGS)" ./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/libexo-0.3-0 --enable-final --disable-gtk-doc --disable-python --enable-notifications
 
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:  config.status
 	dh_testdir
 
@@ -52,7 +52,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp