diff -Nru crossguid-0.0+git200150803/debian/changelog crossguid-0.1~git20150807.8f399e8~xenial/debian/changelog --- crossguid-0.0+git200150803/debian/changelog 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/changelog 2016-02-09 10:13:37.000000000 +0000 @@ -1,6 +1,11 @@ -crossguid (0.0+git200150803-1) unstable; urgency=medium +crossguid (0.1~git20150807.8f399e8~xenial) xenial; urgency=medium - * Initial release for Debian based on Christian Marillat's crossguid-dmo - package (Closes: #814087) + * port to xenial - -- Balint Reczey Sun, 07 Feb 2016 20:18:01 +0100 + -- wsnipex Mon, 09 Feb 2016 09:34:02 +0100 + +crossguid (0.1~git20150807.8f399e8) trusty; urgency=low + + * Initial Release, git: 8f399e8bd4252be9952f3dfa8199924cc8487ca4 + + -- wsnipex Fri, 07 Aug 2015 11:50:57 +0200 diff -Nru crossguid-0.0+git200150803/debian/control crossguid-0.1~git20150807.8f399e8~xenial/debian/control --- crossguid-0.0+git200150803/debian/control 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/control 2015-08-07 12:18:49.000000000 +0000 @@ -1,23 +1,22 @@ Source: crossguid -Section: libs Priority: optional -Maintainer: Christian Marillat -Uploaders: Balint Reczey , -Homepage: https://github.com/graeme-hill/crossguid -Standards-Version: 3.9.7 +Maintainer: wsnipex Build-Depends: debhelper (>= 9), uuid-dev +Standards-Version: 3.9.5 +Section: libs +Homepage: https://github.com/graeme-hill/crossguid +Vcs-Git: https://github.com/graeme-hill/crossguid Package: libcrossguid-dev Section: libdevel Architecture: any -Multi-Arch: same -Depends: libcrossguid0 (= ${binary:Version}), ${misc:Depends} -Description: C++ UUID library headers - Development headers for Graeme Hill's cross platform C++ UUID library. +Depends: libcrossguid1 (= ${binary:Version}), ${misc:Depends} +Description: cross platform UUID library headers + Development headers for Graeme Hill's cross platform UUID library -Package: libcrossguid0 +Package: libcrossguid1 Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ UUID library - Graeme Hill's cross platform C++ UUID library. +Description: cross platform UUID library + Graeme Hill's cross platform UUID library diff -Nru crossguid-0.0+git200150803/debian/copyright crossguid-0.1~git20150807.8f399e8~xenial/debian/copyright --- crossguid-0.0+git200150803/debian/copyright 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/copyright 2015-08-07 11:55:40.000000000 +0000 @@ -1,10 +1,16 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: crossguid Source: https://github.com/graeme-hill/crossguid Files: * Copyright: 2014 Graeme Hill -License: Expat +License: MIT + +Files: debian/* +Copyright: 2015 wuff +License: GPLv2 + +License: MIT 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 @@ -23,22 +29,3 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: debian/* -Copyright: 2015 Christian Marillat - 2015 Balint Reczey -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru crossguid-0.0+git200150803/debian/files crossguid-0.1~git20150807.8f399e8~xenial/debian/files --- crossguid-0.0+git200150803/debian/files 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/files 2015-08-07 13:09:10.000000000 +0000 @@ -0,0 +1,2 @@ +libcrossguid-dev_0.1~git20150807.8f399e8_amd64.deb libdevel optional +libcrossguid1_0.1~git20150807.8f399e8_amd64.deb libs optional diff -Nru crossguid-0.0+git200150803/debian/libcrossguid0.install crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid0.install --- crossguid-0.0+git200150803/debian/libcrossguid0.install 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid0.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libcrossguid.so.* diff -Nru crossguid-0.0+git200150803/debian/libcrossguid0.symbols crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid0.symbols --- crossguid-0.0+git200150803/debian/libcrossguid0.symbols 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid0.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -libcrossguid.so.0 libcrossguid0 #MINVER# - _Z13hexPairToCharcc@Base 0.0+git200150803 - _Z14hexDigitToCharc@Base 0.0+git200150803 - _ZN13GuidGenerator7newGuidEv@Base 0.0+git200150803 - _ZN4GuidC1EPKh@Base 0.0+git200150803 - _ZN4GuidC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 0.0+git200150803 - _ZN4GuidC1ERKS_@Base 0.0+git200150803 - _ZN4GuidC1ERKSt6vectorIhSaIhEE@Base 0.0+git200150803 - _ZN4GuidC1Ev@Base 0.0+git200150803 - _ZN4GuidC2EPKh@Base 0.0+git200150803 - _ZN4GuidC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 0.0+git200150803 - _ZN4GuidC2ERKS_@Base 0.0+git200150803 - _ZN4GuidC2ERKSt6vectorIhSaIhEE@Base 0.0+git200150803 - _ZN4GuidC2Ev@Base 0.0+git200150803 - _ZN4GuidaSERKS_@Base 0.0+git200150803 - _ZNK4GuideqERKS_@Base 0.0+git200150803 - _ZNK4GuidneERKS_@Base 0.0+git200150803 - _ZNKSt5ctypeIcE8do_widenEc@Base 0.0+git200150803 - _ZNSt6vectorIhSaIhEEaSERKS1_@Base 0.0+git200150803 - _ZlsRSoRK4Guid@Base 0.0+git200150803 diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/control crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/control --- crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/control 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/control 2015-08-07 13:09:10.000000000 +0000 @@ -0,0 +1,13 @@ +Package: libcrossguid1 +Source: crossguid +Version: 0.1~git20150807.8f399e8 +Architecture: amd64 +Maintainer: wsnipex +Installed-Size: 48 +Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.4.0), libuuid1 (>= 2.16) +Section: libs +Priority: optional +Multi-Arch: same +Homepage: https://github.com/graeme-hill/crossguid +Description: cross platform UUID library + Graeme Hill's cross platform UUID library diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/md5sums crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/md5sums --- crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/md5sums 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/md5sums 2015-08-07 13:09:11.000000000 +0000 @@ -0,0 +1,3 @@ +0cdd359b38b853bbb013822a550232e8 usr/lib/x86_64-linux-gnu/libcrossguid.so.0.1 +61d717ae0ecb96546d2018bf6e39ab98 usr/share/doc/libcrossguid1/changelog.gz +80b3fe0475848f8dacff671e9ef6db0a usr/share/doc/libcrossguid1/copyright diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/postinst crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/postinst --- crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/postinst 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/postinst 2015-08-07 13:09:08.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +# Automatically added by dh_makeshlibs +if [ "$1" = "configure" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/postrm crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/postrm --- crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/postrm 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/postrm 2015-08-07 13:09:08.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +# Automatically added by dh_makeshlibs +if [ "$1" = "remove" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/shlibs crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/shlibs --- crossguid-0.0+git200150803/debian/libcrossguid1/DEBIAN/shlibs 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/DEBIAN/shlibs 2015-08-07 13:08:53.000000000 +0000 @@ -0,0 +1 @@ +libcrossguid 0.1 libcrossguid1 Binary files /tmp/tmpmvhCsB/_Jk0CPaVFK/crossguid-0.0+git200150803/debian/libcrossguid1/usr/lib/x86_64-linux-gnu/libcrossguid.so.0.1 and /tmp/tmpmvhCsB/DCUiPRfGhP/crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/usr/lib/x86_64-linux-gnu/libcrossguid.so.0.1 differ Binary files /tmp/tmpmvhCsB/_Jk0CPaVFK/crossguid-0.0+git200150803/debian/libcrossguid1/usr/share/doc/libcrossguid1/changelog.gz and /tmp/tmpmvhCsB/DCUiPRfGhP/crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/usr/share/doc/libcrossguid1/changelog.gz differ diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1/usr/share/doc/libcrossguid1/copyright crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/usr/share/doc/libcrossguid1/copyright --- crossguid-0.0+git200150803/debian/libcrossguid1/usr/share/doc/libcrossguid1/copyright 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1/usr/share/doc/libcrossguid1/copyright 2015-08-07 11:55:40.000000000 +0000 @@ -0,0 +1,31 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: crossguid +Source: https://github.com/graeme-hill/crossguid + +Files: * +Copyright: 2014 Graeme Hill +License: MIT + +Files: debian/* +Copyright: 2015 wuff +License: GPLv2 + +License: MIT + 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 -Nru crossguid-0.0+git200150803/debian/libcrossguid1.install crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1.install --- crossguid-0.0+git200150803/debian/libcrossguid1.install 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1.install 2015-08-07 13:05:06.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/lib/*/lib*.so.* diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1.postinst.debhelper crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1.postinst.debhelper --- crossguid-0.0+git200150803/debian/libcrossguid1.postinst.debhelper 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1.postinst.debhelper 2015-08-07 13:08:53.000000000 +0000 @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "configure" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/libcrossguid1.postrm.debhelper crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1.postrm.debhelper --- crossguid-0.0+git200150803/debian/libcrossguid1.postrm.debhelper 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid1.postrm.debhelper 2015-08-07 13:08:53.000000000 +0000 @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "remove" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/control crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/control --- crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/control 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/control 2015-08-07 13:09:09.000000000 +0000 @@ -0,0 +1,12 @@ +Package: libcrossguid-dev +Source: crossguid +Version: 0.1~git20150807.8f399e8 +Architecture: amd64 +Maintainer: wsnipex +Installed-Size: 89 +Depends: libcrossguid1 (= 0.1~git20150807.8f399e8) +Section: libdevel +Priority: optional +Homepage: https://github.com/graeme-hill/crossguid +Description: cross platform UUID library headers + Development headers for Graeme Hill's cross platform UUID library diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/md5sums crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/md5sums --- crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/md5sums 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/md5sums 2015-08-07 13:09:11.000000000 +0000 @@ -0,0 +1,7 @@ +e92929e210c63c5148d8db7dd09e04b0 usr/include/guid.h +364d431c40249e45fdb6a20bb1a8176d usr/lib/x86_64-linux-gnu/libcrossguid.a +0cdd359b38b853bbb013822a550232e8 usr/lib/x86_64-linux-gnu/libcrossguid.so +866b2f1309c48ca6ba5805487090dce1 usr/share/doc/libcrossguid-dev/README.Debian +bf1ab48486fc720abf0f8ed5d7bc83c9 usr/share/doc/libcrossguid-dev/README.md.gz +61d717ae0ecb96546d2018bf6e39ab98 usr/share/doc/libcrossguid-dev/changelog.gz +80b3fe0475848f8dacff671e9ef6db0a usr/share/doc/libcrossguid-dev/copyright diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/postinst crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/postinst --- crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/postinst 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/postinst 2015-08-07 13:09:08.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +# Automatically added by dh_makeshlibs +if [ "$1" = "configure" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/postrm crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/postrm --- crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/postrm 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/postrm 2015-08-07 13:09:08.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +# Automatically added by dh_makeshlibs +if [ "$1" = "remove" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/shlibs crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/shlibs --- crossguid-0.0+git200150803/debian/libcrossguid-dev/DEBIAN/shlibs 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/DEBIAN/shlibs 2015-08-07 13:08:52.000000000 +0000 @@ -0,0 +1 @@ +libcrossguid 0.1 libcrossguid-dev diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/include/guid.h crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/include/guid.h --- crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/include/guid.h 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/include/guid.h 2015-08-07 13:08:47.000000000 +0000 @@ -0,0 +1,102 @@ +/* +The MIT License (MIT) + +Copyright (c) 2014 Graeme Hill (http://graemehill.ca) + +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. +*/ + +#pragma once + +#include +#include +#include +#include +#include + +#ifdef GUID_ANDROID +#include +#endif + +// Class to represent a GUID/UUID. Each instance acts as a wrapper around a +// 16 byte value that can be passed around by value. It also supports +// conversion to string (via the stream operator <<) and conversion from a +// string via constructor. +class Guid +{ + public: + + // create a guid from vector of bytes + Guid(const std::vector &bytes); + + // create a guid from array of bytes + Guid(const unsigned char *bytes); + + // create a guid from string + Guid(const std::string &fromString); + + // create empty guid + Guid(); + + // copy constructor + Guid(const Guid &other); + + // overload assignment operator + Guid &operator=(const Guid &other); + + // overload equality and inequality operator + bool operator==(const Guid &other) const; + bool operator!=(const Guid &other) const; + + private: + + // actual data + std::vector _bytes; + + // make the << operator a friend so it can access _bytes + friend std::ostream &operator<<(std::ostream &s, const Guid &guid); +}; + +// Class that can create new guids. The only reason this exists instead of +// just a global "newGuid" function is because some platforms will require +// that there is some attached context. In the case of android, we need to +// know what JNIEnv is being used to call back to Java, but the newGuid() +// function would no longer be cross-platform if we parameterized the android +// version. Instead, construction of the GuidGenerator may be different on +// each platform, but the use of newGuid is uniform. +class GuidGenerator +{ + public: +#ifdef GUID_ANDROID + GuidGenerator(JNIEnv *env); +#else + GuidGenerator() { } +#endif + + Guid newGuid(); + +#ifdef GUID_ANDROID + private: + JNIEnv *_env; + jclass _uuidClass; + jmethodID _newGuidMethod; + jmethodID _mostSignificantBitsMethod; + jmethodID _leastSignificantBitsMethod; +#endif +}; Binary files /tmp/tmpmvhCsB/_Jk0CPaVFK/crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/changelog.gz and /tmp/tmpmvhCsB/DCUiPRfGhP/crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/changelog.gz differ diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/copyright crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/copyright --- crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/copyright 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/copyright 2015-08-07 11:55:40.000000000 +0000 @@ -0,0 +1,31 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: crossguid +Source: https://github.com/graeme-hill/crossguid + +Files: * +Copyright: 2014 Graeme Hill +License: MIT + +Files: debian/* +Copyright: 2015 wuff +License: GPLv2 + +License: MIT + 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 -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/README.Debian crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/README.Debian --- crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/README.Debian 2015-08-07 09:51:30.000000000 +0000 @@ -0,0 +1,6 @@ +crossguid for Debian +-------------------- + + + + -- wuff Fri, 07 Aug 2015 11:50:57 +0200 Binary files /tmp/tmpmvhCsB/_Jk0CPaVFK/crossguid-0.0+git200150803/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/README.md.gz and /tmp/tmpmvhCsB/DCUiPRfGhP/crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev/usr/share/doc/libcrossguid-dev/README.md.gz differ diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev.dirs.dis crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.dirs.dis --- crossguid-0.0+git200150803/debian/libcrossguid-dev.dirs.dis 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.dirs.dis 2015-08-07 09:51:31.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib +usr/include diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev.install crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.install --- crossguid-0.0+git200150803/debian/libcrossguid-dev.install 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.install 2015-08-07 13:05:20.000000000 +0000 @@ -1,2 +1,3 @@ -usr/include/guid.h -usr/lib/*/libcrossguid.a +debian/tmp/usr/include/guid.h +debian/tmp/usr/lib/*/lib*.a +debian/tmp/usr/lib/*/lib*.so diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev.postinst.debhelper crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.postinst.debhelper --- crossguid-0.0+git200150803/debian/libcrossguid-dev.postinst.debhelper 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.postinst.debhelper 2015-08-07 13:08:52.000000000 +0000 @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "configure" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/libcrossguid-dev.postrm.debhelper crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.postrm.debhelper --- crossguid-0.0+git200150803/debian/libcrossguid-dev.postrm.debhelper 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/libcrossguid-dev.postrm.debhelper 2015-08-07 13:08:52.000000000 +0000 @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "remove" ]; then + ldconfig +fi +# End automatically added section diff -Nru crossguid-0.0+git200150803/debian/README crossguid-0.1~git20150807.8f399e8~xenial/debian/README --- crossguid-0.0+git200150803/debian/README 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/README 2015-08-07 09:51:31.000000000 +0000 @@ -0,0 +1,6 @@ +The Debian Package crossguid +---------------------------- + +Comments regarding the Package + + -- wuff Fri, 07 Aug 2015 11:50:57 +0200 diff -Nru crossguid-0.0+git200150803/debian/README.Debian crossguid-0.1~git20150807.8f399e8~xenial/debian/README.Debian --- crossguid-0.0+git200150803/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/README.Debian 2015-08-07 09:51:30.000000000 +0000 @@ -0,0 +1,6 @@ +crossguid for Debian +-------------------- + + + + -- wuff Fri, 07 Aug 2015 11:50:57 +0200 diff -Nru crossguid-0.0+git200150803/debian/rules crossguid-0.1~git20150807.8f399e8~xenial/debian/rules --- crossguid-0.0+git200150803/debian/rules 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/rules 2015-08-07 13:07:28.000000000 +0000 @@ -1,27 +1,27 @@ #!/usr/bin/make -f - +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) INSTDIRS = debian/tmp/usr/include debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + %: dh $@ +#build: $(INSTDIRS) override_dh_auto_build: - $(CXX) -shared -fPIC -Wall -std=c++11 -Wl,-soname,libcrossguid.so.0 -DGUID_LIBUUID \ - -I/usr/include/uuid guid.cpp -o libcrossguid.so.0.0.1 $(CXXFLAGS) -luuid \ - $(LDFLAGS) - ar x /usr/lib/$(DEB_HOST_MULTIARCH)/libuuid.a - ar cr libcrossguid.a *.o + $(CXX) -shared -fPIC -Wall -std=c++11 -Wl,-soname,libcrossguid.so.0.1 -DGUID_LIBUUID -I/usr/include/uuid guid.cpp -o libcrossguid.so.0.1 $(CXXFLAGS) -luuid + @ln -s libcrossguid.so.0.1 libcrossguid.so + $(AR) x /usr/lib/$(DEB_HOST_MULTIARCH)/libuuid.a + $(AR) cr libcrossguid.a *.o override_dh_auto_install: $(INSTDIRS) cp guid.h debian/tmp/usr/include/ cp libcrossguid.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ -override_dh_link: - dh_link -plibcrossguid-dev usr/lib/$(DEB_HOST_MULTIARCH)/libcrossguid.so.0.0.1 usr/lib/$(DEB_HOST_MULTIARCH)/libcrossguid.so - dh_link -plibcrossguid0 usr/lib/$(DEB_HOST_MULTIARCH)/libcrossguid.so.0.0.1 usr/lib/$(DEB_HOST_MULTIARCH)/libcrossguid.so.0 - $(INSTDIRS): mkdir -p $@ -override_dh_clean: - dh_clean libcrossguid.* *.o +clean: + rm -f libcrossguid.* *.o debian/*.log debian/*.substvars + diff -Nru crossguid-0.0+git200150803/debian/source/format crossguid-0.1~git20150807.8f399e8~xenial/debian/source/format --- crossguid-0.0+git200150803/debian/source/format 2016-02-08 10:35:01.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/source/format 2015-08-07 09:51:30.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru crossguid-0.0+git200150803/debian/tmp/usr/include/guid.h crossguid-0.1~git20150807.8f399e8~xenial/debian/tmp/usr/include/guid.h --- crossguid-0.0+git200150803/debian/tmp/usr/include/guid.h 1970-01-01 00:00:00.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/debian/tmp/usr/include/guid.h 2015-08-07 13:08:47.000000000 +0000 @@ -0,0 +1,102 @@ +/* +The MIT License (MIT) + +Copyright (c) 2014 Graeme Hill (http://graemehill.ca) + +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. +*/ + +#pragma once + +#include +#include +#include +#include +#include + +#ifdef GUID_ANDROID +#include +#endif + +// Class to represent a GUID/UUID. Each instance acts as a wrapper around a +// 16 byte value that can be passed around by value. It also supports +// conversion to string (via the stream operator <<) and conversion from a +// string via constructor. +class Guid +{ + public: + + // create a guid from vector of bytes + Guid(const std::vector &bytes); + + // create a guid from array of bytes + Guid(const unsigned char *bytes); + + // create a guid from string + Guid(const std::string &fromString); + + // create empty guid + Guid(); + + // copy constructor + Guid(const Guid &other); + + // overload assignment operator + Guid &operator=(const Guid &other); + + // overload equality and inequality operator + bool operator==(const Guid &other) const; + bool operator!=(const Guid &other) const; + + private: + + // actual data + std::vector _bytes; + + // make the << operator a friend so it can access _bytes + friend std::ostream &operator<<(std::ostream &s, const Guid &guid); +}; + +// Class that can create new guids. The only reason this exists instead of +// just a global "newGuid" function is because some platforms will require +// that there is some attached context. In the case of android, we need to +// know what JNIEnv is being used to call back to Java, but the newGuid() +// function would no longer be cross-platform if we parameterized the android +// version. Instead, construction of the GuidGenerator may be different on +// each platform, but the use of newGuid is uniform. +class GuidGenerator +{ + public: +#ifdef GUID_ANDROID + GuidGenerator(JNIEnv *env); +#else + GuidGenerator() { } +#endif + + Guid newGuid(); + +#ifdef GUID_ANDROID + private: + JNIEnv *_env; + jclass _uuidClass; + jmethodID _newGuidMethod; + jmethodID _mostSignificantBitsMethod; + jmethodID _leastSignificantBitsMethod; +#endif +}; Binary files /tmp/tmpmvhCsB/_Jk0CPaVFK/crossguid-0.0+git200150803/debian/tmp/usr/lib/x86_64-linux-gnu/libcrossguid.so.0.1 and /tmp/tmpmvhCsB/DCUiPRfGhP/crossguid-0.1~git20150807.8f399e8~xenial/debian/tmp/usr/lib/x86_64-linux-gnu/libcrossguid.so.0.1 differ diff -Nru crossguid-0.0+git200150803/.gitattributes crossguid-0.1~git20150807.8f399e8~xenial/.gitattributes --- crossguid-0.0+git200150803/.gitattributes 2015-08-03 15:35:46.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/.gitattributes 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff -Nru crossguid-0.0+git200150803/.gitignore crossguid-0.1~git20150807.8f399e8~xenial/.gitignore --- crossguid-0.0+git200150803/.gitignore 2015-08-03 15:35:46.000000000 +0000 +++ crossguid-0.1~git20150807.8f399e8~xenial/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -*.o -*.so -*.a -*.dll -*.DLL -test -testmain -VisualStudio/*.user -VisualStudio/Debug/ -VisualStudio/Release/ -*.opensdf -*.sdf -*.suo -bin/ -libs/ -gen/ -obj/ -*.apk -*.ap_ -*.dex -*.class -local.properties -*.pydevproject -.project -.metadata -bin/** -tmp/** -tmp/**/* -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath -.externalToolBuilders/ -*.launch -.cproject -.buildpath