Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2019-12-14 12:04:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Sat Dec 14 12:04:40 2019 rev:39 rq:756137 version:19.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2019-11-13 13:15:07.522873018 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.4691/akonadiconsole.changes 2019-12-14 12:05:36.919380733 +0100 @@ -1,0 +2,31 @@ +Tue Dec 10 06:38:01 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.0 +- Changes since 19.11.90: + * Fix use flag + +------------------------------------------------------------------- +Sat Nov 30 09:11:23 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.11.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/19.12-rc +- No code change since 19.11.80 + +------------------------------------------------------------------- +Sun Nov 24 13:28:54 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.11.80 + * New feature release +- Changes since 19.08.3: + * Make it compiles without deprecated kf5 methods + * Use same version as other pim apps + * Fix Hidpi support + * Use QLatin1String in join/startswith/endsWith/contains + QString::replace operates on the same object, no need to reassign + * Add release version too + +------------------------------------------------------------------- Old: ---- akonadiconsole-19.08.3.tar.xz akonadiconsole-19.08.3.tar.xz.sig New: ---- akonadiconsole-19.12.0.tar.xz akonadiconsole-19.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.DPCxp1/_old 2019-12-14 12:05:38.531380453 +0100 +++ /var/tmp/diff_new_pack.DPCxp1/_new 2019-12-14 12:05:38.535380453 +0100 @@ -1,7 +1,7 @@ # # spec file for package akonadiconsole # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,56 +16,55 @@ # -%define kf5_version 5.28.0 +%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadiconsole -Version: 19.08.3 +Version: 19.12.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: akonadi-contact-devel -BuildRequires: akonadi-mime-devel -BuildRequires: akonadi-search-devel -BuildRequires: akonadi-server-devel >= %{_kapp_version} -BuildRequires: calendarsupport-devel BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: fdupes BuildRequires: gettext-devel -BuildRequires: kcalcore-devel -BuildRequires: kcompletion-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcontacts-devel -BuildRequires: kcrash-devel -BuildRequires: kdbusaddons-devel -BuildRequires: kdoctools-devel -BuildRequires: ki18n-devel -BuildRequires: kitemmodels-devel -BuildRequires: kmime-devel -BuildRequires: kpimtextedit-devel -BuildRequires: ktextwidgets-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: kxmlgui-devel -BuildRequires: libkdepim-devel -BuildRequires: libkleo-devel BuildRequires: libxapian-devel -BuildRequires: messagelib-devel -BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5DBus) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 +BuildRequires: cmake(KF5Akonadi) +BuildRequires: cmake(KF5AkonadiContact) +BuildRequires: cmake(KF5AkonadiMime) +BuildRequires: cmake(KF5AkonadiSearch) +BuildRequires: cmake(KF5CalendarCore) +BuildRequires: cmake(KF5CalendarSupport) +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5Contacts) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5ItemModels) +BuildRequires: cmake(KF5Libkdepim) +BuildRequires: cmake(KF5Libkleo) +BuildRequires: cmake(KF5MessageCore) +BuildRequires: cmake(KF5Mime) +BuildRequires: cmake(KF5PimTextEdit) +BuildRequires: cmake(KF5TextWidgets) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(Qt5DBus) >= 5.6.0 +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 Obsoletes: akonadi_resources < %{version} # It can only build on the same platforms as Qt Webengine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 ++++++ akonadiconsole-19.08.3.tar.xz -> akonadiconsole-19.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/CMakeLists.txt new/akonadiconsole-19.12.0/CMakeLists.txt --- old/akonadiconsole-19.08.3/CMakeLists.txt 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/CMakeLists.txt 2019-12-03 08:54:29.000000000 +0100 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.12.3") +set(KDEPIM_VERSION_NUMBER "5.13.0") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.63.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -33,25 +33,23 @@ if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() +set(KDE_APPLICATIONS_VERSION "19.12.0") - -set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") +set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION} (${KDE_APPLICATIONS_VERSION})") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.12.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.12.3") -set(AKONADI_VERSION "5.12.3") -set(AKONADI_SEARCH_VERSION "5.12.3") +set(AKONADI_CONTACT_VERSION "5.13.0") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.13.0") +set(AKONADI_VERSION "5.13.0") +set(AKONADI_SEARCH_VERSION "5.13.0") set(QT_REQUIRED_VERSION "5.11.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.12.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.12.3") -set(KCALENDARCORE_LIB_VERSION "5.12.3") -set(KCONTACTS_LIB_VERSION "5.12.3") -set(KMIME_LIB_VERSION "5.12.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.13.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.13.0") +set(KMIME_LIB_VERSION "5.13.0") # Find KF5 package find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -71,8 +69,8 @@ # Find KdepimLibs Package find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) -find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED) +find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) if (NOT WIN32) @@ -93,9 +91,13 @@ set(ENABLE_SEARCH TRUE) set(ENABLE_CONTENTVIEWS TRUE) endif() -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) -include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) +endif() +include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) +configure_file(akonadiconsole-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadiconsole-version.h @ONLY) configure_file(config-akonadiconsole.h.cmake ${CMAKE_BINARY_DIR}/config-akonadiconsole.h) install(FILES akonadiconsole.renamecategories akonadiconsole.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/akonadiconsole-version.h.cmake new/akonadiconsole-19.12.0/akonadiconsole-version.h.cmake --- old/akonadiconsole-19.08.3/akonadiconsole-version.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadiconsole-19.12.0/akonadiconsole-version.h.cmake 2019-12-03 08:54:29.000000000 +0100 @@ -0,0 +1,25 @@ +/* + Copyright (c) 2019 Laurent Montel <[email protected]> + + 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 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef AKONADICONSOLE_VERSION_H +#define AKONADICONSOLE_VERSION_H + + +#define KDEPIM_VERSION "@KDEPIM_VERSION@" + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/agentwidget.cpp new/akonadiconsole-19.12.0/src/agentwidget.cpp --- old/akonadiconsole-19.08.3/src/agentwidget.cpp 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/agentwidget.cpp 2019-12-03 08:54:29.000000000 +0100 @@ -136,7 +136,7 @@ ui.restartButton->setIcon(QIcon::fromTheme(QStringLiteral("system-reboot"))); //FIXME: Is using system-reboot icon here a good idea? connect(ui.restartButton, &QPushButton::clicked, this, &AgentWidget::restartAgent); - ui.mFilterAccount->setProxy(ui.instanceWidget->agentFilterProxyModel()); + connect(ui.mFilterAccount, &QLineEdit::textChanged, ui.instanceWidget->agentFilterProxyModel(), &AgentFilterProxyModel::setFilterFixedString); ui.mFilterAccount->installEventFilter(this); ControlGui::widgetNeedsAkonadi(this); } @@ -435,8 +435,8 @@ i18nc("Two statuses, for example \"Online, Running (66%)\" or \"Offline, Broken\"", "%1, %2", onlineStatus, agentStatus)); ui.statusMessageLabel->setText(instance.statusMessage()); - ui.capabilitiesLabel->setText(instance.type().capabilities().join(QStringLiteral(", "))); - ui.mimeTypeLabel->setText(instance.type().mimeTypes().join(QStringLiteral(", "))); + ui.capabilitiesLabel->setText(instance.type().capabilities().join(QLatin1String(", "))); + ui.mimeTypeLabel->setText(instance.type().mimeTypes().join(QLatin1String(", "))); } else { ui.identifierLabel->setText(QString()); ui.typeLabel->setText(QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/agentwidget.ui new/akonadiconsole-19.12.0/src/agentwidget.ui --- old/akonadiconsole-19.08.3/src/agentwidget.ui 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/agentwidget.ui 2019-12-03 08:54:29.000000000 +0100 @@ -12,7 +12,7 @@ </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0" colspan="7"> - <widget class="KFilterProxySearchLine" name="mFilterAccount"/> + <widget class="QLineEdit" name="mFilterAccount"/> </item> <item row="1" column="0" colspan="7"> <widget class="Akonadi::AgentInstanceWidget" name="instanceWidget" native="true"> @@ -246,14 +246,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>Akonadi::AgentInstanceWidget</class> - <extends>QWidget</extends> - <header location="global">AkonadiWidgets/agentinstancewidget.h</header> - <container>1</container> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/instanceselector.h new/akonadiconsole-19.12.0/src/instanceselector.h --- old/akonadiconsole-19.08.3/src/instanceselector.h 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/instanceselector.h 2019-12-03 08:54:29.000000000 +0100 @@ -39,7 +39,7 @@ { Q_OBJECT public: - explicit InstanceSelector(const QString &remoteHost, QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr); + explicit InstanceSelector(const QString &remoteHost, QWidget *parent = nullptr, Qt::WindowFlags flags = {}); virtual ~InstanceSelector(); private Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/main.cpp new/akonadiconsole-19.12.0/src/main.cpp --- old/akonadiconsole-19.08.3/src/main.cpp 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/main.cpp 2019-12-03 08:54:29.000000000 +0100 @@ -20,7 +20,7 @@ */ #include "instanceselector.h" - +#include "akonadiconsole-version.h" #include <Kdelibs4ConfigMigrator> #include <KAboutData> @@ -35,8 +35,8 @@ int main(int argc, char **argv) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); QApplication app(argc, argv); - app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); Kdelibs4ConfigMigrator migrate(QStringLiteral("akonadiconsole")); migrate.setConfigFiles(QStringList() << QStringLiteral("akonadiconsolerc")); migrate.setUiFiles(QStringList() << QStringLiteral("akonadiconsoleui.rc")); @@ -44,7 +44,7 @@ KAboutData aboutData(QStringLiteral("akonadiconsole"), QStringLiteral("Akonadi Console"), - QStringLiteral("0.99"), + QStringLiteral(KDEPIM_VERSION), QStringLiteral("The Management and Debugging Console for Akonadi"), KAboutLicense::GPL, QStringLiteral("(c) 2006-2019 the Akonadi developer"), QString(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/monitorswidget.cpp new/akonadiconsole-19.12.0/src/monitorswidget.cpp --- old/akonadiconsole-19.08.3/src/monitorswidget.cpp 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/monitorswidget.cpp 2019-12-03 08:54:29.000000000 +0100 @@ -100,7 +100,7 @@ break; } } - return rv.join(QStringLiteral(", ")); + return rv.join(QLatin1String(", ")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/notificationmodel.cpp new/akonadiconsole-19.12.0/src/notificationmodel.cpp --- old/akonadiconsole-19.08.3/src/notificationmodel.cpp 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/notificationmodel.cpp 2019-12-03 08:54:29.000000000 +0100 @@ -184,7 +184,7 @@ for (const auto &item : items) { rv.push_back(QString::number(item.id())); } - return rv.join(QStringLiteral(", ")); + return rv.join(QLatin1String(", ")); } case ChangeNotification::Collection: return Protocol::cmdCast<Protocol::CollectionChangeNotification>(msg.notification()).collection().id(); @@ -203,7 +203,7 @@ for (const auto &l : listeners) { rv.push_back(QString::fromUtf8(l)); } - return rv.join(QStringLiteral(", ")); + return rv.join(QLatin1String(", ")); } } } else if (role == NotificationRole) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/notificationmonitor.cpp new/akonadiconsole-19.12.0/src/notificationmonitor.cpp --- old/akonadiconsole-19.08.3/src/notificationmonitor.cpp 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/notificationmonitor.cpp 2019-12-03 08:54:29.000000000 +0100 @@ -534,7 +534,7 @@ break; } } - appendRow(model, QStringLiteral("Monitored Types"), types.join(QStringLiteral(", "))); + appendRow(model, QStringLiteral("Monitored Types"), types.join(QLatin1String(", "))); appendRow(model, QStringLiteral("Monitored Mime Types"), toString(ntf.mimeTypes())); appendRow(model, QStringLiteral("Monitored Resources"), toString(ntf.resources())); appendRow(model, QStringLiteral("Ignored Sessions"), toString(ntf.ignoredSessions())); @@ -598,7 +598,7 @@ appendRow(item, QStringLiteral("Include Statistics"), toString(cfs.includeStatistics())); appendRow(item, QStringLiteral("Resource"), cfs.resource()); appendRow(item, QStringLiteral("Content Mime Types"), - cfs.contentMimeTypes().join(QStringLiteral(", "))); + cfs.contentMimeTypes().join(QLatin1String(", "))); appendRow(item, QStringLiteral("Attributes"), toString(cfs.attributes())); appendRow(item, QStringLiteral("Fetch ID Only"), toString(cfs.fetchIdOnly())); QString ancestorRetrieval; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/tagpropertiesdialog.cpp new/akonadiconsole-19.12.0/src/tagpropertiesdialog.cpp --- old/akonadiconsole-19.08.3/src/tagpropertiesdialog.cpp 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/tagpropertiesdialog.cpp 2019-12-03 08:54:29.000000000 +0100 @@ -287,7 +287,7 @@ for (int i = 0; i < mRemovedRIDs.count(); ++i) { conds << QStringLiteral("name = ?"); } - queryStr += conds.join(QStringLiteral(" OR ")) + QLatin1String(")"); + queryStr += conds.join(QLatin1String(" OR ")) + QLatin1Char(')'); query.prepare(queryStr); query.addBindValue(mTag.id()); for (const QString &removedRid : qAsConst(mRemovedRIDs)) { @@ -309,7 +309,7 @@ for (int i = 0; i < mChangedRIDs.count(); ++i) { conds << QStringLiteral("name = ?"); } - queryStr += conds.join(QStringLiteral(" OR ")); + queryStr += conds.join(QLatin1String(" OR ")); query.prepare(queryStr); for (const QString &res : qAsConst(mChangedRIDs)) { query.addBindValue(res); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-19.08.3/src/utils.h new/akonadiconsole-19.12.0/src/utils.h --- old/akonadiconsole-19.08.3/src/utils.h 2019-10-30 07:43:22.000000000 +0100 +++ new/akonadiconsole-19.12.0/src/utils.h 2019-12-03 08:54:29.000000000 +0100 @@ -78,7 +78,7 @@ for (const auto &v : set) { rv << toString(v); } - return rv.join(QStringLiteral(", ")); + return rv.join(QLatin1String(", ")); } inline ++++++ applications.keyring ++++++ Binary files /var/tmp/diff_new_pack.DPCxp1/_old and /var/tmp/diff_new_pack.DPCxp1/_new differ
