Updates to APT

13 files changed, 13 insertions, 151 deletions

diff --git a/data/apt/_metadata/_apt1.8.dep b/data/apt/_metadata/_apt1.8.dep
new file mode 120000
index 000000000..41464f3be
--- /dev/null
+++ b/data/apt/_metadata/_apt1.8.dep
@@ -0,0 +1 @@
+../../_apt1.8
\ No newline at end of file
diff --git a/data/apt/_metadata/conflicts b/data/apt/_metadata/conflicts
index fa15e31d4..bc6ca00d5 100644
--- a/data/apt/_metadata/conflicts
+++ b/data/apt/_metadata/conflicts
@@ -1 +1 @@
-cydia (<< 1.0.2843-1)
+apt7 (<<1:0), apt1.4 (<<1:0), apt1.8
diff --git a/data/apt/_metadata/depends b/data/apt/_metadata/depends
index 02b911629..cd5643b98 100644
--- a/data/apt/_metadata/depends
+++ b/data/apt/_metadata/depends
@@ -1 +1 @@
-apt1.8
+libapt (>= %MYVERSION%), apt-key, berkeleydb
diff --git a/data/apt/_metadata/description b/data/apt/_metadata/description
index 61d6b8e01..e60725012 100644
--- a/data/apt/_metadata/description
+++ b/data/apt/_metadata/description
@@ -1 +1 @@
-any advanced packaging tool from Debian
+the advanced packaging tool from Debian
diff --git a/data/apt/_metadata/license b/data/apt/_metadata/license
index 9e277e57d..9d71f9909 100644..120000
--- a/data/apt/_metadata/license
+++ b/data/apt/_metadata/license
@@ -1,142 +1 @@
-Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
-
-Apt is licened 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
-
-Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. 
-
-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. 
-
-
-                      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. 
-
-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.
-      _______________________________________________________________
+../../_apt1.8/_metadata/license
\ No newline at end of file
diff --git a/data/apt/_metadata/maintainer b/data/apt/_metadata/maintainer
index 573d7ebef..32011c570 120000
--- a/data/apt/_metadata/maintainer
+++ b/data/apt/_metadata/maintainer
@@ -1 +1 @@
-../../../people/sbingner
\ No newline at end of file
+../../_apt1.8/_metadata/maintainer
\ No newline at end of file
diff --git a/data/apt/_metadata/name b/data/apt/_metadata/name
index e2367bda1..ce9e5bf4c 100644
--- a/data/apt/_metadata/name
+++ b/data/apt/_metadata/name
@@ -1 +1 @@
-APT Command Line
+APT
diff --git a/data/apt/_metadata/priority b/data/apt/_metadata/priority
index fad9e164a..a6a7b9cd7 100644
--- a/data/apt/_metadata/priority
+++ b/data/apt/_metadata/priority
@@ -1 +1 @@
-required
+standard
diff --git a/data/apt/_metadata/provides b/data/apt/_metadata/provides
new file mode 100644
index 000000000..f1c06fe2e
--- /dev/null
+++ b/data/apt/_metadata/provides
@@ -0,0 +1 @@
+apt1.8 (=%MYVERSION%)
diff --git a/data/apt/_metadata/replaces b/data/apt/_metadata/replaces
new file mode 100644
index 000000000..e82a6bf56
--- /dev/null
+++ b/data/apt/_metadata/replaces
@@ -0,0 +1 @@
+apt1.8, apt1.4
diff --git a/data/apt/_metadata/section b/data/apt/_metadata/section
index 702b7b8d3..f8a6484fe 100644..120000
--- a/data/apt/_metadata/section
+++ b/data/apt/_metadata/section
@@ -1 +1 @@
-Packaging
+../../_apt1.8/_metadata/section
\ No newline at end of file
diff --git a/data/apt/_metadata/tags b/data/apt/_metadata/tags
index b7fdc65c3..ad5d50831 100644
--- a/data/apt/_metadata/tags
+++ b/data/apt/_metadata/tags
@@ -1 +1 @@
-purpose::console, purpose::library
+purpose::console
diff --git a/data/apt/_metadata/version b/data/apt/_metadata/version
index e23e94441..a3826e12e 100644..120000
--- a/data/apt/_metadata/version
+++ b/data/apt/_metadata/version
@@ -1 +1 @@
-1:0
+../../_apt1.8/_metadata/version
\ No newline at end of file