[X2go-Commits] nx-libs.git - test (branch) updated: f72548d732a468ada1c7b65c4de1a0c10b20d3f1

X2go dev team git-admin at x2go.org
Wed Nov 9 10:37:22 CET 2011


The branch, test has been updated
       via  f72548d732a468ada1c7b65c4de1a0c10b20d3f1 (commit)
       via  82638706c3accdfd295bc72fd66e250b78472ad3 (commit)
       via  cd8d8dddb764af1bdf16631eb43a260e299fb6b9 (commit)
       via  3c61635f7f2f65dcdc91c35cee9a0c9d84986ace (commit)
      from  a2674ead27db49a0330e93854dcb350695df53be (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 f72548d732a468ada1c7b65c4de1a0c10b20d3f1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 9 10:37:18 2011 +0100

    add libnx-mesa-extras-dev package

commit 82638706c3accdfd295bc72fd66e250b78472ad3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 6 20:50:33 2011 +0100

    Use NX adapted LD_LIBRARY_PATH in debian/rules.

commit cd8d8dddb764af1bdf16631eb43a260e299fb6b9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 6 20:49:35 2011 +0100

    Enable dbg packages, fix descriptions in control file.

commit 3c61635f7f2f65dcdc91c35cee9a0c9d84986ace
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 6 20:49:06 2011 +0100

    Use version 2 for nx-libs package.

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

Summary of changes:
 debian/changelog                     |    3 +-
 debian/control                       |  113 +++++++++++++++-------------------
 debian/libnx-mesa-extras-dev.dirs    |    4 +
 debian/libnx-mesa-extras-dev.install |    3 +
 debian/libnx-x11-dev.install         |    2 +-
 debian/rules                         |    6 +-
 6 files changed, 63 insertions(+), 68 deletions(-)
 create mode 100644 debian/libnx-mesa-extras-dev.dirs
 create mode 100644 debian/libnx-mesa-extras-dev.install

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 53db794..4e2a734 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-nx-libs (3.5.0-0~x2go1) UNRELEASED; urgency=low
+nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
 
   * Initial release.
+  * Use NX adapted LD_LIBRARY_PATH in debian/rules.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/control b/debian/control
index be0c5b9..4bbdd7b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  libpng-dev,
  libjpeg-dev,
- zlib1g-dev,
+ zlib1g-dev
 Build-Conflicts:
  x11proto-core-dev,
  x11proto-kb-dev,
@@ -35,11 +35,20 @@ Architecture: any
 Depends:
  libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~),
  ${misc:Depends}
-Description: Development files for nx-X11 (NoMachine)
+Description: Library headers for nx-X11 (NoMachine)
  X11 libraries customized for nxagent (NoMachine).
  .
  This package provides the compression library headers.
 
+Package: libnx-mesa-extras-dev
+Section: libdevel
+Architecture: any
+Depends:
+ ${misc:Depends}
+Description: Library headers for nx-X11 (NoMachine. extra headers)
+ X11 libraries customized for nxagent (NoMachine).
+ .
+ This package provides extra compression library headers.
 
 Package: nxagent
 Architecture: any
@@ -70,7 +79,7 @@ Depends:
  ${misc:Depends}
 Priority: extra
 Section: debug
-Description: NX agent (NoMachine)
+Description: NX agent (NoMachine), debug symbols
  nxagent is an agent providing X transport of X sessions. The application
  is based on the well known Xnest "nested" server. nxagent, like Xnest,
  is an X server for its own clients, and at the same time, an X client
@@ -109,43 +118,22 @@ Depends:
  ${misc:Depends}
 Breaks: nxcomp-dev
 Replaces: nxcomp-dev
-Description: NX X compression library-headers
+Description: NX X compression library headers
  NX provides a differential X compression library for X11.
  .
  This package provides the compression library headers.
 
-#Package: libxcomp-dbg
-#Priority: extra
-#Section: debug
-#Architecture: any
-#Depends:
-# libxcomp3 (= ${binary:Version}),
-# ${misc:Depends}
-#Description: NX X compression debug symbols
-# NX provides a differential X compression library for X11.
-# .
-# This package provides debug symbols for the libxcomp3 library.
-
-#Package: x11proto-nx-dev
-#Architecture: any
-#Conflicts:
-# x11proto-core-dev,
-# x11proto-kb-dev,
-# x11proto-randr-dev,
-# x11proto-record-dev,
-# x11proto-xinerama-dev,
-# xbitmaps
-#Replaces:
-# x11proto-core-dev,
-# x11proto-kb-dev,
-# x11proto-randr-dev,
-# x11proto-record-dev,
-# x11proto-xinerama-dev,
-# xbitmaps
-#Description: NX X11 replacement library-headers
-# NX provides a differential X compression library for X11.
-# .
-# This package provides legacy X11 headers for internal NX use.
+Package: libxcomp-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends:
+ libxcomp3 (= ${binary:Version}),
+ ${misc:Depends}
+Description: NX X compression library, debug symbols
+ NX provides a differential X compression library for X11.
+ .
+ This package provides debug symbols for the libxcomp3 library.
 
 Package: libxcompext3
 Architecture: any
