[Goodies-commits] r7581 - in xfce4-notes-plugin/trunk: . panel-plugin po

[Mike Massonnet]

Author: mmassonnet
Date: 2009-06-15 15:53:44 +0000 (Mon, 15 Jun 2009)
New Revision: 7581

Added:
   xfce4-notes-plugin/trunk/po/POTFILES.skip
Modified:
   xfce4-notes-plugin/trunk/ChangeLog
   xfce4-notes-plugin/trunk/Makefile.am
   xfce4-notes-plugin/trunk/configure.in.in
   xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
   xfce4-notes-plugin/trunk/po/POTFILES.in
Log:
Fix make distcheck

Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog	2009-06-15 13:42:47 UTC (rev 7580)
+++ xfce4-notes-plugin/trunk/ChangeLog	2009-06-15 15:53:44 UTC (rev 7581)
@@ -1,3 +1,7 @@
+2009-06-15  Mike Massonnet <mmassonnet at xfce.org>
+
+Fix make distcheck
+
 2009-06-14  Mike Massonnet <mmassonnet at xfce.org>
 
 Define new colors

Modified: xfce4-notes-plugin/trunk/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/Makefile.am	2009-06-15 13:42:47 UTC (rev 7580)
+++ xfce4-notes-plugin/trunk/Makefile.am	2009-06-15 15:53:44 UTC (rev 7581)
@@ -1,28 +1,38 @@
 @SET_MAKE@
 
-SUBDIRS =														\
-	icons														\
-	panel-plugin												\
+SUBDIRS =								\
+	icons								\
+	panel-plugin							\
 	po
 
-
 distclean-local:
 	rm -rf *.cache *~
 
-dist-bz2: dist
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+EXTRA_DIST =								\
+	AUTHORS								\
+	ChangeLog							\
+	COPYING								\
+	INSTALL								\
+	NEWS								\
+	README								\
+	intltool-extract.in						\
+	intltool-merge.in						\
+	intltool-update.in
 
-distcheck-bz2: distcheck
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+DISTCLEANFILES =							\
+	aclocal.m4							\
+	compile								\
+	config.guess							\
+	config.h.in							\
+	config.sub							\
+	configure							\
+	configure.ac							\
+	depcomp								\
+	install-sh							\
+	ltmain.sh							\
+	missing								\
+	mkinstalldirs							\
+	intltool-extract						\
+	intltool-merge							\
+	intltool-update
 
-
-EXTRA_DIST =													\
-    README														\
-    intltool-extract.in											\
-    intltool-merge.in											\
-    intltool-update.in
-
-DISTCLEANFILES =												\
-    intltool-extract											\
-    intltool-merge												\
-    intltool-update

Modified: xfce4-notes-plugin/trunk/configure.in.in
===================================================================
--- xfce4-notes-plugin/trunk/configure.in.in	2009-06-15 13:42:47 UTC (rev 7580)
+++ xfce4-notes-plugin/trunk/configure.in.in	2009-06-15 15:53:44 UTC (rev 7581)
@@ -61,7 +61,11 @@
 AC_PATH_PROG([VALAC], [valac], [valac])
 AC_SUBST(VALAC)
 if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-	XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [0.1])
+	if test "xHAVE_LIBXFCE4PANEL47" = "xyes" ; then
+		XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [0.1])
+	else
+		XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [0.1]) # 0.2
+	fi
 fi
 
 dnl Translations

Modified: xfce4-notes-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-06-15 13:42:47 UTC (rev 7580)
+++ xfce4-notes-plugin/trunk/panel-plugin/Makefile.am	2009-06-15 15:53:44 UTC (rev 7581)
@@ -28,6 +28,7 @@
 xfce4_notes_settings_SOURCES =						\
 	color.c								\
 	color.h								\
+	defines.h							\
 	xfce4-notes-settings.c
 
 xfce4_notes_settings_CFLAGS =						\
@@ -121,15 +122,17 @@
 #
 # Plugin desktop file
 #
+desktop_in_in_files =							\
+	xfce4-notes-plugin-47.desktop.in.in				\
+	xfce4-notes-plugin.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+
+desktopdir = $(datadir)/xfce4/panel-plugins
 if HAVE_LIBXFCE4PANEL47
-desktop_in_in_files = xfce4-notes-plugin-47.desktop.in.in
+desktop_DATA = xfce4-notes-plugin-47.desktop
 else
-desktop_in_in_files = xfce4-notes-plugin.desktop.in.in
+desktop_DATA = xfce4-notes-plugin.desktop
 endif
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in

Modified: xfce4-notes-plugin/trunk/po/POTFILES.in
===================================================================
--- xfce4-notes-plugin/trunk/po/POTFILES.in	2009-06-15 13:42:47 UTC (rev 7580)
+++ xfce4-notes-plugin/trunk/po/POTFILES.in	2009-06-15 15:53:44 UTC (rev 7581)
@@ -1,3 +1,5 @@
+panel-plugin/xfce4-notes-plugin.desktop.in.in
+panel-plugin/xfce4-notes-plugin-47.desktop.in.in
 panel-plugin/color.c
 panel-plugin/popup.c
 panel-plugin/main.vala
@@ -7,4 +9,3 @@
 panel-plugin/hypertextview.vala
 panel-plugin/xfce4-popup-notes.c
 panel-plugin/xfce4-notes-settings.c
-panel-plugin/xfce4-notes-plugin.desktop.in.in

Added: xfce4-notes-plugin/trunk/po/POTFILES.skip
===================================================================
--- xfce4-notes-plugin/trunk/po/POTFILES.skip	                        (rev 0)
+++ xfce4-notes-plugin/trunk/po/POTFILES.skip	2009-06-15 15:53:44 UTC (rev 7581)
@@ -0,0 +1,5 @@
+panel-plugin/main.c
+panel-plugin/application.c
+panel-plugin/window.c
+panel-plugin/note.c
+panel-plugin/hypertextview.c