On 14.02.2015 05:47 PM, git-admin@x2go.org wrote:
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 902dc519d96be582088e5fe0644cefac7ecc0133 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 14 15:58:11 2015 +0100
Move COPYING.full+lite as COPYING to / Adapted packaging scripts: debian/roll-tarballs.sh nx-libs.spec
debian/COPYING.full+lite => COPYING | 0 debian/roll-tarballs.sh | 1 - nx-libs.spec | 11 +++++++---- 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/debian/COPYING.full+lite b/COPYING similarity index 100% rename from debian/COPYING.full+lite rename to COPYING diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index fcb8367..c7cac5f 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -96,7 +96,6 @@ else echo ${file##*/} >> doc/applied-patches/series done fi -cp -v debian/COPYING.full+lite COPYING
# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then diff --git a/nx-libs.spec b/nx-libs.spec index 5c1064f..f4084d9 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -768,7 +768,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files %defattr(-,root,root) -%doc nx-X11/{COPYING,LICENSE,README} +%doc COPYING +%doc nx-X11/README
Have you removed LICENSE by accident or was that intended?
%dir %{_libdir}/nx %dir %{_libdir}/nx/X11 %dir %{_datadir}/nx @@ -913,7 +914,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files -n libXcomp3 %defattr(-,root,root) -%doc nxcomp/{COPYING,LICENSE,README} +%doc COPYING +%doc nxcomp/README
Same here.
%_libdir/libXcomp.so.3*
%files -n libXcompext-devel @@ -924,7 +926,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files -n libXcompext3 %defattr(-,root,root) -%doc nxcompext/{COPYING,LICENSE,README} +%doc COPYING +%doc nxcompext/README
Same here.
%_libdir/libXcompext.so.3*
%files -n libXcompshad-devel @@ -944,7 +947,7 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files -n libXcompshad3 %defattr(-,root,root) -%doc nxcompshad/{COPYING,LICENSE} +%doc COPYING
Same here.
Hi Mihai, On So 15 Feb 2015 19:48:49 CET, Mihai Moldovan wrote:
On 14.02.2015 05:47 PM, git-admin@x2go.org wrote:
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 902dc519d96be582088e5fe0644cefac7ecc0133 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 14 15:58:11 2015 +0100
Move COPYING.full+lite as COPYING to / Adapted packaging scripts: debian/roll-tarballs.sh nx-libs.spec
debian/COPYING.full+lite => COPYING | 0 debian/roll-tarballs.sh | 1 - nx-libs.spec | 11 +++++++---- 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/debian/COPYING.full+lite b/COPYING similarity index 100% rename from debian/COPYING.full+lite rename to COPYING diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index fcb8367..c7cac5f 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -96,7 +96,6 @@ else echo ${file##*/} >> doc/applied-patches/series done fi -cp -v debian/COPYING.full+lite COPYING
# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then diff --git a/nx-libs.spec b/nx-libs.spec index 5c1064f..f4084d9 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -768,7 +768,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files %defattr(-,root,root) -%doc nx-X11/{COPYING,LICENSE,README} +%doc COPYING +%doc nx-X11/README
Have you removed LICENSE by accident or was that intended?
%dir %{_libdir}/nx %dir %{_libdir}/nx/X11 %dir %{_datadir}/nx @@ -913,7 +914,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files -n libXcomp3 %defattr(-,root,root) -%doc nxcomp/{COPYING,LICENSE,README} +%doc COPYING +%doc nxcomp/README
Same here.
%_libdir/libXcomp.so.3*
%files -n libXcompext-devel @@ -924,7 +926,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files -n libXcompext3 %defattr(-,root,root) -%doc nxcompext/{COPYING,LICENSE,README} +%doc COPYING +%doc nxcompext/README
Same here.
%_libdir/libXcompext.so.3*
%files -n libXcompshad-devel @@ -944,7 +947,7 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files -n libXcompshad3 %defattr(-,root,root) -%doc nxcompshad/{COPYING,LICENSE} +%doc COPYING
Same here.
This is work not yet finished. I have it on my agenda to create a complete debian/copyright file. When that is done, I may re-add various license files. Note, that I only removed the full-text LICENSE files from the .spec files. Not sure about RPM distros, but in Debian full-text license files are normally shipped by the distro somewhere (/usr/share/common-licenses). Ping me, if you think they should be re-added for nx* subdirs. For nx-X11, the licensing is everything other than simple and I have a FIXME in the back of my head for that. Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
On 16.02.2015 04:59 AM, Mike Gabriel wrote:
This is work not yet finished. I have it on my agenda to create a complete debian/copyright file.
When that is done, I may re-add various license files.
OK. It just looked somewhat "forgotten", that's why I brought it up.
Note, that I only removed the full-text LICENSE files from the .spec files. Not sure about RPM distros, but in Debian full-text license files are normally shipped by the distro somewhere (/usr/share/common-licenses).
I guess that's true for RPM-based distros as well, but I'm not sure.
Ping me, if you think they should be re-added for nx* subdirs. For nx-X11, the licensing is everything other than simple and I have a FIXME in the back of my head for that.
No, I suppose it's all fine for now.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Am 16.02.2015 um 05:25 schrieb Mihai Moldovan:
Ping me, if you think they should be re-added for nx* subdirs. For nx-X11, the licensing is everything other than simple and I have a FIXME in the back of my head for that. No, I suppose it's all fine for now.
/me suggests committing that FIXME to a publicly available storage medium (Git, Wiki, whatever), just in case.
- -Stefan
BAUR-ITCS UG (haftungsbeschränkt) Geschäftsführer: Stefan Baur Eichenäckerweg 10, 89081 Ulm | Registergericht Ulm, HRB 724364 Fon/Fax 0731 40 34 66-36/-35 | USt-IdNr.: DE268653243 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32)
iQEbBAEBAgAGBQJU4bdNAAoJEG7d9BjNvlEZkfYH92q8HNxV1+al73+pQHXgfNE2 HvgUGqvwVwWmKVN4VSuv9vZViI1xNhZylgBIK8nM86N1oYmvR718V1UQKUXqMGaj iYxhD338JEXwsl6T3sGByOpz2NQ2Ox5nfJ6CWQC/lQEOc1/5/wDiBg3rEnzlkMI8 fP/KQlJKbeiWlX2O5+pP4k15z6zmKg+YSgAOhuYK8DbqZB4BLWPzBywmvS4Y3gnY 5j1Rx97+KML834SpsJlZaiOjXNhwoOafV9BV0jwYpdr7WcsbmTdWLM3fgR0mE/sZ +pAFLZs4VlxdaHpU90+n6vHsYOQwdlbQlHZuJmlFA3iu8z/dXeXeWDFMr9QfCQ== =qPOC -----END PGP SIGNATURE-----
On Mo 16 Feb 2015 10:24:30 CET, Stefan Baur wrote:
Am 16.02.2015 um 05:25 schrieb Mihai Moldovan:
Ping me, if you think they should be re-added for nx* subdirs. For nx-X11, the licensing is everything other than simple and I have a FIXME in the back of my head for that. No, I suppose it's all fine for now.
/me suggests committing that FIXME to a publicly available storage medium (Git, Wiki, whatever), just in case.
Done!
https://github.com/ArcticaProject/nx-libs/issues/2
Mike
DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
-
Mihai Moldovan -
Mike Gabriel -
Stefan Baur