@@ -172,7 +160,7 @@ Depends:
  libxcomp-dev,
 Breaks: nxcompext-dev
 Replaces: nxcompext-dev
-Description: NX X11 protocol compression extensions library
+Description: NX X11 protocol compression extensions library headers
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
@@ -181,19 +169,19 @@ Description: NX X11 protocol compression extensions library
  .
  This package contains the development files for the nxcompext library.
 
-#Package: libxcompext-dbg
-#Architecture: any
-#Section: debug
-#Priority: extra
-#Depends:
-# libxcompext3 (= ${binary:Version}),
-# ${misc:Depends}
-#Description: NX X11 protocol compression extensions library
-# NX is a software suite from NoMachine which implements very efficient
-# compression of the X11 protocol. This increases performance when
-# using X applications over a network, especially a slow one.
-# .
-# This package contains the debug symbols for the libxcompext3 library.
+Package: libxcompext-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+ libxcompext3 (= ${binary:Version}),
+ ${misc:Depends}
+Description: NX X11 protocol compression extensions library, debug symbols
+ NX is a software suite from NoMachine which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package contains the debug symbols for the libxcompext3 library.
 
 Package: libxcompshad3
 Section: x11
@@ -219,22 +207,21 @@ Depends:
  ${misc:Depends}
 Breaks: nxcompshad-dev
 Replaces: nxcompshad-dev
-Description: NX shadowing library
+Description: NX shadowing library headers
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
  This package contains the development files for the nxcompshad library.
 
-#Package: libxcompshad-dbg
-#Section: debug
-#Priority: extra
-#Architecture: any
-#Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends}
-#Description: NX shadowing library
-# NX is a software suite from NoMachine which implements very efficient
-# compression of the X11 protocol. This increases performance when
-# using X applications over a network, especially a slow one.
-# .
-# This package contains the debug symbols of the libxcompshad3 library.
-
+Package: libxcompshad-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends}
+Description: NX shadowing library, debug symbols
+ NX is a software suite from NoMachine which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package contains the debug symbols of the libxcompshad3 library.
diff --git a/debian/libnx-mesa-extras-dev.dirs b/debian/libnx-mesa-extras-dev.dirs
new file mode 100644
index 0000000..dee5a72
--- /dev/null
+++ b/debian/libnx-mesa-extras-dev.dirs
@@ -0,0 +1,4 @@
+usr/include/nx/extras/Mesa/GL
+usr/include/nx/extras/Mesa/GL/internal
+usr/include/nx/extras/Mesa/GLES
+
diff --git a/debian/libnx-mesa-extras-dev.install b/debian/libnx-mesa-extras-dev.install
new file mode 100644
index 0000000..7a54b8f
--- /dev/null
+++ b/debian/libnx-mesa-extras-dev.install
@@ -0,0 +1,3 @@
+nx-X11/extras/Mesa/include/GL/*.h               usr/include/nx/extras/Mesa/GL/
+nx-X11/extras/Mesa/include/GL/internal/*.h      usr/include/nx/extras/Mesa/GL/internal/
+nx-X11/extras/Mesa/include/GLES/*.h             usr/include/nx/extras/Mesa/GLES/
diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install
index 3a29fcb..0855739 100644
--- a/debian/libnx-x11-dev.install
+++ b/debian/libnx-x11-dev.install
@@ -1,2 +1,2 @@
-nx-X11/.build-exports/include/*           usr/include/nx/X11
+nx-X11/.build-exports/include/*           usr/include/nx/
 
diff --git a/debian/rules b/debian/rules
index c74636b..ca53960 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,15 @@ else
 endif
 
 %:
-	dh $@
+	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@
 
 override_dh_auto_clean:
 	rm -Rf nx-X11/.build-exports
-	dh_auto_clean
+	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean
 
 override_dh_auto_build:
 	debian/pre-build-nx.sh
-	dh_auto_build
+	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build
 	debian/post-build-nx.sh
 
 override_dh_auto_install:


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

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 libraries).




More information about the x2go-commits mailing list