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

Mon Jan 17 01:05:37 UTC 2011

Author: corsac
Date: 2011-01-17 13:05:35 +0000 (Mon, 17 Jan 2011)
New Revision: 4813

Removed:
   desktop/branches/experimental/orage/debian/patches/01_fix-build-with-external-ical.patch
   desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch
   desktop/branches/experimental/orage/debian/patches/03_fix-ftbfs-when-built-twice-in-a-row.patch
   desktop/branches/experimental/orage/debian/patches/series
Modified:
   desktop/branches/experimental/orage/debian/changelog
   desktop/branches/experimental/orage/debian/rules
Log:
new upstream release, drop patches merged or unneeded


Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================

--- desktop/branches/experimental/orage/debian/changelog	2011-01-17 12:58:19 UTC (rev 4812)
+++ desktop/branches/experimental/orage/debian/changelog	2011-01-17 13:05:35 UTC (rev 4813)
@@ -1,4 +1,4 @@
-orage (4.7.5-1) UNRELEASED; urgency=low
+orage (4.8.0-1) UNRELEASED; urgency=low
 
   [ Yves-Alexis Perez ]
   * New upstream release.
@@ -17,21 +17,13 @@
     - add hardening flags to {C,LD}FLAGS.
   * debian/patches
     - 01-dont-duplicate dropped.
-    - 01_fix-build-with-external-ical added, update includes to correctly pick
-      system libical.
-    - 02_explicit-link-libxfcegui4 added, link explicitly against libxfcegui4. 
   * 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
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 17 Jan 2011 14:04:24 +0100
 
 orage (4.6.1-1) unstable; urgency=low
 

Deleted: desktop/branches/experimental/orage/debian/patches/01_fix-build-with-external-ical.patch
===================================================================
--- desktop/branches/experimental/orage/debian/patches/01_fix-build-with-external-ical.patch	2011-01-17 12:58:19 UTC (rev 4812)
+++ desktop/branches/experimental/orage/debian/patches/01_fix-build-with-external-ical.patch	2011-01-17 13:05:35 UTC (rev 4813)
@@ -1,45 +0,0 @@
-diff --git a/src/ical-archive.c b/src/ical-archive.c
-index 100be99..084c01f 100644
---- a/src/ical-archive.c
-+++ b/src/ical-archive.c
-@@ -51,8 +51,8 @@
- #include <gtk/gtk.h>
- #include <glib/gprintf.h>
- #include <glib/gstdio.h>
--#include <ical.h>
--#include <icalss.h>
-+#include <libical/ical.h>
-+#include <libical/icalss.h>
- 
- #include "orage-i18n.h"
- #include "functions.h"
-diff --git a/src/ical-code.c b/src/ical-code.c
-index 6f058ac..788ccbf 100644
---- a/src/ical-code.c
-+++ b/src/ical-code.c
-@@ -51,8 +51,8 @@
- #include <gtk/gtk.h>
- #include <glib/gprintf.h>
- #include <glib/gstdio.h>
--#include <ical.h>
--#include <icalss.h>
-+#include <libical/ical.h>
-+#include <libical/icalss.h>
- 
- #include "orage-i18n.h"
- #include "functions.h"
-diff --git a/src/ical-expimp.c b/src/ical-expimp.c
-index 9bda162..5c1380a 100644
---- a/src/ical-expimp.c
-+++ b/src/ical-expimp.c
-@@ -51,8 +51,8 @@
- #include <gtk/gtk.h>
- #include <glib/gprintf.h>
- #include <glib/gstdio.h>
--#include <ical.h>
--#include <icalss.h>
-+#include <libical/ical.h>
-+#include <libical/icalss.h>
- 
- #include "orage-i18n.h"
- #include "functions.h"

Deleted: desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch
===================================================================
--- desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch	2011-01-17 12:58:19 UTC (rev 4812)
+++ desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch	2011-01-17 13:05:35 UTC (rev 4813)
@@ -1,45 +0,0 @@
-diff --git a/globaltime/Makefile.am b/globaltime/Makefile.am
-index c9467f3..c0b27f5 100644
---- a/globaltime/Makefile.am
-+++ b/globaltime/Makefile.am
-@@ -26,12 +26,14 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- 
- globaltime_CFLAGS =							\
- 	$(LIBXFCEGUI4_CFLAGS)					\
-+	$(LIBXFCE4PANEL_CFLAGS)					\
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"		\
- 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
- 
- globaltime_LDADD =							\
- 	$(LIBXFCEGUI4_LIBS)						\
- 	$(LIBXFCEUTIL_LIBS)						\
-+	$(LIBXFCE4PANEL_LIBS)						\
- 	-lX11		            				\
- 	$(INTLLIBS) 
- 
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 7201c50..48c8e7d 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -7,8 +7,9 @@ xfce4_orageclock_plugin_CFLAGS =							\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
- 	@LIBXFCE4PANEL_CFLAGS@
- 
--xfce4_orageclock_plugin_LDFLAGS =						\
-+xfce4_orageclock_plugin_LDADD =						\
- 	@LIBXFCE4PANEL_LIBS@                            \
-+	@LIBXFCEGUI4_LIBS@                            \
- 	-lX11
- 
- xfce4_orageclock_plugin_SOURCES = 						\
-@@ -21,9 +22,7 @@ xfce4_orageclock_plugin_SOURCES = 						\
- 	xfce4-orageclock-plugin.h
- 
- if HAVE_CYGWIN
--xfce4_orageclock_plugin_LDFLAGS +=                      \
--	-no-undefined                                  \
--	@LIBXFCEGUI4_LIBS@
-+xfce4_orageclock_plugin_LDFLAGS = -no-undefined
- endif
- 
- # .desktop file

Deleted: 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	2011-01-17 12:58:19 UTC (rev 4812)
+++ desktop/branches/experimental/orage/debian/patches/03_fix-ftbfs-when-built-twice-in-a-row.patch	2011-01-17 13:05:35 UTC (rev 4813)
@@ -1,11 +0,0 @@
---- 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:

Deleted: desktop/branches/experimental/orage/debian/patches/series
===================================================================
--- desktop/branches/experimental/orage/debian/patches/series	2011-01-17 12:58:19 UTC (rev 4812)
+++ desktop/branches/experimental/orage/debian/patches/series	2011-01-17 13:05:35 UTC (rev 4813)
@@ -1,3 +0,0 @@
-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	2011-01-17 12:58:19 UTC (rev 4812)
+++ desktop/branches/experimental/orage/debian/rules	2011-01-17 13:05:35 UTC (rev 4813)
@@ -14,13 +14,6 @@
 
 export CFLAGS LDFLAGS
 
-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/*/*


