summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-22 10:11:50 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-22 10:11:50 +0100
commit7ec263803c488d90cc72ce46d04d9f5923aa093d (patch)
tree49b971941a7619ec1de5a6e3b03edd4b2c6ec9ce /debian
parentbfbf474475649ee7c9b36b2f1c92d33e071dfef2 (diff)
releasing version 0.7.25ubuntu10.7.25ubuntu1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/copyright151
2 files changed, 18 insertions, 137 deletions
diff --git a/debian/changelog b/debian/changelog
index 6fb5d6a15..e6afafe99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-apt (0.7.25ubuntu1) UNRELEASED; urgency=low
+apt (0.7.25ubuntu1) lucid; urgency=low
* Merged from the mvo branch
* merged from the lp:~mvo/apt/history branch
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 17:01:25 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Dec 2009 09:44:08 +0100
apt (0.7.25) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 3baf9ac5a..c0e89b51a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,142 +1,23 @@
Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
+Apt is currently developed by APT Development Team <deity@lists.debian.org>.
-Apt is licensed under the terms of the GNU General Public License (GPL),
-version 2.0 or later, as published by the Free Software Foundation. See
-the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or
-<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
-of the GNU General Public License.
-
-In addition, prior to November 15th, 2000, apt may be distributed under
-terms identical to the above with the following addition:
-
-Works using apt may link against the GUI library "libqt", copyright by
-Troll Tech AS, Norway, provided that:
-
-1. The version of "libqt" is licensed under the terms of the "Qt Free Edition
- License" published by Troll Tech AS. The license terms identified as
- the Qt Free Edition License below are the only such terms under which
- distribution of works derived from both apt and "libqt" are permitted;
-
-and
-
-2. The source code of the version of "libqt" used is
-
- a) Distributed with the binary version;
-
- or
-
- b) Downloadable by anyone, without fee, using a publicly-announced
- URL on the Internet, for a duration of at least three years
- starting with distribution of the binary version.
-
-On and after November 15th, 2000, the above additional terms lose all
-force, and apt will be licensed only under the terms of the GNU General
-Public License, version 2.0 or later.
-
- _______________________________________________________________
-
-The following text, up to the text of the Qt Free Edition License, is
-informational and not part of the license terms on apt.
-
-Modifications to apt in either source or compiled form must be licensed
-under the terms of the GNU General Public License, version 2.0 (or later),
-but need not include the above clause permitting usage of the "libqt"
-library under the Qt Free Edition License. Note that removal of this
-clause will result in software which is not licensed for binary
-redistribution linked against software governed by the Qt Free Edition
-License. In the event that a version of "libqt" is released that is
-licensed under terms that do not conflict with the GPL, the additional
-clause above is not required to grant permission for distribution of works
-that are derived from both apt and "libqt".
-
-No part of apt is licensed under the Qt Free Edition License. The terms
-below are provided to help identify the circumstances under which the
-"libqt" library may be used with apt (or a work derived from both). The
-terms below are copied from the LICENSE file of the qt-1.44 distribution,
-as of November 10th, 1999.
-
- _______________________________________________________________
-
- QT FREE EDITION LICENSE
+License: GPLv2+
-Copyright (C) 1992-1999 Troll Tech AS. All rights reserved.
+ This program 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 is the license for Qt Free Edition version 1.44; it covers private use,
-use of third-party application programs based on Qt, and development of
-free software for the free software community.
+ This program 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, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- COPYRIGHT AND RESTRICTIONS
-
-The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited
-to use with the X Window System.
-
-You may copy this version of the Qt Free Edition provided that the entire
-archive is distributed unchanged and as a whole, including this notice.
-
-You may use this version of the Qt Free Edition to compile, link and run
-application programs legally developed by third parties.
-
-You may use the Qt Free Edition to create application programs
-provided that:
-
- You accept this license.
- Your software does not require modifications to Qt Free Edition.
- You satisfy ONE of the following three requirements
- EITHER
- Users of your software can freely obtain source code for the
- software, freely modify the source code (possibly with
- restrictions on copyright notices, attributions and legal
- responsibility), and freely redistribute original or modified
- versions of the software.
- OR
- Your software is distributed under the GNU GENERAL
- PUBLIC LICENSE, version 2 or later, as defined by the
- Free Software Foundation.
- OR
- Your software is distributed under the GNU LIBRARY
- GENERAL PUBLIC LICENSE, version 2 or later, as
- defined by the Free Software Foundation.
-
-If you are paid to develop something with Qt Free Edition or it is a part of
-your job the following conditions also apply:
-
- Your software must not require libraries, programs, data or
- documentation that are not available outside your organization in
- order to compile or use.
- If and when your organization starts using the software, you must
- notify Troll Tech AS of the following:
- Your organization's name and purpose.
- The software's name and purpose.
- The software's license.
- That your organization considers the software to be free
- software.
-
-You may also use the Qt Free Edition to create reusable components
-(such as libraries) provided that you accept the terms above, and in
-addition that:
-
- Your components' license includes the following text:
-
- [Your package] requires the Qt library, which is
- copyright Troll Tech AS. Freely distributable
- programs may generally use Qt Free Edition free of
- charge, see [README.QT] for details.
-
- README.QT is distributed along with your components.
- Qt Free Edition is not distributed as an integral part of your
- components.
-
- LIMITATIONS OF LIABILITY
-
-Troll Tech AS makes no obligation under this license to support or
-upgrade Qt Free Edition, or assist in the use of Qt Free Edition.
-
-In no event shall Troll Tech AS be liable for any lost revenue or profits or
-other direct, indirect, special, incidental or consequential damages, even
-if Troll Tech has been advised of the possibility of such damages.
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
-QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND,
-INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE.
- _______________________________________________________________