[X2Go-Commits] [nx-libs] 02/29: Drop not-used-anymore NX source tree clean-up code. Source tree has been cleaned up natively.
git-admin at x2go.org
git-admin at x2go.org
Tue Feb 10 05:21:38 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit eb55dc8fd6974ca6f3325d2d30e56c96f28d2876
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Feb 9 10:37:17 2015 +0100
Drop not-used-anymore NX source tree clean-up code. Source tree has been cleaned up natively.
---
debian/roll-tarballs.sh | 29 -----------------------------
debian/rules | 26 --------------------------
nx-libs.spec | 26 --------------------------
3 files changed, 81 deletions(-)
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 9b63529..a8d3cf6 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -139,39 +139,10 @@ mv -v debian/changelog doc/changelog
test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile
test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh
-
-
-#### stuff we do not needed
-UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED`
-CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL`
-UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES`
-PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED`
-PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED`
-PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED`
-
# remove folders that we do not want to roll into the tarball
rm -Rf ".pc/"
rm -Rf "debian/"
-mkdir -p .preserve/
-for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do
- if [ ! -d $path ]; then
- path_dirname=$(dirname "$path")
- else
- path_dirname="$path"
- fi
- mkdir -vp ".preserve/$path_dirname"
- cp -av "$path" ".preserve/$path"
-done
-
-for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do
- rm -R "$path"
-done
-
-# re-create the to-be-preserved files
-cp -a .preserve/* ./
-rm -Rf .preserve/
-
# remove files, that we do not want in the tarballs (build cruft)
rm -Rf nx*/configure nx*/autom4te.cache*
diff --git a/debian/rules b/debian/rules
index 099050b..b8e4ad4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,6 @@ export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARC
%:
CONFIGURE="./configure --with-symbols --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR)" dh $@ --with quilt
-# before build, we will remove unused code / bundled libraries (keep this in sync with roll-tarball.sh)
-UNUSED_FOLDERS = "debian/CODE-REDUCTION_CLEANUP-UNUSED"
-CLEANUP_FOLDERS = "debian/CODE-REDUCTION_CLEANUP-BRUTAL"
-UNNEEDED_BACKUPS = "debian/CODE-REDUCTION_CLEANUP-BACKUPFILES"
-PRESERVE_SYMLINKED_FILES = "debian/CODE-REDUCTION_PRESERVE-SYMLINKED"
-PRESERVE_NEEDED_FILES = "debian/CODE-REDUCTION_PRESERVE-NEEDED"
-PRESERVE_INCLUDED_FILES = "debian/CODE-REDUCTION_PRESERVE-INCLUDED"
-
override_dh_auto_clean:
rm -Rf nx-X11/.build-exports
dh_auto_clean
@@ -121,24 +113,6 @@ override_dh_auto_build:
# let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable
sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst
- # make a copy of code to be preserved for build
- mkdir -p .preserve
- for path in `cat $(PRESERVE_SYMLINKED_FILES)` `cat $(PRESERVE_NEEDED_FILES)` `cat $(PRESERVE_INCLUDED_FILES)`; do \
- if echo $$path | grep -E "^#.*"; then continue; fi; \
- test -d $$path && mkdir -p .preserve/$$path || mkdir -p .preserve/$$(dirname $$path); \
- cp -av $$path .preserve/$$path; \
- done
-
- # remove unused code / bundled libraries (see at the top of the debian/rules file)
- # for the exact list of files and folders
- rm -Rf `cat $(UNUSED_FOLDERS)`
- rm -Rf `cat $(CLEANUP_FOLDERS)`
- rm -Rf `cat $(UNNEEDED_BACKUPS)`
-
- # copy to-be-preserved files back into code tree
- cp -av .preserve/* .
- rm -Rf .preserve/
-
LOCAL_LDFLAGS=$(LDFLAGS) SHLIBGLOBALSFLAGS=$(LDFLAGS) SHLIBDIR=$(LIBDIR) PREFIX=/usr dh_auto_build --parallel
override_dh_strip:
diff --git a/nx-libs.spec b/nx-libs.spec
index 93549d9..0085221 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -672,32 +672,6 @@ cp -v debian/x2goagent.keyboard etc/x2goagent.keyboard
cp -v debian/VERSION VERSION.x2goagent
cp -v debian/VERSION nxcomp/VERSION
-### remove bundled libraries (also taken from roll-tarball.sh)
-UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED`
-CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL`
-UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES`
-PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED`
-PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED`
-PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED`
-mkdir -p .preserve/
-for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do
- if [ ! -d $path ]; then
- path_dirname=$(dirname "$path")
- else
- path_dirname="$path"
- fi
- mkdir -vp ".preserve/$path_dirname"
- cp -av "$path" ".preserve/$path"
-done
-for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do
- rm -R "$path"
-done
-
-# re-create the to-be-preserved files
-cp -a .preserve/* ./
-rm -Rf .preserve/
-### end of remove bundle libraries
-
# remove build cruft that is in Git (also taken from roll-tarball.sh)
rm -Rf nx*/configure nx*/autom4te.cache*
# Install into /usr
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list