[Pkg-xfce-commits] r4642 - in desktop/branches/experimental/orage/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-07 19:48:24 +0000 (Tue, 07 Dec 2010)
New Revision: 4642

Added:
   desktop/branches/experimental/orage/debian/patches/03_fix-ftbfs-when-built-twice-in-a-row.patch
Modified:
   desktop/branches/experimental/orage/debian/changelog
   desktop/branches/experimental/orage/debian/control
   desktop/branches/experimental/orage/debian/patches/series
   desktop/branches/experimental/orage/debian/rules
Log:
* debian/rules: correctly clean autogenerated files modified by xdt-autogen.
* debian/patches:
  - 03_fix-ftbfs-when-built-twice-in-a-row.patch: added, prevents the removal
    of a .desktop.in file.
  - series: refreshed.
* debian/control: add myself to Uploaders.

Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================
--- desktop/branches/experimental/orage/debian/changelog	2010-12-07 11:13:03 UTC (rev 4641)
+++ desktop/branches/experimental/orage/debian/changelog	2010-12-07 19:48:24 UTC (rev 4642)
@@ -1,5 +1,6 @@
 orage (4.7.5-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * New upstream release.
   * debian/control:
     - update standards version to 3.9.1.
@@ -22,6 +23,14 @@
   * debian/copyright updated to include complete text of BSD license.
   * Switch to 3.0 (quilt) source format.
 
+  [ Lionel Le Folgoc ]
+  * debian/rules: correctly clean autogenerated files modified by xdt-autogen.
+  * debian/patches:
+    - 03_fix-ftbfs-when-built-twice-in-a-row.patch: added, prevents the removal
+      of a .desktop.in file.
+    - series: refreshed.
+  * debian/control: add myself to Uploaders.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 18:46:43 +0100
 
 orage (4.6.1-1) unstable; urgency=low

Modified: desktop/branches/experimental/orage/debian/control
===================================================================
--- desktop/branches/experimental/orage/debian/control	2010-12-07 11:13:03 UTC (rev 4641)
+++ desktop/branches/experimental/orage/debian/control	2010-12-07 19:48:24 UTC (rev 4642)
@@ -2,7 +2,9 @@
 Section: xfce
 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>, Michael Casadevall <sonicmctails at gmail.com>
+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>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
  libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.6.0), chrpath,
  libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool, 

Added: desktop/branches/experimental/orage/debian/patches/03_fix-ftbfs-when-built-twice-in-a-row.patch
===================================================================
--- desktop/branches/experimental/orage/debian/patches/03_fix-ftbfs-when-built-twice-in-a-row.patch	                        (rev 0)
+++ desktop/branches/experimental/orage/debian/patches/03_fix-ftbfs-when-built-twice-in-a-row.patch	2010-12-07 19:48:24 UTC (rev 4642)
@@ -0,0 +1,11 @@
+--- orage-4.7.5.orig/globaltime/Makefile.am
++++ orage-4.7.5/globaltime/Makefile.am
+@@ -43,7 +43,7 @@ EXTRA_DIST =								\
+ 	globaltime.xml
+ 
+ DISTCLEANFILES =                            \
+-    $(desktop_DATA) $(desktop_in_files)
++    $(desktop_DATA)
+ 
+ 
+ # vi:set ts=8 sw=8 noet ai:

Modified: desktop/branches/experimental/orage/debian/patches/series
===================================================================
--- desktop/branches/experimental/orage/debian/patches/series	2010-12-07 11:13:03 UTC (rev 4641)
+++ desktop/branches/experimental/orage/debian/patches/series	2010-12-07 19:48:24 UTC (rev 4642)
@@ -1,2 +1,3 @@
 01_fix-build-with-external-ical.patch
 02_explicit-link-libxfcegui4.patch
+03_fix-ftbfs-when-built-twice-in-a-row.patch

Modified: desktop/branches/experimental/orage/debian/rules
===================================================================
--- desktop/branches/experimental/orage/debian/rules	2010-12-07 11:13:03 UTC (rev 4641)
+++ desktop/branches/experimental/orage/debian/rules	2010-12-07 19:48:24 UTC (rev 4642)
@@ -15,6 +15,10 @@
 post-patches::
 	NOCONFIGURE=1 xdt-autogen
 
+clean::
+	rm -f $$(find -name 'Makefile.in')
+	rm -f INSTALL aclocal.m4 compile configure ltmain.sh
+
 install/orage::
 	chrpath -d -k `pwd`/debian/orage/usr/bin/* \
 		`pwd`/debian/orage/usr/lib/orage/xfce4/*/*