[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-16-g1ac043b

[X2Go dev team]

The branch, master has been updated
       via  1ac043b9402b96d6dd58d15a5b17a6039c97ac45 (commit)
      from  1061630f1cc0e65914353bfc18f9461338ef318c (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 -----------------------------------------------------------------
commit 1ac043b9402b96d6dd58d15a5b17a6039c97ac45
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 7 22:11:17 2013 +0100

    debian/rules: Remove bundled libraries from source tree before building the package.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |   10 ++++++----
 debian/rules     |    7 +++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0c19fd2..55c7287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,6 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * Add patch 604_nx-X11_recent-freetype-API.full.patch. Fix FTBFS against
     recent (>= 2.5.0) libfreetype6 API.
-  * debian/source/format:
-    + Switch to format 1.0.
-  * debian/control:
-    + Add libfreetype6-dev to Build-Depends: field.
   * Refresh patch: 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch.
   * Improve patch:
     601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch.
@@ -20,6 +16,12 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low
     libraries.
   * Rename patch: 302_nxagent_configurable-keystrokes.full.patch to
     320_nxagent_configurable-keystrokes.full.patch.
+  * debian/source/format:
+    + Switch to format 1.0.
+  * debian/control:
+    + Add libfreetype6-dev to Build-Depends: field.
+  * debian/rules:
+    + Remove bundled libraries from source tree before building the package.
   * nx-libs.spec:
     + Ship nx-libs.spec (RPM package definitions) in upstream project. (Thanks
       to the Fedora package maintainers). File differs from the Fedora file
diff --git a/debian/rules b/debian/rules
index d8315b4..c6bc4b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ override_dh_auto_install:
 	PREFIX=/usr dh_auto_install -Smakefile
 
 override_dh_auto_build:
+
 	# create copies of upstream changelogs so that names apply to Debian policy...
 	cp -a nx-X11/CHANGELOG nx-X11/changelog
 	cp -a nxcomp/CHANGELOG nxcomp/changelog
@@ -42,6 +43,12 @@ override_dh_auto_build:
 	ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg
 	ln -s debian/rgb
 	ln -s debian/VERSION.x2goagent
+
+	# remove bundled libraries (keep this in sync with roll-tarball.sh)
+	rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib}
+	rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib}
+	rm -Rf nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu}
+
 	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel
 
 override_dh_strip:


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

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 "nx-libs.git" (NX (redistributed)).