[X2go-Commits] nxcomp.git - build-main (branch) updated: 3.4.0.8
X2go dev team
git-admin at x2go.org
Thu Jun 30 15:16:53 CEST 2011
The branch, build-main has been updated
via f5184235e876daa03239e0ae792cea8569f1dcfc (commit)
via 646d5956c3d7086ec1413f02dbd071e68c05bb2d (commit)
via e68eb741185043be2d9b01439285f105d1c3227e (commit)
via d19f310b0b37fa8088961fc07738fd39e5a4d2a9 (commit)
via 8d45c2a3ede4c862d773e4cde460f8116df05d4c (commit)
via 1a490a3606d69ba0cfa00e9d79b40e63943f0734 (commit)
via 597dc35e6d0fc7ef22785d729fd7e0078db9e94e (commit)
via 33eccd6a4ae8ab482cda7aafd93d776765f56501 (commit)
via 16c5796c42d48192879cfc2d265068580128e354 (commit)
via 271f827aeade9fcaf65ee392180c073bba7bcfb0 (commit)
via ed9b0b89b569b96212aa4da0788c0db7ad23d5d4 (commit)
via 41ee6fd4a7663a38b3869e85cb8dedd86a801ef4 (commit)
via 03aafc0e3e7c63e29057cde6c2472da9411f4164 (commit)
from 602cae506bec57b4ee86fc5ffa884cfba4c90c46 (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:
CHANGELOG | 4 ++++
INSTALL | 32 ++++++++++++++++++++++++++++++++
Loop.cpp | 4 ++--
Makefile.in | 35 ++++++++++++++++++++++++++++++++++-
VERSION | 2 +-
debian/changelog | 10 ++++++++++
debian/control | 18 ++++++++++--------
debian/rules | 1 +
debian/watch | 3 ---
9 files changed, 94 insertions(+), 15 deletions(-)
create mode 100644 INSTALL
delete mode 100644 debian/watch
The diff of changes is:
diff --git a/CHANGELOG b/CHANGELOG
index 1995dd7..bc6adb3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
ChangeLog:
+nxcomp-3.4.0.8
+
+- Providing make install/uninstall functionality
+
nxcomp-3.4.0.7
- Change of version numbering scheme, upstream maintained by X2go project now
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..5440d6b
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,32 @@
+Installing NX libs from Tarball
+===============================
+
+1. DOWNLOAD
+-----------
+Download NX lib tarball (nxcomp, nxcompext, nxcompshad)
+
+2. EXTRACTION
+-------------
+Extract the tarball
+
+$ tar vzxf nxcomp..._version.tar.gz
+
+3. BUILD
+--------
+Run the following commands for building from source
+
+$ autoconf
+$ ./configure
+$ make
+
+4. INSTALL
+----------
+For installation:
+
+$ sudo make install
+
+5. UNINSTALL
+------------
+For deinstallation
+
+$ sudo make uninstall
diff --git a/Loop.cpp b/Loop.cpp
index 92b6fc2..ba54d38 100644
--- a/Loop.cpp
+++ b/Loop.cpp
@@ -5895,7 +5895,7 @@ void InstallSignal(int signal, int action)
#if defined(__linux__)
- newAction.sa_restorer = NULL;
+ memset(&newAction, NULL, sizeof(newAction));
#endif
@@ -6513,7 +6513,7 @@ void SetTimer(int value)
#if defined(__linux__)
- action.sa_restorer = NULL;
+ memset(&action, NULL, sizeof(action));
#endif
diff --git a/Makefile.in b/Makefile.in
index 434118b..b86a816 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,6 +68,9 @@ VPATH = @srcdir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LINK = cp -av
+DESTDIR =
+RM_FILE = rm -f
#
# This should be autodetected.
@@ -264,12 +267,42 @@ depend.status:
fi
touch depend.status
-install: install.bin install.man
+install: install.bin install.lib install.man
install.bin:
+install.lib: all
+ $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)$(prefix)/lib
+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)$(prefix)/lib
+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)$(prefix)/lib
+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)$(prefix)/lib
+ $(INSTALL_DATA) NX*.h $(DESTDIR)$(prefix)/include
+ $(INSTALL_DATA) MD5.h $(DESTDIR)$(prefix)/include
+ echo "Running ldconfig tool, this may take a while..." && ldconfig
+
install.man:
+uninstall: uninstall.bin uninstall.lib uninstall.man
+
+uninstall.bin:
+
+uninstall.lib:
+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/libXcomp.so.3.*
+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/libXcomp.so.3
+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/libXcomp.so
+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/libXcomp.a
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/NXalert.h
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/NX.h
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/NXmitshm.h
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/NXpack.h
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/NXproto.h
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/NXrender.h
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/NXvars.h
+ $(RM_FILE) $(DESTDIR)$(prefix)/include/MD5.h
+ echo "Running ldconfig tool, this may take a while..." && ldconfig
+
+uninstall.man:
+
clean:
-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
@ALL@
diff --git a/VERSION b/VERSION
index faf9574..ffc9bea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.0.7
+3.4.0.8
diff --git a/debian/changelog b/debian/changelog
index 8282230..1aa52c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nxcomp (3.4.0.8-0~x2go1) unstable; urgency=low
+
+ * New upstream version:
+ - providing make install/uninstall functionlity
+ * lintian issue cleanup
+ * apply Debian's sa_restorer patch
+ * drop build-dep on libstdc++-dev (virtual only and not necessary)
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 23 May 2011 21:01:42 +0200
+
nxcomp (3.4.0.7-0~x2go1) unstable; urgency=low
* Change of version numbering scheme, code maintained by X2go project now
diff --git a/debian/control b/debian/control
index 1611f7a..83f2d63 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,24 @@
Source: nxcomp
+Section: x11
Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
-XSBC-Original-Maintainer: Matthew Johnson <mjj29 at debian.org>
+Maintainer: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+Uploaders:
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Build-Depends:
autoconf,
automake,
dh-autoreconf,
- debhelper (>=7),
+ debhelper (>=7.0.50~),
libjpeg-dev,
libpng-dev,
- libstdc++-dev,
x11proto-core-dev,
zlib1g-dev
-Standards-Version: 3.8.4
-Section: x11
+Standards-Version: 3.9.2
+Homepage: http://code.x2go.org/releases/source/nxcomp
+Vcs-Git: git://code.x2go.org/nxcomp.git
+Vcs-Browser: http://code.x2go.org/gitweb?p=nxcomp.git;a=summary
Package: libxcomp3
-Section: x11
Architecture: any
Depends:
${shlibs:Depends},
@@ -32,7 +34,7 @@ Architecture: any
Depends:
libxcomp3 (= ${binary:Version}),
${misc:Depends}
-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.
diff --git a/debian/rules b/debian/rules
index 0a0ce8b..922b9bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,4 @@
%:
dh --with autoreconf --parallel $@
+override_dh_auto_install:
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 75f2491..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.nomachine.com/sources.php \
- http://[^"]*/nxcomp-([\d\.-]*)\.tar\.gz
hooks/post-receive
--
nxcomp.git (NX comp library)
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 "nxcomp.git" (NX comp library).
More information about the x2go-commits
mailing list