The branch, master has been updated
via 54792fe297c0965c5c5d3a5db0280d064e2d7fa2 (commit)
from 7f7cb5d874a857ab59bef7427734d8edfcca85bd (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 54792fe297c0965c5c5d3a5db0280d064e2d7fa2
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 21:00:44 2012 +0100
another fix for the main Makefile
-----------------------------------------------------------------------
Summary of changes:
.../patches/001_add-main-makefile.full+lite.patch | 23 +++++++++++--------
1 files changed, 13 insertions(+), 10 deletions(-)
The diff of changes is:
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 7cd9321..f101446 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,11 +5,23 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Last-Update: 2011-12-31
--- /dev/null
+++ b/Makefile
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+
++%:
++ $(MAKE) -C nxcomp $@
++ $(MAKE) -C nxproxy $@
++ if test -d nx-X11; then \
++ $(MAKE) -C nxcompext $@; \
++ $(MAKE) -C nxcompshad; \
++ $(MAKE) -C nx-X11 $@; \
++ fi
++
+all: build
+
++test:
++ echo "No testing for NX (redistributed)"
++
+build-lite:
+ cd nxcomp && autoconf && ./configure && $(MAKE)
+ cd nxproxy && autoconf && ./configure && $(MAKE)
@@ -28,12 +40,3 @@ Last-Update: 2011-12-31
+ else \
+ $(MAKE) build-full; \
+ fi
-+
-+%:
-+ $(MAKE) -C nxcomp $@
-+ $(MAKE) -C nxproxy $@
-+ if test -d nx-X11; then \
-+ $(MAKE) -C nxcompext $@; \
-+ $(MAKE) -C nxcompshad; \
-+ $(MAKE) -C nx-X11 $@; \
-+ fi
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)).
[View Less]
The branch, master has been updated
via 7f7cb5d874a857ab59bef7427734d8edfcca85bd (commit)
from eb5ef91b6b940eb001d8acb95f6413560570c1a7 (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 7f7cb5d874a857ab59bef7427734d8edfcca85bd
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 16:39:58 2012 +0100
more simplification of the main Makefile
-----------------------------------------------------------------------
Summary of changes:
.../patches/001_add-main-makefile.full+lite.patch | 61 +++++++------------
1 files changed, 23 insertions(+), 38 deletions(-)
The diff of changes is:
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 9f4b8d1..7cd9321 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,50 +5,35 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Last-Update: 2011-12-31
--- /dev/null
+++ b/Makefile
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+all: build
+
-+build: build-arch build-indep
-+
-+clean:
-+ $(MAKE) -C nxcomp $@
-+ $(MAKE) -C nxproxy $@
-+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+
-+distclean:
-+ $(MAKE) -C nxcomp $@
-+ $(MAKE) -C nxproxy $@
-+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+
-+build-arch:
-+ if test -d nx-X11; then \
-+ cd nxcomp && autoconf; cd ..; \
-+ cd nxcompext && autoconf; cd ..; \
-+ cd nxcompshad && autoconf; cd ..; \
-+ cd nx-X11 && make World && cd ..; \
++build-lite:
++ cd nxcomp && autoconf && ./configure && $(MAKE)
++ cd nxproxy && autoconf && ./configure && $(MAKE)
++
++build-full:
++# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
++ cd nxcomp && autoconf && ./configure
++ cd nxcompext && autoconf
++ cd nxcompshad && autoconf
++ cd nx-X11 && $(MAKE) World
++ cd nxproxy && autoconf && ./configure && $(MAKE)
++
++build:
++ if ! test -d nx-X11; then \
++ $(MAKE) build-lite; \
+ else \
-+ cd nxcomp && autoconf && ./configure && make; cd ..; \
++ $(MAKE) build-full; \
+ fi
-+ cd nxproxy && autoconf && ./configure && make; cd ..
-+
-+build-indep:
+
-+install:
++%:
+ $(MAKE) -C nxcomp $@
+ $(MAKE) -C nxproxy $@
-+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+
-+uninstall:
-+ $(MAKE) -C nxcomp $@
-+ $(MAKE) -C nxproxy $@
-+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
++ if test -d nx-X11; then \
++ $(MAKE) -C nxcompext $@; \
++ $(MAKE) -C nxcompshad; \
++ $(MAKE) -C nx-X11 $@; \
++ fi
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)).
[View Less]
The branch, master has been updated
via eb5ef91b6b940eb001d8acb95f6413560570c1a7 (commit)
from 00b266b82503e8155e7195180f287df0392fb770 (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 eb5ef91b6b940eb001d8acb95f6413560570c1a7
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 16:19:36 2012 +0100
simplify main Makefile a little...
-----------------------------------------------------------------------
Summary of changes:
.../patches/001_add-main-makefile.full+lite.patch | 26 ++++++++++----------
1 files changed, 13 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 0adead1..9f4b8d1 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -13,42 +13,42 @@ Last-Update: 2011-12-31
+build: build-arch build-indep
+
+clean:
++ $(MAKE) -C nxcomp $@
++ $(MAKE) -C nxproxy $@
+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
+
+distclean:
++ $(MAKE) -C nxcomp $@
++ $(MAKE) -C nxproxy $@
+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
+
+build-arch:
+ if test -d nx-X11; then \
-+ if test -d nxcomp; then cd nxcomp && autoconf; cd ..; fi; \
-+ if test -d nxcompext; then cd nxcompext && autoconf; cd ..; fi; \
-+ if test -d nxcompshad; then cd nxcompshad && autoconf; cd ..; fi; \
++ cd nxcomp && autoconf; cd ..; \
++ cd nxcompext && autoconf; cd ..; \
++ cd nxcompshad && autoconf; cd ..; \
+ cd nx-X11 && make World && cd ..; \
+ else \
-+ if test -d nxcomp; then cd nxcomp && autoconf && ./configure && make; cd ..; fi; \
++ cd nxcomp && autoconf && ./configure && make; cd ..; \
+ fi
-+ if test -d nxproxy; then cd nxproxy && autoconf && ./configure && make; cd ..; fi
++ cd nxproxy && autoconf && ./configure && make; cd ..
+
+build-indep:
+
+install:
++ $(MAKE) -C nxcomp $@
++ $(MAKE) -C nxproxy $@
+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
+
+uninstall:
++ $(MAKE) -C nxcomp $@
++ $(MAKE) -C nxproxy $@
+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
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)).
[View Less]
The branch, master has been updated
via 00b266b82503e8155e7195180f287df0392fb770 (commit)
from f4ef2967b1495e5d9577a94610ee0be3e89ab870 (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 00b266b82503e8155e7195180f287df0392fb770
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 16:10:34 2012 +0100
Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, make build stanza work for nx-libs-full and nx-libs-lite.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +-
.../patches/001_add-main-makefile.full+lite.patch | 56 +++++++++++---------
2 files changed, 32 insertions(+), 27 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c56632c..012c7bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
- * Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories.
+ * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,
+ make build stanza work for nx-libs-full and nx-libs-lite.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 2d35e82..0adead1 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,7 +5,7 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Last-Update: 2011-12-31
--- /dev/null
+++ b/Makefile
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+
+all: build
@@ -13,38 +13,42 @@ Last-Update: 2011-12-31
+build: build-arch build-indep
+
+clean:
-+ -make -C nx-X11 $@
-+ -make -C nxcomp $@
-+ -make -C nxcompext $@
-+ -make -C nxcompshad $@
-+ -make -C nxproxy $@
++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
+
+distclean:
-+ -make -C nx-X11 $@
-+ -make -C nxcomp $@
-+ -make -C nxcompext $@
-+ -make -C nxcompshad $@
-+ -make -C nxproxy $@
++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
+
+build-arch:
-+ cd nxcomp && autoconf && ./configure && make
-+ -cd nxcompext && autoconf && ./configure && make
-+ -cd nxcompshad && autoconf && ./configure && make
-+ -cd nx-X11 && make World && ./configure && make
-+ cd nxproxy && autoconf && ./configure && make
++ if test -d nx-X11; then \
++ if test -d nxcomp; then cd nxcomp && autoconf; cd ..; fi; \
++ if test -d nxcompext; then cd nxcompext && autoconf; cd ..; fi; \
++ if test -d nxcompshad; then cd nxcompshad && autoconf; cd ..; fi; \
++ cd nx-X11 && make World && cd ..; \
++ else \
++ if test -d nxcomp; then cd nxcomp && autoconf && ./configure && make; cd ..; fi; \
++ fi
++ if test -d nxproxy; then cd nxproxy && autoconf && ./configure && make; cd ..; fi
+
+build-indep:
+
+install:
-+ -make -C nx-X11 $@
-+ -make -C nxcomp $@
-+ -make -C nxcompext $@
-+ -make -C nxcompshad $@
-+ -make -C nxproxy $@
++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
+
+uninstall:
-+ -make -C nx-X11 $@
-+ -make -C nxcomp $@
-+ -make -C nxcompext $@
-+ -make -C nxcompshad $@
-+ -make -C nxproxy $@
++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
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)).
[View Less]
The branch, master has been updated
via f4ef2967b1495e5d9577a94610ee0be3e89ab870 (commit)
from a751baaab83cc58245632e8fdb406e0b059810da (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 f4ef2967b1495e5d9577a94610ee0be3e89ab870
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 15:23:45 2012 +0100
Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
.../patches/001_add-main-makefile.full+lite.patch | 53 ++++++++++----------
2 files changed, 27 insertions(+), 28 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index eb3a582..c56632c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
- * Continue development...
+ * Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 533ce7e..2d35e82 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,7 +5,7 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Last-Update: 2011-12-31
--- /dev/null
+++ b/Makefile
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,42 @@
+#!/usr/bin/make -f
+
+all: build
@@ -13,39 +13,38 @@ Last-Update: 2011-12-31
+build: build-arch build-indep
+
+clean:
-+ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true
-+ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true
-+ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true
-+ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true
-+ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true
-+
++ -make -C nx-X11 $@
++ -make -C nxcomp $@
++ -make -C nxcompext $@
++ -make -C nxcompshad $@
++ -make -C nxproxy $@
+
+distclean:
-+ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true
-+ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true
-+ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true
-+ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true
-+ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true
++ -make -C nx-X11 $@
++ -make -C nxcomp $@
++ -make -C nxcompext $@
++ -make -C nxcompshad $@
++ -make -C nxproxy $@
+
+build-arch:
-+ test -d nxcomp && cd nxcomp && autoconf
-+ test -d nxcompext && cd nxcompext && autoconf
-+ test -d nxcompshad && cd nxcompshad && autoconf
-+ test -d nx-X11 && cd nx-X11 && make World
-+ test -d nxproxy && cd nxproxy && autoconf && ./configure && make
++ cd nxcomp && autoconf && ./configure && make
++ -cd nxcompext && autoconf && ./configure && make
++ -cd nxcompshad && autoconf && ./configure && make
++ -cd nx-X11 && make World && ./configure && make
++ cd nxproxy && autoconf && ./configure && make
+
+build-indep:
+
+install:
-+ test -d nxcomp && cd nxcomp && make install
-+ test -d nxcompext && cd nxcompext && make install
-+ test -d nxcompshad && cd nxcompshad && make install
-+ test -d nx-X11 && cd nx-X11 && make install
-+ test -d nxproxy && cd nxproxy && make install
++ -make -C nx-X11 $@
++ -make -C nxcomp $@
++ -make -C nxcompext $@
++ -make -C nxcompshad $@
++ -make -C nxproxy $@
+
+uninstall:
-+ test -d nxcomp && cd nxcomp && make uninstall
-+ test -d nxcompext && cd nxcompext && make uninstall
-+ test -d nxcompshad && cd nxcompshad && make uninstall
-+ test -d nx-X11 && cd nx-X11 && make uninstall
-+ test -d nxproxy && cd nxproxy && make uninstall
++ -make -C nx-X11 $@
++ -make -C nxcomp $@
++ -make -C nxcompext $@
++ -make -C nxcompshad $@
++ -make -C nxproxy $@
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)).
[View Less]
The branch, master has been updated
via a751baaab83cc58245632e8fdb406e0b059810da (commit)
from 419d505c907972b7823263a843e0de0a57b25b18 (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 a751baaab83cc58245632e8fdb406e0b059810da
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 13:48:36 2012 +0100
Continue development...
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9b1a540..eb3a582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
+
+ * Continue development...
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
+
nx-libs (2:3.5.0.10-0) unstable; urgency=low
* Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against
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)).
[View Less]
The branch, build-main has been updated
via 419d505c907972b7823263a843e0de0a57b25b18 (commit)
via 28acb2ea138f974452c7001e750f15e28aff2d37 (commit)
via 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (commit)
via 6ae5c16b8865d14ba034c836a76c7a059d8865c0 (commit)
via e326dd760e115dcb48f6823462a737039453a63c (commit)
via dbbbbc5ffaed61f5e04ad68045195df9a7e1f7ed (commit)
from 220c985d366883f4021cc9d84550cc630022f016 (commit)
Those revisions listed …
[View More]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:
debian/changelog | 9 ++++
debian/patches/006_nxcomp_libpng15.full+lite.patch | 43 ++++++++++++++++++
.../patches/008_nxcomp_sa_restorer.full+lite.patch | 46 ++++++++++++++++++++
debian/patches/series | 2 +
4 files changed, 100 insertions(+), 0 deletions(-)
create mode 100644 debian/patches/006_nxcomp_libpng15.full+lite.patch
create mode 100644 debian/patches/008_nxcomp_sa_restorer.full+lite.patch
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cf1715c..9b1a540 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nx-libs (2:3.5.0.10-0) unstable; urgency=low
+
+ * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against
+ libpng 1.5.x.
+ * Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a
+ version found on etersoft.ru, fixes build on ia64 architecture.
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:43:50 +0100
+
nx-libs (2:3.5.0.9-0) unstable; urgency=low
[ Mike Gabriel ]
diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch
new file mode 100644
index 0000000..a75c59b
--- /dev/null
+++ b/debian/patches/006_nxcomp_libpng15.full+lite.patch
@@ -0,0 +1,43 @@
+Description: Fix building against libpng 1.5.
+ From the libpng homepage...
+
+ The libpng 1.5.x series continues the evolution of the libpng API,
+ finally hiding the contents of the venerable and hoary png_struct and
+ png_info data structures inside private (i.e., non-installed) header
+ files. Instead of direct struct-access, applications should be using
+ the various png_get_xxx() and png_set_xxx() accessor functions, which
+ have existed for almost as long as libpng itself. (Apps that compiled
+ against libpng 1.4 without warnings about deprecated features should
+ happily compile against 1.5, too.
+Forwarded: pending...
+Author: Fedora packagers of NX
+Last-Update: 2012-02-06
+--- a/nxcomp/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200
++++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300
+@@ -414,7 +414,7 @@
+
+ png_read_info(pngPtr, infoPtr);
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -565,7 +565,7 @@
+
+ png_read_info( pngPtr, infoPtr ) ;
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -709,7 +709,7 @@
+ png_read_info(pngPtr, infoPtr) ;
+
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
diff --git a/debian/patches/008_nxcomp_sa_restorer.full+lite.patch b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch
new file mode 100644
index 0000000..f1447cc
--- /dev/null
+++ b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch
@@ -0,0 +1,46 @@
+Description: sa_restorer vs. memset
+ Use memset instead of setting sa_restorer to NULL.
+Forwarded: pending
+Author: Alexander Morozov
+Last-Update: 2012-02-07
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -5884,20 +5884,9 @@
+
+ struct sigaction newAction;
+
+- newAction.sa_handler = HandleSignal;
+-
+- //
+- // This field doesn't exist on most OSes except
+- // Linux. We keep setting the field to NULL to
+- // avoid side-effects in the case the field is
+- // a value return.
+- //
++ memset(&newAction, 0, sizeof(newAction));
+
+- #if defined(__linux__)
+-
+- newAction.sa_restorer = NULL;
+-
+- #endif
++ newAction.sa_handler = HandleSignal;
+
+ sigemptyset(&(newAction.sa_mask));
+
+@@ -6509,13 +6498,9 @@
+
+ struct sigaction action;
+
+- action.sa_handler = HandleTimer;
+-
+- #if defined(__linux__)
++ memset(&action, 0, sizeof(action));
+
+- action.sa_restorer = NULL;
+-
+- #endif
++ action.sa_handler = HandleTimer;
+
+ sigemptyset(&action.sa_mask);
+
diff --git a/debian/patches/series b/debian/patches/series
index d22f4b4..9133bf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,9 @@
003_nxcompshad_gcc43.full.patch
004_nx-x11_fix-nxcompshad-build.full.patch
005_nxcomp_gcc43.full+lite.patch
+006_nxcomp_libpng15.full+lite.patch
007_nxcompshad_clean-gch-files.full.patch
+008_nxcomp_sa_restorer.full+lite.patch
009_nxproxy-add-man-page.full+lite.patch
009_nxagent-add-man-page.full.patch
010_nxauth_fix-binary-name-in-man-page.full.patch
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)).
[View Less]
The branch, master has been updated
via 419d505c907972b7823263a843e0de0a57b25b18 (commit)
from 28acb2ea138f974452c7001e750f15e28aff2d37 (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 419d505c907972b7823263a843e0de0a57b25b18
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 13:44:21 2012 +0100
release 3.5.0.10
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 69bbf85..9b1a540 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-nx-libs (2:3.5.0.10-0) UNRELEASED; urgency=low
+nx-libs (2:3.5.0.10-0) unstable; urgency=low
* Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against
libpng 1.5.x.
* Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a
version found on etersoft.ru, fixes build on ia64 architecture.
- -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:48:31 +0100
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:43:50 +0100
nx-libs (2:3.5.0.9-0) unstable; urgency=low
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)).
[View Less]
The branch, master has been updated
via 28acb2ea138f974452c7001e750f15e28aff2d37 (commit)
from 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (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 28acb2ea138f974452c7001e750f15e28aff2d37
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Feb 7 13:37:16 2012 +0100
changelog fix (revision was missing)
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 59d305c..69bbf85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nx-libs (2:3.5.0.10) UNRELEASED; urgency=low
+nx-libs (2:3.5.0.10-0) UNRELEASED; urgency=low
* Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against
libpng 1.5.x.
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)).
[View Less]