This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch master in repository naga.
commit c7007867d7c4342ff8b69fec201348592eb15b70 Author: Ximin Luo <[email protected]> Date: Sat Oct 22 01:16:26 2016 +0200 Update packaging to 3.0+svn80-1 --- debian/README.source | 4 +- debian/changelog | 6 +- debian/compat | 2 +- debian/control | 14 +- debian/copyright | 72 +- debian/gbp.conf | 2 + debian/patches/copyright_boilerplate.patch | 938 ----------------------- debian/patches/dont-increment-build-number.patch | 10 + debian/patches/series | 2 +- debian/rules | 9 +- debian/svn-restore.sh | 11 + debian/version.properties | 5 - 12 files changed, 69 insertions(+), 1006 deletions(-) diff --git a/debian/README.source b/debian/README.source index 6ab9bc2..3371e18 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,5 +1,5 @@ naga for Debian --------------- -The original tarball has been produced from the upstream subversion repository, -revision 57. +The upstream part of this Debian git repository for naga was produced using the +svn-restore.sh script in this directory, from Google Code archives. diff --git a/debian/changelog b/debian/changelog index 443d764..2f3de29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -naga (2.1-4) UNRELEASED; urgency=low +naga (3.0+svn80-1) UNRELEASED; urgency=low - * + * Import svn revision 80 from Google Code SVN dump. - -- Michael Banck <[email protected]> Sat, 10 Mar 2012 10:58:43 +0100 + -- Ximin Luo <[email protected]> Sat, 22 Oct 2016 00:58:37 +0200 naga (2.1-3) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index fb18312..f286ac5 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,12 @@ Source: naga Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Michael Banck <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, default-jdk -Standards-Version: 3.9.3 -Homepage: http://code.google.com/p/naga/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/naga -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/naga -DM-Upload-Allowed: yes - +Uploaders: Michael Banck <[email protected]>, Ximin Luo <[email protected]> +Build-Depends: debhelper (>= 9), javahelper, ant, default-jdk +Standards-Version: 3.9.8 +Homepage: https://code.google.com/p/naga/ +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/naga.git/ +Vcs-Git: https://anonscm.debian.org/git/pkg-java/naga.git/ Package: libnaga-java Architecture: all diff --git a/debian/copyright b/debian/copyright index ff5838f..950262e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,41 +1,31 @@ -This work was packaged for Debian by: - - Michael Banck <[email protected]> on Sun, 30 Oct 2011 21:01:43 +0100 - -It was downloaded from: - - http://code.google.com/p/naga/ - -Upstream Author: - - Christoffer Lerno - -Copyright: - - Copyright (C) 2008-2011 Christoffer Lerno - -License: MIT License - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - -The Debian packaging is: - - Copyright (C) 2011 Michael Banck <[email protected]> - -and is licensed under the MIT license (see above) as well. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Naga +Source: https://code.google.com/p/naga/ + +Files: * +Copyright: 2008-2011 Christoffer Lerno +License: Expat + +Files: debian/* +Copyright: 2011-2012 Michael Banck <[email protected]> + 2016 Ximin Luo <[email protected]> +License: Expat + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..2860f9b --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = False diff --git a/debian/patches/copyright_boilerplate.patch b/debian/patches/copyright_boilerplate.patch deleted file mode 100644 index 71d489d..0000000 --- a/debian/patches/copyright_boilerplate.patch +++ /dev/null @@ -1,938 +0,0 @@ -Index: naga-2.1/src/main/naga/SocketObserver.java -=================================================================== ---- naga-2.1.orig/src/main/naga/SocketObserver.java 2011-11-01 14:12:03.936502922 +0100 -+++ naga-2.1/src/main/naga/SocketObserver.java 2011-11-01 14:12:20.280506780 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - /** -Index: naga-2.1/src/main/naga/SocketObserverAdapter.java -=================================================================== ---- naga-2.1.orig/src/main/naga/SocketObserverAdapter.java 2011-11-01 14:12:03.944504500 +0100 -+++ naga-2.1/src/main/naga/SocketObserverAdapter.java 2011-11-01 14:12:20.284506731 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - /** -Index: naga-2.1/src/main/naga/SocketChannelResponder.java -=================================================================== ---- naga-2.1.orig/src/main/naga/SocketChannelResponder.java 2011-11-01 14:12:03.876503656 +0100 -+++ naga-2.1/src/main/naga/SocketChannelResponder.java 2011-11-01 14:12:20.284506731 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import naga.packetreader.RawPacketReader; -Index: naga-2.1/src/main/naga/PacketWriter.java -=================================================================== ---- naga-2.1.orig/src/main/naga/PacketWriter.java 2011-11-01 14:12:03.860502454 +0100 -+++ naga-2.1/src/main/naga/PacketWriter.java 2011-11-01 14:12:20.284506731 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.nio.ByteBuffer; -Index: naga-2.1/src/main/naga/NIOUtils.java -=================================================================== ---- naga-2.1.orig/src/main/naga/NIOUtils.java 2011-11-01 14:12:04.120504012 +0100 -+++ naga-2.1/src/main/naga/NIOUtils.java 2011-11-01 14:12:20.284506731 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.io.IOException; -Index: naga-2.1/src/main/naga/NIOService.java -=================================================================== ---- naga-2.1.orig/src/main/naga/NIOService.java 2011-11-01 14:12:04.100503979 +0100 -+++ naga-2.1/src/main/naga/NIOService.java 2011-11-01 14:12:20.288503610 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.io.IOException; -Index: naga-2.1/src/main/naga/exception/ProtocolViolationException.java -=================================================================== ---- naga-2.1.orig/src/main/naga/exception/ProtocolViolationException.java 2011-11-01 14:12:03.868503754 +0100 -+++ naga-2.1/src/main/naga/exception/ProtocolViolationException.java 2011-11-01 14:12:20.288503610 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.exception; - - import java.io.IOException; -Index: naga-2.1/src/main/naga/ConnectionAcceptor.java -=================================================================== ---- naga-2.1.orig/src/main/naga/ConnectionAcceptor.java 2011-11-01 14:12:04.048503223 +0100 -+++ naga-2.1/src/main/naga/ConnectionAcceptor.java 2011-11-01 14:12:20.288503610 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.net.InetSocketAddress; -Index: naga-2.1/src/main/naga/NIOAbstractSocket.java -=================================================================== ---- naga-2.1.orig/src/main/naga/NIOAbstractSocket.java 2011-11-01 14:12:04.032503978 +0100 -+++ naga-2.1/src/main/naga/NIOAbstractSocket.java 2011-11-01 14:12:20.288503610 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.net.InetSocketAddress; -Index: naga-2.1/src/main/naga/NIOServerSocket.java -=================================================================== ---- naga-2.1.orig/src/main/naga/NIOServerSocket.java 2011-11-01 14:12:04.040502763 +0100 -+++ naga-2.1/src/main/naga/NIOServerSocket.java 2011-11-01 14:12:20.288503610 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.net.ServerSocket; -Index: naga-2.1/src/main/naga/eventmachine/DelayedAction.java -=================================================================== ---- naga-2.1.orig/src/main/naga/eventmachine/DelayedAction.java 2011-11-01 14:12:03.888506023 +0100 -+++ naga-2.1/src/main/naga/eventmachine/DelayedAction.java 2011-11-01 14:12:20.292501606 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.eventmachine; - - import java.util.Date; -Index: naga-2.1/src/main/naga/eventmachine/EventMachine.java -=================================================================== ---- naga-2.1.orig/src/main/naga/eventmachine/EventMachine.java 2011-11-01 14:12:03.896503970 +0100 -+++ naga-2.1/src/main/naga/eventmachine/EventMachine.java 2011-11-01 14:12:20.292501606 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.eventmachine; - - import naga.NIOService; -Index: naga-2.1/src/main/naga/eventmachine/DelayedEvent.java -=================================================================== ---- naga-2.1.orig/src/main/naga/eventmachine/DelayedEvent.java 2011-11-01 14:12:03.912502936 +0100 -+++ naga-2.1/src/main/naga/eventmachine/DelayedEvent.java 2011-11-01 14:12:20.292501606 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.eventmachine; - - /** -Index: naga-2.1/src/main/naga/ServerSocketObserver.java -=================================================================== ---- naga-2.1.orig/src/main/naga/ServerSocketObserver.java 2011-11-01 14:12:03.956502677 +0100 -+++ naga-2.1/src/main/naga/ServerSocketObserver.java 2011-11-01 14:12:20.292501606 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.io.IOException; -Index: naga-2.1/src/main/naga/ServerSocketObserverAdapter.java -=================================================================== ---- naga-2.1.orig/src/main/naga/ServerSocketObserverAdapter.java 2011-11-01 14:12:03.920505911 +0100 -+++ naga-2.1/src/main/naga/ServerSocketObserverAdapter.java 2011-11-01 14:12:20.292501606 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.io.IOException; -Index: naga-2.1/src/main/naga/PacketReader.java -=================================================================== ---- naga-2.1.orig/src/main/naga/PacketReader.java 2011-11-01 14:12:04.108503322 +0100 -+++ naga-2.1/src/main/naga/PacketReader.java 2011-11-01 14:12:20.292501606 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import naga.exception.ProtocolViolationException; -Index: naga-2.1/src/main/naga/ServerSocketChannelResponder.java -=================================================================== ---- naga-2.1.orig/src/main/naga/ServerSocketChannelResponder.java 2011-11-01 14:12:04.056502845 +0100 -+++ naga-2.1/src/main/naga/ServerSocketChannelResponder.java 2011-11-01 14:12:20.292501606 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.io.IOException; -Index: naga-2.1/src/main/naga/ChannelResponder.java -=================================================================== ---- naga-2.1.orig/src/main/naga/ChannelResponder.java 2011-11-01 14:12:03.928503578 +0100 -+++ naga-2.1/src/main/naga/ChannelResponder.java 2011-11-01 14:12:20.296509938 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.net.InetSocketAddress; -Index: naga-2.1/src/main/naga/NIOSocket.java -=================================================================== ---- naga-2.1.orig/src/main/naga/NIOSocket.java 2011-11-01 14:12:03.964504255 +0100 -+++ naga-2.1/src/main/naga/NIOSocket.java 2011-11-01 14:12:20.296509938 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga; - - import java.net.Socket; -Index: naga-2.1/src/main/naga/examples/Rot13Server.java -=================================================================== ---- naga-2.1.orig/src/main/naga/examples/Rot13Server.java 2011-11-01 14:12:03.972504436 +0100 -+++ naga-2.1/src/main/naga/examples/Rot13Server.java 2011-11-01 14:12:20.300504861 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.examples; - - import naga.*; -Index: naga-2.1/src/main/naga/examples/ValidationServer.java -=================================================================== ---- naga-2.1.orig/src/main/naga/examples/ValidationServer.java 2011-11-01 14:12:04.016504734 +0100 -+++ naga-2.1/src/main/naga/examples/ValidationServer.java 2011-11-01 14:12:20.300504861 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.examples; - - import naga.*; -Index: naga-2.1/src/main/naga/examples/EchoServer.java -=================================================================== ---- naga-2.1.orig/src/main/naga/examples/EchoServer.java 2011-11-01 14:12:03.976503270 +0100 -+++ naga-2.1/src/main/naga/examples/EchoServer.java 2011-11-01 14:12:20.300504861 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.examples; - - import naga.*; -Index: naga-2.1/src/main/naga/examples/ValidationClient.java -=================================================================== ---- naga-2.1.orig/src/main/naga/examples/ValidationClient.java 2011-11-01 14:12:04.024504356 +0100 -+++ naga-2.1/src/main/naga/examples/ValidationClient.java 2011-11-01 14:12:20.300504861 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.examples; - - import naga.NIOService; -Index: naga-2.1/src/main/naga/packetwriter/RegularPacketWriter.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetwriter/RegularPacketWriter.java 2011-11-01 14:12:03.844505164 +0100 -+++ naga-2.1/src/main/naga/packetwriter/RegularPacketWriter.java 2011-11-01 14:12:20.300504861 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.packetwriter; - - import naga.NIOUtils; -Index: naga-2.1/src/main/naga/packetwriter/RawPacketWriter.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetwriter/RawPacketWriter.java 2011-11-01 14:12:03.852503111 +0100 -+++ naga-2.1/src/main/naga/packetwriter/RawPacketWriter.java 2011-11-01 14:12:20.304508723 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.packetwriter; - - import naga.PacketWriter; -Index: naga-2.1/src/main/naga/eventmachine/ExceptionObserver.java -=================================================================== ---- naga-2.1.orig/src/main/naga/eventmachine/ExceptionObserver.java 2011-11-01 14:12:03.904503593 +0100 -+++ naga-2.1/src/main/naga/eventmachine/ExceptionObserver.java 2011-11-01 14:12:20.304508723 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.eventmachine; - - /** -Index: naga-2.1/src/main/naga/packetreader/RawPacketReader.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetreader/RawPacketReader.java 2011-11-01 14:12:03.764503624 +0100 -+++ naga-2.1/src/main/naga/packetreader/RawPacketReader.java 2011-11-01 14:12:20.304508723 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.packetreader; - - import naga.PacketReader; -Index: naga-2.1/src/main/naga/packetreader/DelimiterPacketReader.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetreader/DelimiterPacketReader.java 2011-11-01 14:12:03.772503806 +0100 -+++ naga-2.1/src/main/naga/packetreader/DelimiterPacketReader.java 2011-11-01 14:12:20.304508723 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.packetreader; - - import naga.PacketReader; -@@ -135,4 +156,4 @@ - } - return null; - } --} -\ No newline at end of file -+} -Index: naga-2.1/src/main/naga/packetreader/AsciiLinePacketReader.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetreader/AsciiLinePacketReader.java 2011-11-01 14:12:03.780503430 +0100 -+++ naga-2.1/src/main/naga/packetreader/AsciiLinePacketReader.java 2011-11-01 14:12:20.304508723 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.packetreader; - - /** -Index: naga-2.1/src/main/naga/packetreader/ZeroDelimitedPacketReader.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetreader/ZeroDelimitedPacketReader.java 2011-11-01 14:12:03.788505846 +0100 -+++ naga-2.1/src/main/naga/packetreader/ZeroDelimitedPacketReader.java 2011-11-01 14:12:20.304508723 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.packetreader; - - /** -Index: naga-2.1/src/main/naga/packetreader/RegularPacketReader.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetreader/RegularPacketReader.java 2011-11-01 14:12:03.796503794 +0100 -+++ naga-2.1/src/main/naga/packetreader/RegularPacketReader.java 2011-11-01 14:12:20.308506719 +0100 -@@ -1,3 +1,24 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - package naga.packetreader; - - import naga.NIOUtils; -Index: naga-2.1/src/main/naga/packetreader/package-info.java -=================================================================== ---- naga-2.1.orig/src/main/naga/packetreader/package-info.java 2011-11-01 14:12:03.808502809 +0100 -+++ naga-2.1/src/main/naga/packetreader/package-info.java 2011-11-01 14:12:20.308506719 +0100 -@@ -1,4 +1,25 @@ -+/* -+Copyright (c) 2008-2011 Christoffer Lernö -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+*/ - /** - * Package containing various ready-to-use {@code PacketReader} implementations. - */ --package naga.packetreader; -\ No newline at end of file -+package naga.packetreader; diff --git a/debian/patches/dont-increment-build-number.patch b/debian/patches/dont-increment-build-number.patch new file mode 100644 index 0000000..f2f9479 --- /dev/null +++ b/debian/patches/dont-increment-build-number.patch @@ -0,0 +1,10 @@ +--- a/build.xml ++++ b/build.xml +@@ -63,7 +63,6 @@ + </target> + + <target name="build" depends="compile, javadoc, create_manifest" description="Build jar"> +- <buildnumber file="version.properties"/> + <jar destfile="${dist.dir}/naga-no-em-${major.version}_${minor.version}.jar" + excludes="**/examples/**,**/eventmachine/**" + basedir="${build.classes.dir}" manifest="${build.classes.dir}/META-INF/MANIFEST.MF"/> diff --git a/debian/patches/series b/debian/patches/series index 9c44655..f226375 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -copyright_boilerplate.patch +dont-increment-build-number.patch diff --git a/debian/rules b/debian/rules index 6d5dcac..b55ee18 100755 --- a/debian/rules +++ b/debian/rules @@ -10,12 +10,7 @@ #export DH_VERBOSE=1 %: - dh --with javahelper $@ - -override_dh_auto_configure: - cp debian/version.properties $(CURDIR) - dh_auto_configure --with-javahelper + dh $@ --with javahelper override_dh_auto_clean: - rm -rf _BUILD _DIST version.properties - dh_clean + rm -rf _BUILD _DIST diff --git a/debian/svn-restore.sh b/debian/svn-restore.sh new file mode 100755 index 0000000..6891536 --- /dev/null +++ b/debian/svn-restore.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +DUMP=repo.svndump.gz +DUMPURL=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/naga/ + +wget -N "$DUMPURL/$DUMP" + +rm -rf naga.svn naga.git +svnadmin create naga.svn +zcat "$DUMP" | svnadmin load naga.svn +git svn clone -s --rewrite-root=https://naga.googlecode.com/svn file://$PWD/naga.svn naga.git diff --git a/debian/version.properties b/debian/version.properties deleted file mode 100644 index 869a3c5..0000000 --- a/debian/version.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Build Number for ANT. Do not edit! -#Sun Apr 25 09:31:26 CEST 2010 -build.number=42 -major.version=2 -minor.version=1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/naga.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
