[debian-edu-commits] debian-edu/ 67/437: * Drop execute bit for /etc/X11/Xsession.d/25debian-edu-artwork, it is not needed.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:24 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository debian-edu-artwork.
commit 0e7ad0c71ce32e6faff9bda8bef7ff1760a5fd7a
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Sun Sep 3 14:00:08 2006 +0000
* Drop execute bit for /etc/X11/Xsession.d/25debian-edu-artwork, it
is not needed.
---
art/kde/Makefile.am | 2 +-
art/kde/Makefile.in | 42 +++++++++++++++++++-----------------------
debian/changelog | 2 ++
3 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index 4601c95..aadc74b 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -4,7 +4,7 @@ kdeimgdir = $(datadir)/wallpapers
kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
Xsessiondir = /etc/X11/Xsession.d/
-Xsession_SCRIPTS = 25debian-edu-artwork
+Xsession_DATA = 25debian-edu-artwork
kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/share/config
kdedefault_DATA = kdesktoprc
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index 499fe8a..d86e3ee 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -14,7 +14,6 @@
@SET_MAKE@
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -43,10 +42,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(Xsessiondir)" \
- "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"
-XsessionSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(Xsession_SCRIPTS)
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -55,9 +50,12 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(Xsessiondir)" \
+ "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"
+XsessionDATA_INSTALL = $(INSTALL_DATA)
kdedefaultDATA_INSTALL = $(INSTALL_DATA)
kdeimgDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(kdedefault_DATA) $(kdeimg_DATA)
+DATA = $(Xsession_DATA) $(kdedefault_DATA) $(kdeimg_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -144,7 +142,7 @@ KDEIMG = debian-edu-wallpaper.png
kdeimgdir = $(datadir)/wallpapers
kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
Xsessiondir = /etc/X11/Xsession.d/
-Xsession_SCRIPTS = 25debian-edu-artwork
+Xsession_DATA = 25debian-edu-artwork
kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/share/config
kdedefault_DATA = kdesktoprc
EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
@@ -180,26 +178,24 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-XsessionSCRIPTS: $(Xsession_SCRIPTS)
+uninstall-info-am:
+install-XsessionDATA: $(Xsession_DATA)
@$(NORMAL_INSTALL)
test -z "$(Xsessiondir)" || $(mkdir_p) "$(DESTDIR)$(Xsessiondir)"
- @list='$(Xsession_SCRIPTS)'; for p in $$list; do \
+ @list='$(Xsession_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(XsessionSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(Xsessiondir)/$$f'"; \
- $(XsessionSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(Xsessiondir)/$$f"; \
- else :; fi; \
+ f=$(am__strip_dir) \
+ echo " $(XsessionDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Xsessiondir)/$$f'"; \
+ $(XsessionDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Xsessiondir)/$$f"; \
done
-uninstall-XsessionSCRIPTS:
+uninstall-XsessionDATA:
@$(NORMAL_UNINSTALL)
- @list='$(Xsession_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ @list='$(Xsession_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(Xsessiondir)/$$f'"; \
rm -f "$(DESTDIR)$(Xsessiondir)/$$f"; \
done
-uninstall-info-am:
install-kdedefaultDATA: $(kdedefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(kdedefaultdir)" || $(mkdir_p) "$(DESTDIR)$(kdedefaultdir)"
@@ -270,7 +266,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(SCRIPTS) $(DATA)
+all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(Xsessiondir)" "$(DESTDIR)$(kdedefaultdir)" "$(DESTDIR)$(kdeimgdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
@@ -317,7 +313,7 @@ info: info-am
info-am:
-install-data-am: install-XsessionSCRIPTS install-data-local \
+install-data-am: install-XsessionDATA install-data-local \
install-kdedefaultDATA install-kdeimgDATA
install-exec-am:
@@ -344,19 +340,19 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-XsessionSCRIPTS uninstall-info-am \
+uninstall-am: uninstall-XsessionDATA uninstall-info-am \
uninstall-kdedefaultDATA uninstall-kdeimgDATA
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-XsessionSCRIPTS install-am install-data \
+ install install-XsessionDATA install-am install-data \
install-data-am install-data-local install-exec \
install-exec-am install-info install-info-am \
install-kdedefaultDATA install-kdeimgDATA install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-XsessionSCRIPTS uninstall-am uninstall-info-am \
+ uninstall-XsessionDATA uninstall-am uninstall-info-am \
uninstall-kdedefaultDATA uninstall-kdeimgDATA
diff --git a/debian/changelog b/debian/changelog
index a844a9f..8c73df3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ debian-edu-artwork (0.0.8) UNRELEASED; urgency=low
background image to the same as the KDM theme and KDE desktop
background.
* Avoid full path to wallpaper in kdesktoprc, where it isn't needed.
+ * Drop execute bit for /etc/X11/Xsession.d/25debian-edu-artwork, it
+ is not needed.
-- Petter Reinholdtsen <pere at debian.org> Sun, 3 Sep 2006 15:10:02 +0200
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git
More information about the debian-edu-commits
mailing list