Sync debian/* files for ACE

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

10 files changed, 329 insertions, 358 deletions

diff --git a/ACE/debian/changelog b/ACE/debian/changelog
index 062f21edefb..effbd841beb 100644
--- a/ACE/debian/changelog
+++ b/ACE/debian/changelog
@@ -1,3 +1,32 @@
+ace (7.0.2+dfsg-1) experimental; urgency=medium
+
+  * Team upload.
+  * Update get-orig-source script.
+  * Update to upstream v7.0.2
+    - Sync debian/* with upstream.
+    - Exclude files in d/copyright.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sun, 23 May 2021 00:20:02 +0100
+
+ace (7.0.1+dfsg-2) experimental; urgency=medium
+
+  * Team upload.
+  * Update Standards-Version to 4.5.1
+  * Update copyright to dep5 format.
+  * Update debhelper-compat to 13.
+    - Mention correct path of installed files.
+    - List files not installed.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sun, 16 May 2021 22:27:52 +0100
+
+ace (7.0.1+dfsg-1) experimental; urgency=medium
+
+  * Team upload.
+  * Update to upstream v7.0.1
+    - Sync debian/* with upstream.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sun, 28 Mar 2021 02:03:03 +0100
+
 ace (6.5.12+dfsg-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/ACE/debian/control b/ACE/debian/control
index 985aa20c9bd..e8f692b9e4c 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -3,9 +3,9 @@ Section: devel
 Priority: optional
 Maintainer: Debian ACE maintainers <team+ace@tracker.debian.org>
 Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Johnny Willemsen <jwillemsen@remedy.nl>
-Build-Depends: debhelper-compat (=12), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.3-dev, tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev
+Build-Depends: debhelper-compat (=13), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.3-dev, tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev
 Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/debian/ace.git
 Vcs-Browser: https://salsa.debian.org/debian/ace
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
diff --git a/ACE/debian/copyright b/ACE/debian/copyright
index eaec98d64ca..cc3174f8f18 100644
--- a/ACE/debian/copyright
+++ b/ACE/debian/copyright
@@ -1,141 +1,251 @@
-This package was debianized by:
- Ossama Othman <ossama@debian.org> on Fri, 25 Sep 1998 16:43:42 -0400.
-Then maintained by:
- Brian Nelson <pyro@debian.org>
- Konstantinos Margaritis <markos@debian.org>
- Thomas Girard <thomas.g.girard@free.fr>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ACE
+Upstream-Contact: Johnny Willemsen <jwillemsen@remedy.nl>
+Source: https://github.com/DOCGroup/ACE_TAO
+Files-Excluded: ASNMP
+                performance-tests
+                rpmbuild debian
+                websvcs
+                bin/LabVIEW_RT/*.exe
+                examples/C++NPv2
+                examples/C++NPv1
+                examples/APG
+                contrib
+                apps/JAWS/clients/WebSTONE
+                MPC/MPC.ico
+                apps/gperf/tests/test-*.exp
+                docs/ACE-subsets.html
+                docs/ACE-guidelines.html
 
-It is now maintained by:
- Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
+Files:     *
+Copyright: 1993-2019 Douglas C. Schmidt and his research group at
+           Washington University, University of California, Irvine,
+           and Vanderbilt University
+License:   other-BSD
 
-It was downloaded from: <http://download.dre.vanderbilt.edu/>
+Files:     debian/*
+Copyright: 1998, Ossama Othman <ossama@debian.org>
+           Brian Nelson <pyro@debian.org>
+           Konstantinos Margaritis <markos@debian.org>
+           Thomas Girard <thomas.g.girard@free.fr>
+License:   other-BSD
 
-Files: *
-Copyright: © 1993-2019 Douglas C. Schmidt and his research group at
-             Washington University, University of California, Irvine,
-             and Vanderbilt University
-License: other-BSD
-  Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM),
-  DAnCE(TM), and CoSMIC(TM)
-
-   [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM)
-   (henceforth referred to as "DOC software") are copyrighted by
-   [5]Douglas C. Schmidt and his [6]research group at [7]Washington
-   University, [8]University of California, Irvine, and [9]Vanderbilt
-   University, Copyright (c) 1993-2011, all rights reserved. Since DOC
-   software is open-source, freely available software, you are free to
-   use, modify, copy, and distribute--perpetually and irrevocably--the
-   DOC software source code and object code produced from the source, as
-   well as copy and distribute modified versions of this software. You
-   must, however, include this copyright statement along with any code
-   built using DOC software that you release. No copyright statement
-   needs to be provided if you just ship binary executables of your
-   software products.
+Files:     apps/gperf/*
+Copyright: 1989 Free Software Foundation, Inc.
+License:   GPL-2+
 
-   You can use DOC software in commercial and/or binary software releases
-   and are under no obligation to redistribute any of your source code
-   that is built using DOC software. Note, however, that you may not
-   misappropriate the DOC software code, such as copyrighting it yourself
-   or claiming authorship of the DOC software code, in a way that will
-   prevent DOC software from being distributed freely using an
-   open-source development model. You needn't inform anyone that you're
-   using DOC software in your software, though we encourage you to let
-   [10]us know so we can promote your project in the [11]DOC software
-   success stories.
+Files:     MPC/*
+Copyright: 2003-2006 OCI. St. Louis MO USA
+License:   MPC
 
-   The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites
-   are maintained by the [17]DOC Group at the [18]Institute for Software
-   Integrated Systems (ISIS) and the [19]Center for Distributed Object
-   Computing of Washington University, St. Louis for the development of
-   open-source software as part of the open-source software community.
-   Submissions are provided by the submitter ``as is'' with no warranties
-   whatsoever, including any warranty of merchantability, noninfringement
-   of third party intellectual property, or fitness for any particular
-   purpose. In no event shall the submitter be liable for any direct,
-   indirect, special, exemplary, punitive, or consequential damages,
-   including without limitation, lost profits, even if advised of the
-   possibility of such damages. Likewise, DOC software is provided as is
-   with no warranties of any kind, including the warranties of design,
-   merchantability, and fitness for a particular purpose,
-   noninfringement, or arising from a course of dealing, usage or trade
-   practice. Washington University, UC Irvine, Vanderbilt University,
-   their employees, and students shall have no liability with respect to
-   the infringement of copyrights, trade secrets or any patents by DOC
-   software or any part thereof. Moreover, in no event will Washington
-   University, UC Irvine, or Vanderbilt University, their employees, or
-   students be liable for any lost revenue or profits or other special,
-   indirect and consequential damages.
+Files:     ace/OS_NS_unistd.inl (swab function)
+Copyright: 1994-2006 Red Hat, Inc.
+License:   BSD.1
 
-   DOC software is provided with no support and without any obligation on
-   the part of Washington University, UC Irvine, Vanderbilt University,
-   their employees, or students to assist in its use, correction,
-   modification, or enhancement. A [20]number of companies around the
-   world provide commercial support for DOC software, however. DOC
-   software is Y2K-compliant, as long as the underlying OS platform is
-   Y2K-compliant. Likewise, DOC software is compliant with the new US
-   daylight savings rule passed by Congress as "The Energy Policy Act of
-   2005," which established new daylight savings times (DST) rules for
-   the United States that expand DST as of March 2007. Since DOC software
-   obtains time/date and calendaring information from operating systems
-   users will not be affected by the new DST rules as long as they
-   upgrade their operating systems accordingly.
+Files:     ace/UTF32_Encoding_Converter.cpp
+           ace/UTF16_Encoding_Converter.cpp
+           ace/UTF16_Encoding_Converter.inl
+Copyright: 2001-2004 Unicode, Inc.
+License:   other
 
-   The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM),
-   Washington University, UC Irvine, and Vanderbilt University, may not
-   be used to endorse or promote products or services derived from this
-   source without express written permission from Washington University,
-   UC Irvine, or Vanderbilt University. This license grants no permission
-   to call products or services derived from this source ACE(TM),
-   TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant
-   permission for the name Washington University, UC Irvine, or
-   Vanderbilt University to appear in their names.
+Files:     apps/JAWS3/*
+Copyright: 2000 James Hu and Entera, Inc.
+License:   other-1
 
-   If you have any suggestions, additions, comments, or questions, please
-   let [21]me know.
+Files:     ace/OS_NS_wchar.cpp (wcs*_emulation functions)
+Copyright: 1991, 1993 The Regents of the University of California
+License:   BSD-4.1
 
-   [22]Douglas C. Schmidt
-     _________________________________________________________________
+Files:     ace/Get_Opt.cpp
+Copyright: 1987, 1993, 1994 The Regents of the University of California
+           2000 The NetBSD Foundation, Inc.
+License:   BSD-4 and BSD-4.2
 
-   Back to the [23]ACE home page.
+License: BSD-4
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+      This product includes software developed by the University of
+      California, Berkeley and its contributors.
+ .
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
 
-References
+License: BSD-4.2
+ This code is derived from software contributed to The NetBSD Foundation
+ by Dieter Baron and Thomas Klausner.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+ .
+        This product includes software developed by the NetBSD
+        Foundation, Inc. and its contributors.
+ .
+ 4. Neither the name of The NetBSD Foundation nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
-   1. http://www.cs.wustl.edu/~schmidt/ACE.html
-   2. http://www.cs.wustl.edu/~schmidt/TAO.html
-   3. http://www.dre.vanderbilt.edu/CIAO/
-   4. http://www.dre.vanderbilt.edu/cosmic/
-   5. http://www.dre.vanderbilt.edu/~schmidt/
-   6. http://www.cs.wustl.edu/~schmidt/ACE-members.html
-   7. http://www.wustl.edu/
-   8. http://www.uci.edu/
-   9. http://www.vanderbilt.edu/
-  10. mailto:doc_group@cs.wustl.edu
-  11. http://www.cs.wustl.edu/~schmidt/ACE-users.html
-  12. http://www.cs.wustl.edu/~schmidt/ACE.html
-  13. http://www.cs.wustl.edu/~schmidt/TAO.html
-  14. http://www.dre.vanderbilt.edu/CIAO/
-  15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/
-  16. http://www.dre.vanderbilt.edu/cosmic/
-  17. http://www.dre.vanderbilt.edu/
-  18. http://www.isis.vanderbilt.edu/
-  19. http://www.cs.wustl.edu/~schmidt/doc-center.html
-  20. http://www.cs.wustl.edu/~schmidt/commercial-support.html
-  21. mailto:d.schmidt@vanderbilt.edu
-  22. http://www.dre.vanderbilt.edu/~schmidt/
-  23. http://www.cs.wustl.edu/ACE.html
+License: other-BSD
+ Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM),
+ DAnCE(TM), and CoSMIC(TM)
+ .
+ [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM)
+ (henceforth referred to as "DOC software") are copyrighted by
+ [5]Douglas C. Schmidt and his [6]research group at [7]Washington
+ University, [8]University of California, Irvine, and [9]Vanderbilt
+ University, Copyright (c) 1993-2011, all rights reserved. Since DOC
+ software is open-source, freely available software, you are free to
+ use, modify, copy, and distribute--perpetually and irrevocably--the
+ DOC software source code and object code produced from the source, as
+ well as copy and distribute modified versions of this software. You
+ must, however, include this copyright statement along with any code
+ built using DOC software that you release. No copyright statement
+ needs to be provided if you just ship binary executables of your
+ software products.
+ .
+ You can use DOC software in commercial and/or binary software releases
+ and are under no obligation to redistribute any of your source code
+ that is built using DOC software. Note, however, that you may not
+ misappropriate the DOC software code, such as copyrighting it yourself
+ or claiming authorship of the DOC software code, in a way that will
+ prevent DOC software from being distributed freely using an
+ open-source development model. You needn't inform anyone that you're
+ using DOC software in your software, though we encourage you to let
+ [10]us know so we can promote your project in the [11]DOC software
+ success stories.
+ .
+ The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites
+ are maintained by the [17]DOC Group at the [18]Institute for Software
+ Integrated Systems (ISIS) and the [19]Center for Distributed Object
+ Computing of Washington University, St. Louis for the development of
+ open-source software as part of the open-source software community.
+ Submissions are provided by the submitter ``as is'' with no warranties
+ whatsoever, including any warranty of merchantability, noninfringement
+ of third party intellectual property, or fitness for any particular
+ purpose. In no event shall the submitter be liable for any direct,
+ indirect, special, exemplary, punitive, or consequential damages,
+ including without limitation, lost profits, even if advised of the
+ possibility of such damages. Likewise, DOC software is provided as is
+ with no warranties of any kind, including the warranties of design,
+ merchantability, and fitness for a particular purpose,
+ noninfringement, or arising from a course of dealing, usage or trade
+ practice. Washington University, UC Irvine, Vanderbilt University,
+ their employees, and students shall have no liability with respect to
+ the infringement of copyrights, trade secrets or any patents by DOC
+ software or any part thereof. Moreover, in no event will Washington
+ University, UC Irvine, or Vanderbilt University, their employees, or
+ students be liable for any lost revenue or profits or other special,
+ indirect and consequential damages.
+ .
+ DOC software is provided with no support and without any obligation on
+ the part of Washington University, UC Irvine, Vanderbilt University,
+ their employees, or students to assist in its use, correction,
+ modification, or enhancement. A [20]number of companies around the
+ world provide commercial support for DOC software, however. DOC
+ software is Y2K-compliant, as long as the underlying OS platform is
+ Y2K-compliant. Likewise, DOC software is compliant with the new US
+ daylight savings rule passed by Congress as "The Energy Policy Act of
+ 2005," which established new daylight savings times (DST) rules for
+ the United States that expand DST as of March 2007. Since DOC software
+ obtains time/date and calendaring information from operating systems
+ users will not be affected by the new DST rules as long as they
+ upgrade their operating systems accordingly.
+ .
+ The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM),
+ Washington University, UC Irvine, and Vanderbilt University, may not
+ be used to endorse or promote products or services derived from this
+ source without express written permission from Washington University,
+ UC Irvine, or Vanderbilt University. This license grants no permission
+ to call products or services derived from this source ACE(TM),
+ TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant
+ permission for the name Washington University, UC Irvine, or
+ Vanderbilt University to appear in their names.
+ .
+ If you have any suggestions, additions, comments, or questions, please
+ let [21]me know.
+ .
+ [22]Douglas C. Schmidt
+ .
+ References
+ .
+ 1. http://www.cs.wustl.edu/~schmidt/ACE.html
+ 2. http://www.cs.wustl.edu/~schmidt/TAO.html
+ 3. http://www.dre.vanderbilt.edu/CIAO/
+ 4. http://www.dre.vanderbilt.edu/cosmic/
+ 5. http://www.dre.vanderbilt.edu/~schmidt/
+ 6. http://www.cs.wustl.edu/~schmidt/ACE-members.html
+ 7. http://www.wustl.edu/
+ 8. http://www.uci.edu/
+ 9. http://www.vanderbilt.edu/
+ 10. mailto:doc_group@cs.wustl.edu
+ 11. http://www.cs.wustl.edu/~schmidt/ACE-users.html
+ 12. http://www.cs.wustl.edu/~schmidt/ACE.html
+ 13. http://www.cs.wustl.edu/~schmidt/TAO.html
+ 14. http://www.dre.vanderbilt.edu/CIAO/
+ 15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/
+ 16. http://www.dre.vanderbilt.edu/cosmic/
+ 17. http://www.dre.vanderbilt.edu/
+ 18. http://www.isis.vanderbilt.edu/
+ 19. http://www.cs.wustl.edu/~schmidt/doc-center.html
+ 20. http://www.cs.wustl.edu/~schmidt/commercial-support.html
+ 21. mailto:d.schmidt@vanderbilt.edu
+ 22. http://www.dre.vanderbilt.edu/~schmidt/
+ 23. http://www.cs.wustl.edu/ACE.html
 
-Files: apps/gperf/*
-Copyright: © 1989 Free Software Foundation, Inc.
-License: GPL-2+
+License:   GPL-2+
  On Debian systems the full text of the GNU General Public License (Version 2)
  can be found in the `/usr/share/common-licenses/GPL-2' file.
 
-Files: MPC/*
-Copyright: © 2003-2006 OCI. St. Louis MO USA
-License: other-BSD
+License:   MPC
  MPC (Licensed Product) is protected by copyright, and is distributed under
  the following terms.
- 
+ .
  MPC (Make, Project and workspace Creator) is an open source tool, developed
  by OCI and written in Perl. It is designed to generate a variety of tool
  specific project files from a common baseline. Through the powerful
@@ -147,95 +257,79 @@ License: other-BSD
  usually experienced by developer groups, by replacing it with a singular
  robust build environment, and an active community of users committed to its
  evolution.
- 
+ .
  Since MPC is open source and free of licensing fees, you are free to use,
  modify, and distribute the source code, as long as you include this
  copyright statement.
- 
+ .
  In particular, you can use MPC to build proprietary software and are under
  no obligation to redistribute any of your source code that is built using
  MPC. Note, however, that you may not do anything to the MPC code, such as
  copyrighting it yourself or claiming authorship of the MPC code, that will
  prevent MPC from being distributed freely using an open source development
  model.
- 
+ .
  Warranty
- 
+ .
  LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
  THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  PURPOSE, NON-INFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR
  TRADE PRACTICE.
- 
+ .
  Support
- 
+ .
  LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON
  THE PART OF OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS
  USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
- 
+ .
  Support may be available from OCI to users who have agreed to a support
  contract.
- 
+ .
  Liability
- 
+ .
  OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
  RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
  LICENSED PRODUCT OR ANY PART THEREOF.
- 
+ .
  IN NO EVENT WILL OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
  ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
  DAMAGES, EVEN IF OCI HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- 
+ .
  MPC copyright OCI. St. Louis MO USA, 2003-2006
 
-Files: contrib/minizip/*.[ch]
-Copyright: © 1998-2005 Gilles Vollant
-License: ZLIB
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- 
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
+License: BSD.1
+ This copyrighted material is made available to anyone wishing to
+ use, modify, copy, or redistribute it subject to the terms and
+ conditions of the BSD License.   This program is distributed in
+ the hope that it will be useful, but WITHOUT ANY WARRANTY
+ expressed or implied, including the implied warranties of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  A copy of
+ this license is available at
+ http://www.opensource.org/licenses. Any Red Hat trademarks that
+ are incorporated in the source code or documentation are not
+ subject to the BSD License and may only be used or replicated with
+ the express permission of Red Hat, Inc.
  
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
-Files: ace/OS_NS_unistd.inl (swab function)
-Copyright: © 1994-2006 Red Hat, Inc.
-License: BSD-3
-
-Files: ace/UTF32_Encoding_Converter.cpp
-       ace/UTF16_Encoding_Converter.cpp
-       ace/UTF16_Encoding_Converter.inl
-Copyright: © 2001-2004 Unicode, Inc.
 License: other
  Limitations on Rights to Redistribute This Code
- 
+ .
  Unicode, Inc. hereby grants the right to freely use the information
  supplied in this file in the creation of products supporting the
  Unicode Standard, and to make copies of this file in any form
  for internal or external distribution as long as this notice
  remains attached.
 
-Files: apps/JAWS3/*
-Copyright: © 2000 James Hu and Entera, Inc.
-License: other
+License: other-1
  Copyright and Licensing Information for JAWS Adaptive Web Server,
  version 3 (JAWS3).
- 
+ .
  JAWS3 is copyrighted by James Hu and Entera, Inc., Copyright (c)
  2000, all rights reserved.  Since JAWS3 is open source, free
  software, you are free to use, modify, and distribute the JAWS3
  source code and object code produced or otherwise derived from
  JAWS3, provided you include this copyright statement in all versions
  of such code.
- 
+ .
  In particular, you can use JAWS3 in proprietary software and are
  under no obligation to redistribute any of your source code that is
  derived from JAWS3.  Note, however, that you may not modify the
@@ -243,20 +337,20 @@ License: other
  it yourself or claiming authorship of the JAWS3 code, that will
  prevent JAWS3 from being distributed freely using an open source
  development model.
- 
+ .
  JAWS3 is provided as is with no warranties of any kind, including
  the warranties of design, merchantibility and fitness for a
  particular purpose, noninfringement, or arising from a course of
  dealing, usage or trade practice.  Moreover, JAWS3 is provided with
  no support and without any obligation on the part of Entera, Inc.,
  or its employees.
- 
+ .
  Entera, Inc., and its employees shall have no liability with respect
  to the infringement of copyrights, trade secrets or any patents by
  JAWS3 or any part thereof.  Moreover, in no event will Entera, Inc.,
  or its employees, be liable for any lost revenue or profits or other
  special, indirect and consequential damages.
- 
+ .
  By submitting comments, suggestions, code, code snippets, techniques
  (including that of usage), and algorithms, submitters acknowledge
  that they have the right to do so, that any such submissions are
@@ -268,116 +362,45 @@ License: other
  submitters acknowledge that the incorporation or modification of
  such submissions is entirely at the discretion of the moderators of
  the open source JAWS3 project or their designees.
- 
+ .
  The names JAWS3 and Entera, Inc., may not be used to endorse or
  promote products or services derived from this source without
  express written permission from Entera, Inc.  Further, products or
  services derived from this source may not be called JAWS3 nor may
  the name Entera, Inc., appear in their names, without express
  written permission from Entera, Inc.
- 
+ .
  If you have any suggestions, additions, comments, or questions,
  please let me know.
- 
+ .
  James C. Hu
  Entera, Inc.
  jxh@entera.com
 
-Files: ASNMP/*
-Copyright: © 1996 Hewlett-Packard Company
-           © 1988, 1989, 1991, 1992 Carnegie Mellon University
-           © 1997 Cisco Systems, Inc.
-License: other-BSD
- These copyrights apply to the SNMP++ module shipped with the ACE library:
- 
- /*===================================================================
-   Copyright (c) 1996
-   Hewlett-Packard Company
-   
-   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-   Permission to use, copy, modify, distribute and/or sell this software 
-   and/or its documentation is hereby granted without fee. User agrees 
-   to display the above copyright notice and this license notice in all 
-   copies of the software and any documentation of the software. User 
-   agrees to assume all liability for the use of the software; Hewlett-Packard 
-   makes no representations about the suitability of this software for any 
-   purpose. It is provided "AS-IS without warranty of any kind,either express 
-   or implied. User hereby grants a royalty-free license to any and all 
-   derivatives based upon this software code base. 
-   
- =====================================================================*/
- 
- /**********************************************************************
-	Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University
- 
-                      All Rights Reserved
- 
- Permission to use, copy, modify, and distribute this software and its 
- documentation for any purpose and without fee is hereby granted, 
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in 
- supporting documentation, and that the name of CMU not be
- used in advertising or publicity pertaining to distribution of the
- software without specific, written prior permission.  
- 
- CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
- ******************************************************************/
- 
- Certain portions of this version of HP's SNMP++ are:
- 
- /*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- Copyright 1997 Cisco Systems, Inc.
- 
- Permission to use, copy, modify, and distribute this software for any
- purpose and without fee is hereby granted, provided that this
- copyright and permission notice appear on all copies of the software and
- supporting documentation, the name of Cisco Systems, Inc. not be used
- in advertising or publicity pertaining to distribution of the
- program without specific prior permission, and notice be given
- in supporting documentation that modification, copying and distribution is by
- permission of Cisco Systems, Inc.
- 
- Cisco Systems, Inc. makes no representations about the suitability of this
- software for any purpose.  THIS SOFTWARE IS PROVIDED ``AS IS''
- AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
- LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGMENT AND
- FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL CISCO SYSTEMS, INC. BE
- LIABLE FOR ANY DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE
- SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
- DAMAGES.
- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
-
-Files: ace/OS_NS_wchar.cpp (wcs*_emulation functions)
-Copyright: © 1991, 1993 The Regents of the University of California
-License: BSD-4
- Copyright (c) 1991, 1993
-      The Regents of the University of California.  All rights reserved.
- 
+License: BSD-4.1
  This code is derived from software contributed to Berkeley by
  James W. Williams of NASA Goddard Space Flight Center.
- 
+ .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
+ .
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
+ .
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
+ .
  3. All advertising materials mentioning features or use of this software
     must display the following acknowledgement:
       This product includes software developed by the University of
       California, Berkeley and its contributors.
+ .
  4. Neither the name of the University nor the names of its contributors
     may be used to endorse or promote products derived from this software
     without specific prior written permission.
- 
+ .
  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -389,75 +412,3 @@ License: BSD-4
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
-
-Files: ace/Get_Opt.cpp
-Copyright: © 1987, 1993, 1994 The Regents of the University of California
-           © 2000 The NetBSD Foundation, Inc.
-License: BSD-4
- Copyright (c) 1987, 1993, 1994
-      The Regents of the University of California.  All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-      This product includes software developed by the University of
-      California, Berkeley and its contributors.
- 4. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- 
- ******************************************************************
- 
- Copyright (c) 2000 The NetBSD Foundation, Inc.
- All rights reserved.
- 
- This code is derived from software contributed to The NetBSD Foundation
- by Dieter Baron and Thomas Klausner.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-        This product includes software developed by the NetBSD
-        Foundation, Inc. and its contributors.
- 4. Neither the name of The NetBSD Foundation nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/ACE/debian/get-orig-source.sh b/ACE/debian/get-orig-source.sh
index 649632564fb..625e075733a 100755
--- a/ACE/debian/get-orig-source.sh
+++ b/ACE/debian/get-orig-source.sh
@@ -3,35 +3,22 @@
 set -ex
 
 UPSTREAM_VERSION=$2
-ORIG_TARBALL=../ace_${UPSTREAM_VERSION}.orig.tar.gz
+ORIG_TARBALL=../ace_${UPSTREAM_VERSION}.orig.tar.xz
 
 REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
 
 WORKING_DIR=`dirname ${ORIG_TARBALL}`
 
-ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"`
+ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g" | sed -e 's/xz/gz/g'`
 ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"`
 ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
 
 mkdir -p ${ORIG_TARBALL_DIR}
-tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1
+tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xf ${REAL_TARBALL} || exit 1
 rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
 
 cd ${ORIG_TARBALL_DIR}
 
-rm -rf ASNMP
-rm -rf performance-tests
-rm -rf rpmbuild debian
-rm -rf websvcs
-rm bin/LabVIEW_RT/*.exe
-rm -rf examples/C++NPv2
-rm -rf examples/C++NPv1
-rm -rf examples/APG
-rm -rf contrib
-rm -rf apps/JAWS/clients/WebSTONE
-rm -f MPC/MPC.ico
-rm -f apps/gperf/tests/test-*.exp
-
 GZIP=-9 tar --remove-files -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR} || exit 1
 
 exit 0
diff --git a/ACE/debian/libace-VERSION.docs b/ACE/debian/libace-VERSION.docs
index ca760171412..f6ee8c541ab 100644
--- a/ACE/debian/libace-VERSION.docs
+++ b/ACE/debian/libace-VERSION.docs
@@ -1,8 +1,8 @@
-README
-VERSION.txt
-AUTHORS
+usr/share/ace/README
+usr/share/ace/VERSION.txt
+usr/share/ace/AUTHORS
 docs/FAQ
-PROBLEM-REPORT-FORM
-THANKS
-VERSION.txt
-NEWS
+usr/share/ace/PROBLEM-REPORT-FORM
+usr/share/ace/THANKS
+usr/share/ace/VERSION.txt
+usr/share/ace/NEWS
diff --git a/ACE/debian/libace-dev.docs b/ACE/debian/libace-dev.docs
index 680046f4f26..bfdac6cbd1b 100644
--- a/ACE/debian/libace-dev.docs
+++ b/ACE/debian/libace-dev.docs
@@ -1,7 +1,7 @@
-README
-VERSION.txt
-AUTHORS
+usr/share/ace/README
+usr/share/ace/VERSION.txt
+usr/share/ace/AUTHORS
 docs/FAQ
-PROBLEM-REPORT-FORM
-THANKS
-VERSION.txt
+usr/share/ace/PROBLEM-REPORT-FORM
+usr/share/ace/THANKS
+usr/share/ace/VERSION.txt
diff --git a/ACE/debian/libace-dev.install.in b/ACE/debian/libace-dev.install.in
index 389465719b1..dacd815b6e7 100644
--- a/ACE/debian/libace-dev.install.in
+++ b/ACE/debian/libace-dev.install.in
@@ -1,10 +1,10 @@
-../../bin/generate_export_file.pl       usr/lib/ace/bin
+usr/share/ace/bin/generate_export_file.pl       usr/lib/ace/bin
 ../../bin/split-cpp.pl                  usr/lib/ace/bin
 ../../bin/g++dep                        usr/lib/ace/bin
-../../bin/add_rel_link.sh               usr/lib/ace/bin
-../../bin/depgen.pl                     usr/lib/ace/bin
-../../bin/DependencyGenerator           usr/lib/ace/bin
-../../include                           usr/lib/ace
+usr/share/ace/bin/add_rel_link.sh               usr/lib/ace/bin
+usr/share/ace/bin/depgen.pl                     usr/lib/ace/bin
+usr/share/ace/bin/DependencyGenerator           usr/lib/ace/bin
+usr/share/ace/include                   usr/lib/ace
 ../../include/makeinclude/platform_macros.GNU usr/lib/ace/include/makeinclude
 usr/include/ace/*.h
 usr/include/ace/*.inl
diff --git a/ACE/debian/libace-doc.docs b/ACE/debian/libace-doc.docs
index df1bbe42d1d..16be7247697 100644
--- a/ACE/debian/libace-doc.docs
+++ b/ACE/debian/libace-doc.docs
@@ -1,2 +1,2 @@
-docs
+usr/share/ace/docs
 html/libace-doc/*
diff --git a/ACE/debian/mpc-ace.install b/ACE/debian/mpc-ace.install
index 8e3aa831f68..81257babeb9 100644
--- a/ACE/debian/mpc-ace.install
+++ b/ACE/debian/mpc-ace.install
@@ -1,5 +1,5 @@
-../../bin/m[p,w]c.pl          usr/lib/ace/bin
-../../bin/MakeProjectCreator  usr/lib/ace/bin
+usr/share/ace/bin/m[p,w]c.pl          usr/lib/ace/bin
+usr/share/ace/bin/MakeProjectCreator  usr/lib/ace/bin
 ../../MPC/config              usr/lib/ace/MPC
 ../../MPC/modules             usr/lib/ace/MPC
 ../../MPC/templates           usr/lib/ace/MPC
diff --git a/ACE/debian/not-installed b/ACE/debian/not-installed
new file mode 100644
index 00000000000..3d0d549a469
--- /dev/null
+++ b/ACE/debian/not-installed
@@ -0,0 +1,4 @@
+usr/share/ace/ace-devel.sh
+usr/share/ace/bin/ace_install_pkgconfig.pl
+usr/share/ace/bin/ace_gperf
+usr/share/ace/COPYING