diff options
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rw-r--r-- | debian/tests/run-tests | 1 | ||||
| -rw-r--r-- | doc/po/de.po | 121 | ||||
| -rw-r--r-- | test/integration/framework | 2 | ||||
| -rwxr-xr-x | test/integration/test-apt-ftparchive-cachedb-lp1274466 | 2 | ||||
| -rwxr-xr-x | test/integration/test-external-dependency-solver-protocol | 2 |
7 files changed, 79 insertions, 66 deletions
diff --git a/configure.ac b/configure.ac index 5cb13ff10..748dcfa63 100644 --- a/configure.ac +++ b/configure.ac @@ -6,10 +6,10 @@ dnl code more portable dnl You MUST have an environment that has all the POSIX functions and dnl some of the more popular bsd/sysv ones (like select). You'll also -dnl need a C++ compiler that is semi-standard conformant, exceptions are +dnl need a C++ compiler that is semi-standard conformant, exceptions are dnl not used but STL is. -dnl 'make -f Makefile startup' will generate the configure file from +dnl 'make -f Makefile startup' will generate the configure file from dnl configure.ac correctly and can be run at any time AC_PREREQ(2.50) @@ -53,7 +53,7 @@ AC_SEARCH_LIBS(connect,socket) SOCKETLIBS="$LIBS" AC_SUBST(SOCKETLIBS) LIBS="$SAVE_LIBS" - + dnl Checks for pthread -- disabled due to glibc bugs jgg dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) AC_SUBST(PTHREADLIB) @@ -89,6 +89,13 @@ AC_CHECK_LIB(curl, curl_easy_init, AC_MSG_ERROR([failed: I need CURL due https support]), ) +AC_LANG_PUSH([C++]) +AC_CHECK_HEADER(gtest/gtest.h,, + AC_MSG_ERROR([failed: I need gtest to build tests]), +) +AC_LANG_POP([C++]) + + AC_SUBST(BDBLIB) HAVE_ZLIB=no @@ -160,7 +167,7 @@ dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno AC_MSG_CHECKING(for h_errno) AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" - AC_EGREP_HEADER(h_errno, netdb.h, + AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], [AC_MSG_ERROR("not found.")]) ]) diff --git a/debian/tests/control b/debian/tests/control index 209f16bfd..72e9deef7 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests Restrictions: allow-stderr -Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev +Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev, db-util diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e6bc5e0d1..308031e9d 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -12,6 +12,7 @@ make -C test/interactive-helper/ APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \ APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \ APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \ +APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests diff --git a/doc/po/de.po b/doc/po/de.po index e5b61da60..b048d9661 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,14 @@ -# Translation of apt-doc to German +# Translation of apt/doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -# This file is distributed under the same license as the apt-doc package. +# This file is distributed under the same license as the apt package. # Chris Leick <c.leick@vollbio.de>, 2009-2014. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.16\n" +"Project-Id-Version: apt-doc 1.0.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2014-05-05 16:26+0200\n" -"PO-Revision-Date: 2014-04-01 14:00+0200\n" +"PO-Revision-Date: 2014-06-12 20:31+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -633,7 +633,7 @@ msgstr "APT" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt.8.xml:32 msgid "command-line interface" -msgstr "" +msgstr "Befehlszeilenschnittstelle" #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 @@ -652,6 +652,11 @@ msgid "" "management of the system. See also &apt-get; and &apt-cache; for more low-" "level command options." msgstr "" +"<command>apt</command> (Advanced Package Tool, auf Deutsch »fortschrittliches " +"Paketwerkzeug«) ist das Befehlszeilenwerkzeug für den Umgang mit Paketen. Es " +"stellt eine Befehlszeilenschnittstelle zur Verwaltung von Paketen auf dem " +"System bereit. Weitere untergeordnete Befehlsoptionen finden sie unter " +"&apt-get; und &apt-cache;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:47 @@ -661,6 +666,10 @@ msgid "" "<option>--installed</option>, <option>--upgradable</option>, <option>--all-" "versions</option> are supported." msgstr "" +"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es " +"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die " +"folgenden Optionen werden unterstützt: <option>--installed</option>, " +"<option>--upgradable</option>, <option>--all-versions</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:58 @@ -668,19 +677,17 @@ msgid "" "<literal>search</literal> searches for the given term(s) and display " "matching packages." msgstr "" +"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt passende " +"Pakete an." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:64 -#, fuzzy -#| msgid "" -#| "<literal>rdepends</literal> shows a listing of each reverse dependency a " -#| "package has." msgid "" "<literal>show</literal> shows the package information for the given " "package(s)." msgstr "" -"<literal>rdepends</literal> zeigt eine Liste von jeder " -"Rückwärtsabhängigkeit, die ein Paket hat." +"<literal>show</literal> zeigt die Paketinformationen für die angegebenen " +"Pakete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:71 @@ -688,6 +695,8 @@ msgid "" "<literal>install</literal> is followed by one or more package names desired " "for installation or upgrading." msgstr "" +"<literal>install</literal> ist gefolgt von einem oder mehreren Paketnamen, " +"von denen eine Installation oder ein Upgrade gewünscht wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:75 apt-get.8.xml:118 @@ -728,19 +737,17 @@ msgid "" "<literal>edit-sources</literal> lets you edit your sources.list file and " "provides basic sanity checks." msgstr "" +"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer " +"»sources.list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:99 -#, fuzzy -#| msgid "" -#| "<literal>showhold</literal> is used to print a list of packages on hold " -#| "in the same way as for the other show commands." msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources." msgstr "" -"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter " -"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben." +"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit " +"ihren Quellen in Einklang zu bringen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:105 @@ -750,6 +757,11 @@ msgid "" "<filename>/etc/apt/sources.list</filename>. New package will be installed, " "but existing package will never removed." msgstr "" +"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller " +"derzeit auf Ihrem System installierten Pakete von den in " +"<filename>/etc/apt/sources.list</filename> aufgezählten Quellen zu " +"installieren. Dabei werden neue Pakete installiert, existierende jedoch nicht " +"entfernt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:114 @@ -758,6 +770,9 @@ msgid "" "also remove installed packages if that is required in order to resolve a " "package conflict." msgstr "" +"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann " +"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines " +"Paketkonflikts nötig ist." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 @@ -769,7 +784,7 @@ msgstr "Optionen" #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:134 msgid "Script usage" -msgstr "" +msgstr "Skriptaufruf" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:136 @@ -780,11 +795,17 @@ msgid "" "&apt-cache; and &apt-get; via APT options. Please prefer using these " "commands in your scripts." msgstr "" +"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann die " +"Ausgabe zwischen Versionen ändern. Obwohl es versucht, nicht die " +"Abwärtskompatibilität zu unterbrechen, gibt es dafür keine Garantie. Alle " +"Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über " +"APT-Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in " +"Ihren Skripten." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:144 msgid "Differences to &apt-get;" -msgstr "" +msgstr "Unterschiede zu &apt-get;" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:145 @@ -793,20 +814,19 @@ msgid "" "does not need to be backward compatible like &apt-get;. Therefore some " "options are different:" msgstr "" +"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die " +"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-get;. " +"Daher unterscheiden sich einige Optionen:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:151 -#, fuzzy -#| msgid "the <literal>Package:</literal> line" msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled." -msgstr "die <literal>Package:</literal>-Zeile" +msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:155 -#, fuzzy -#| msgid "the <literal>Component:</literal> line" msgid "The option <literal>APT::Color</literal> is enabled." -msgstr "die <literal>Component:</literal>-Zeile" +msgstr "Die Option <literal>APT::Color</literal> ist aktiviert." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:159 @@ -814,15 +834,17 @@ msgid "" "A new <literal>list</literal> command is available similar to <literal>dpkg " "--list</literal>." msgstr "" +"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg " +"--list</literal> ähnlich." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:164 -#, fuzzy -#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgid "" "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> " "enabled by default." -msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" +msgstr "" +"Bei der Option <literal>upgrade</literal> ist standardmäßig " +"<literal>--with-new-pkgs</literal> aktiviert." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197 @@ -835,18 +857,12 @@ msgstr "Siehe auch" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:175 -#, fuzzy -#| msgid "" -#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-" -#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -#| "preferences;, the APT Howto." msgid "" "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT " "User's guide in &guidesdir;, &apt-preferences;, the APT Howto." msgstr "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " -"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, " -"das APT-Howto." +"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, die " +"APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137 @@ -857,15 +873,11 @@ msgstr "Diagnose" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:181 -#, fuzzy -#| msgid "" -#| "<command>apt-get</command> returns zero on normal operation, decimal 100 " -#| "on error." msgid "" "<command>apt</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" -"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal " +"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal " "100 bei Fehlern." #. type: Content of: <refentry><refnamediv><refpurpose> @@ -1766,13 +1778,6 @@ msgstr "" # FIXME s/Item/Items/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:535 -#, fuzzy -#| msgid "" -#| "Show user friendly progress information in the terminal window when " -#| "packages are installed, upgraded or removed. For a machine parsable " -#| "version of this data see README.progress-reporting in the apt doc " -#| "directory. Configuration Item: <literal>DpkgPM::Progress</literal> and " -#| "<literal>Dpkg::Progress-Fancy</literal>." msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1783,8 +1788,8 @@ msgstr "" "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn " "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade " "durchgeführt wird. Informationen über eine maschinell auswertbare Version " -"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. " -"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und " +"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. " +"Konfigurationselemente: <literal>Dpkg::Progress</literal> und " "<literal>Dpkg::Progress-Fancy</literal>." #. type: Content of: <refentry><refsect1><title> @@ -5434,6 +5439,10 @@ msgid "" "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or " "<literal>APT::Update::{Pre,Post}-Invoke</literal>." msgstr "" +"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies " +"schließt z.B. die Konfigurationsoptionen " +"<literal>DPkg::{Pre,Post}-Invoke</literal> oder " +"<literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239 @@ -8834,20 +8843,12 @@ msgstr "" "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine " "Entscheidungen können manchmal ziemlich überraschend sein." +# s/package/packages/ #. type: <p></p> #: guide.sgml:163 -#, fuzzy -#| msgid "" -#| "<prgn>apt-get</prgn> has several command line options that are detailed " -#| "in its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " -#| "option is <tt>-d</tt> which does not install the fetched files. If the " -#| "system has to download a large number of package it would be undesired to " -#| "start installing them in case something goes wrong. When <tt>-d</tt> is " -#| "used the downloaded archives can be installed by simply running the " -#| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/test/integration/framework b/test/integration/framework index 7959699fd..a687dcb35 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -120,6 +120,7 @@ apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; } aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; } aptitude() { runapt aptitude "$@"; } aptextracttemplates() { runapt apt-extracttemplates "$@"; } +aptinternalsolver() { runapt "${APTINTERNALSOLVER}" "$@"; } dpkg() { command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" @@ -181,6 +182,7 @@ setupenvironment() { METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"} APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} + APTINTERNALSOLVER=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"} test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466 index 2a28d6ef0..579ae33a6 100755 --- a/test/integration/test-apt-ftparchive-cachedb-lp1274466 +++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466 @@ -46,6 +46,8 @@ Description: an autogenerated dummy foo=1/test " aptftparchive --db old-format.db packages . # ensure that the db is updated and contains the new sha512 +db_dump old-format.db > old-format.dump + testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol index 129565993..09230d383 100755 --- a/test/integration/test-external-dependency-solver-protocol +++ b/test/integration/test-external-dependency-solver-protocol @@ -53,7 +53,7 @@ testsuccess test -s /tmp/dump.edsp configarchitecture 'armel' msgtest 'Test direct calling is okay for' 'apt-internal-solver' -cat /tmp/dump.edsp | runapt apt-internal-solver > solver.result 2>&1 || true +cat /tmp/dump.edsp | aptinternalsolver > solver.result 2>&1 || true if [ "$(tail -n2 solver.result | head -n1 )" = "Message: Done" ]; then msgpass else |