[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.2-4-ge305a0a
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:53:06 CET 2014
The branch, build-baikal has been updated
via e305a0a9cc943453a2e3508926967dc6b38bd525 (commit)
from e1d66fc8929ff79495414e48068192a65c7d072d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver-compat/Makefile | 8 ++++----
x2goserver-extensions/Makefile | 8 ++++----
x2goserver-fmbindings/Makefile | 8 ++++----
x2goserver-printing/Makefile | 8 ++++----
x2goserver-pyhoca/Makefile | 8 ++++----
x2goserver-xsession/Makefile | 10 +++++-----
x2goserver/Makefile | 8 ++++----
8 files changed, 30 insertions(+), 29 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 611f584..b18f45e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.1.3):
- Do not block /etc/X11/Xresources with a directory (in Makefile).
- Avoid using archaic tools during free port detection.
+ - Avoid using ls in Makefiles.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 29 Jun 2012 17:49:04 +0200
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index 6bdc94c..d8a3c95 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -19,10 +19,10 @@ BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index d3bbbb6..13cf560 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features .placeholder)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index a9d8da5..8661e83 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile
index 28ee92a..1c956f4 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-printing/Makefile
@@ -19,10 +19,10 @@ BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile
index c24be41..95ab06d 100755
--- a/x2goserver-pyhoca/Makefile
+++ b/x2goserver-pyhoca/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 40e7bf7..50c2818 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -20,11 +20,11 @@ ETCDIR=/etc/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-#BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-ETC_FILES=$(shell cd etc && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+#BIN_SCRIPTS=$(shell cd bin && echo *)
+#SBIN_SCRIPTS=$(shell cd sbin && echo *)
+#LIB_FILES=$(shell cd lib && echo *)
+ETC_FILES=$(shell cd etc && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
#man_pages = `cd man && find * -type f`
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index be689c5..115c929 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
-BIN_SCRIPTS=$(shell cd bin && ls)
-SBIN_SCRIPTS=$(shell cd sbin && ls)
-LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+BIN_SCRIPTS=$(shell cd bin && echo *)
+SBIN_SCRIPTS=$(shell cd sbin && echo *)
+LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list