[neon/neon-packaging/digikam/Neon/unstable] debian: lints
Carlos De Maine
null at kde.org
Fri Nov 24 21:53:56 GMT 2023
Git commit 10d3575023764a8ad5dd47ad183f47d79f1189ff by Carlos De Maine.
Committed on 24/11/2023 at 22:53.
Pushed by carlosdem into branch 'Neon/unstable'.
lints
D +0 -10 debian/NEWS.Debian
D +0 -1 debian/compat
M +5 -5 debian/control
M +4 -9 debian/digikam-data.install
M +1 -1 debian/digikam-dev.install
M +1 -1 debian/digikam-doc.install
D +0 -44 debian/git_extend_orig.rb
M +0 -191 debian/not-installed
M +6 -14 debian/rules
M +0 -1 debian/showfoto.install
M +5 -0 debian/source/lintian-overrides
https://invent.kde.org/neon/neon-packaging/digikam/-/commit/10d3575023764a8ad5dd47ad183f47d79f1189ff
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644
index e992f1d..0000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-digikam (4:5.0.0-1) experimental; urgency=medium
-
- Upgrade from DigiKam 4: The configuration files for DigiKam 5 are in a
- different location than DigiKam 4. The configuration is NOT migrated
- automatically and -- due to unresolved bugs -- it is NOT recommended
- to do so manually. Instead, configure DigiKam to use the same
- location for collections and database. The database generated by
- DigiKam 4 can be used by DigiKam 5 unchanged.
-
- -- Steve M. Robbins <smr at debian.org> Wed, 10 Aug 2016 22:56:38 -0500
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index e5ea10d..9d33c8d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Uploaders: Mark Purcell <msp at debian.org>,
Fathi Boudra <fabo at debian.org>,
Steve M. Robbins <smr at debian.org>
Build-Depends: bison,
- cmake (>= 3.0.0),
- debhelper (>= 9),
+ cmake,
+ debhelper-compat (= 13),
doxygen,
- extra-cmake-modules (>= 1.7.0),
+ extra-cmake-modules,
flex,
glslang-dev,
graphviz,
@@ -72,7 +72,7 @@ Build-Depends: bison,
qtmultimedia5-dev,
qtwebengine5-dev
Build-Conflicts: libgraphicsmagick1-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/digikam/trunk
Homepage: http://www.digikam.org
Vcs-Git: https://invent.kde.org/neon/neon-packaging/digikam.git
@@ -155,7 +155,7 @@ Description: handbook for digiKam
This package contains the handbooks for digiKam.
Package: digikam-dev
-Architecture: all
+Architecture: any
Depends: digikam (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: digiKam development files
Contains the development files used for digiKam.
diff --git a/debian/digikam-data.install b/debian/digikam-data.install
index b260c97..e33eeb5 100644
--- a/debian/digikam-data.install
+++ b/debian/digikam-data.install
@@ -1,11 +1,6 @@
-usr/share/digikam
-usr/share/icons/hicolor/*/actions
-usr/share/icons/hicolor/*/apps/digikam.*
-usr/share/icons/hicolor/*/apps/dk-*.png
-usr/share/icons/hicolor/*/apps/dk-*.svgz
-usr/share/icons/hicolor/*/apps/expoblending.*
-usr/share/icons/hicolor/*/apps/panorama.*
+usr/share/digikam/
+usr/share/icons/hicolor/
usr/share/knotifications5/digikam*
usr/share/kxmlgui5/digikam
-usr/share/locale/*/LC_MESSAGES/digikam.mo
-usr/share/solid
+usr/share/locale/*/LC_MESSAGES/
+usr/share/solid/
diff --git a/debian/digikam-dev.install b/debian/digikam-dev.install
index 31924fe..2e11837 100644
--- a/debian/digikam-dev.install
+++ b/debian/digikam-dev.install
@@ -1,4 +1,4 @@
usr/include/digikam/
usr/lib/*/libdigikamcore.so
usr/lib/*/libdigikamdatabase.so
-usr/lib/*/libdigikamgui.so exists
\ No newline at end of file
+usr/lib/*/libdigikamgui.so
\ No newline at end of file
diff --git a/debian/digikam-doc.install b/debian/digikam-doc.install
index ad974ab..6bcf490 100644
--- a/debian/digikam-doc.install
+++ b/debian/digikam-doc.install
@@ -1 +1 @@
-#usr/share/doc/HTML/*/digikam
+usr/share/doc/HTML/
diff --git a/debian/git_extend_orig.rb b/debian/git_extend_orig.rb
deleted file mode 100755
index aae2acb..0000000
--- a/debian/git_extend_orig.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# Copyright (C) 2016 Harald Sitter <sitter at kde.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) version 3, or any
-# later version accepted by the membership of KDE e.V. (or its
-# successor approved by the membership of KDE e.V.), which shall
-# act as a proxy defined in Section 6 of version 3 of the license.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library. If not, see <http://www.gnu.org/licenses/>.
-
-require 'fileutils'
-require 'git'
-
-def list
- Dir.glob('*', File::FNM_DOTMATCH).reject { |x| %w(. ..).include?(x) }
-end
-
-ENV['GITSLAVE'] = '.gitslave'
-FileUtils.rm_r(Dir.glob('*') - %w(debian), verbose: true)
-repo = Git.clone('https://invent.kde.org/graphics/digikam.git', 'digikam')
-system('./download-repos', chdir: repo.dir.path) || raise
-FileUtils.rm_r(Dir.glob("#{repo.dir.path}/**/.git"), verbose: true)
-FileUtils.cp_r("#{repo.dir.path}/.", Dir.pwd, verbose: true)
-FileUtils.rm_r(repo.dir.path)
-
-dirname = File.basename(Dir.pwd)
-Dir.chdir('..') do
- tar = Dir.glob('*.orig.tar.xz')
- tar.size == 1 || raise
- tar = tar[0]
- FileUtils.rm(tar, verbose: true)
- system('tar', "--exclude=#{dirname}/debian", '-cJf', tar, dirname) || raise
-end
diff --git a/debian/not-installed b/debian/not-installed
index fb2a91d..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,191 +0,0 @@
-usr/share/icons/hicolor/scalable/apps/mediawiki.svgz
-usr/share/icons/hicolor/scalable/apps/smugmug.svgz
-usr/share/icons/hicolor/scalable/apps/flickr.svgz
-usr/share/icons/hicolor/scalable/apps/facebook.svgz
-usr/share/icons/hicolor/scalable/apps/imgur.svgz
-usr/share/icons/hicolor/scalable/apps/piwigo.svgz
-usr/share/icons/hicolor/scalable/apps/googlephoto.svgz
-usr/share/icons/hicolor/22x22/apps/rajce.png
-usr/share/icons/hicolor/22x22/apps/smugmug.png
-usr/share/icons/hicolor/22x22/apps/dropbox.png
-usr/share/icons/hicolor/22x22/apps/mediawiki.png
-usr/share/icons/hicolor/22x22/apps/googlephoto.png
-usr/share/icons/hicolor/22x22/apps/imageshack.png
-usr/share/icons/hicolor/22x22/apps/flickr.png
-usr/share/icons/hicolor/22x22/apps/googledrive.png
-usr/share/icons/hicolor/22x22/apps/imgur.png
-usr/share/icons/hicolor/22x22/apps/piwigo.png
-usr/share/icons/hicolor/22x22/apps/facebook.png
-usr/share/icons/hicolor/32x32/apps/rajce.png
-usr/share/icons/hicolor/32x32/apps/smugmug.png
-usr/share/icons/hicolor/32x32/apps/dropbox.png
-usr/share/icons/hicolor/32x32/apps/mediawiki.png
-usr/share/icons/hicolor/32x32/apps/googlephoto.png
-usr/share/icons/hicolor/32x32/apps/imageshack.png
-usr/share/icons/hicolor/32x32/apps/flickr.png
-usr/share/icons/hicolor/32x32/apps/googledrive.png
-usr/share/icons/hicolor/32x32/apps/imgur.png
-usr/share/icons/hicolor/32x32/apps/piwigo.png
-usr/share/icons/hicolor/32x32/apps/facebook.png
-usr/share/icons/hicolor/48x48/apps/rajce.png
-usr/share/icons/hicolor/48x48/apps/smugmug.png
-usr/share/icons/hicolor/48x48/apps/dropbox.png
-usr/share/icons/hicolor/48x48/apps/mediawiki.png
-usr/share/icons/hicolor/48x48/apps/googlephoto.png
-usr/share/icons/hicolor/48x48/apps/imageshack.png
-usr/share/icons/hicolor/48x48/apps/flickr.png
-usr/share/icons/hicolor/48x48/apps/googledrive.png
-usr/share/icons/hicolor/48x48/apps/imgur.png
-usr/share/icons/hicolor/48x48/apps/piwigo.png
-usr/share/icons/hicolor/48x48/apps/facebook.png
-usr/share/icons/hicolor/16x16/apps/rajce.png
-usr/share/icons/hicolor/16x16/apps/smugmug.png
-usr/share/icons/hicolor/16x16/apps/dropbox.png
-usr/share/icons/hicolor/16x16/apps/mediawiki.png
-usr/share/icons/hicolor/16x16/apps/googlephoto.png
-usr/share/icons/hicolor/16x16/apps/imageshack.png
-usr/share/icons/hicolor/16x16/apps/flickr.png
-usr/share/icons/hicolor/16x16/apps/googledrive.png
-usr/share/icons/hicolor/16x16/apps/imgur.png
-usr/share/icons/hicolor/16x16/apps/piwigo.png
-usr/share/icons/hicolor/16x16/apps/facebook.png
-usr/share/icons/hicolor/32x32/apps/box.png
-usr/share/icons/hicolor/32x32/apps/onedrive.png
-usr/share/icons/hicolor/32x32/apps/pinterest.png
-usr/share/icons/hicolor/48x48/apps/box.png
-usr/share/icons/hicolor/48x48/apps/onedrive.png
-usr/share/icons/hicolor/48x48/apps/pinterest.png
-usr/share/icons/hicolor/16x16/apps/box.png
-usr/share/icons/hicolor/16x16/apps/onedrive.png
-usr/share/icons/hicolor/16x16/apps/pinterest.png
-usr/share/icons/hicolor/22x22/apps/box.png
-usr/share/icons/hicolor/22x22/apps/onedrive.png
-usr/share/icons/hicolor/22x22/apps/pinterest.png
-usr/lib/*/cmake/DigikamDatabase/DigikamDatabaseConfig-release.cmake
-usr/lib/*/cmake/DigikamGui/DigikamGuiConfig-release.cmake
-usr/lib/*/cmake/DigikamCore/DigikamCoreConfig-release.cmake
-usr/lib/*/cmake/DigikamDatabase/DigikamDatabaseConfig-relwithdebinfo.cmake
-usr/lib/*/cmake/DigikamCore/DigikamCoreConfig-relwithdebinfo.cmake
-usr/lib/*/cmake/DigikamGui/DigikamGuiConfig-relwithdebinfo.cmake
-usr/lib/*/cmake/digikam/DigikamDatabaseConfig-debian.cmake
-usr/lib/*/cmake/digikam/DigikamGuiConfig-debian.cmake
-usr/lib/*/cmake/digikam/DigikamDatabaseConfig.cmake
-usr/lib/*/cmake/digikam/DigikamCoreConfig-debian.cmake
-usr/lib/*/cmake/digikam/DigikamCoreConfig.cmake
-usr/lib/*/cmake/digikam/DigikamGuiConfig.cmake
-usr/lib/*/cmake/DigikamCore/DigikamCoreConfig-debian.cmake
-usr/lib/*/cmake/DigikamCore/DigikamCoreConfigVersion.cmake
-usr/lib/*/cmake/DigikamCore/DigikamCoreConfig.cmake
-usr/lib/*/cmake/DigikamDatabase/DigikamDatabaseConfig-debian.cmake
-usr/lib/*/cmake/DigikamDatabase/DigikamDatabaseConfig.cmake
-usr/lib/*/cmake/DigikamDatabase/DigikamDatabaseConfigVersion.cmake
-usr/lib/*/cmake/DigikamGui/DigikamGuiConfig-debian.cmake
-usr/lib/*/cmake/DigikamGui/DigikamGuiConfigVersion.cmake
-usr/lib/*/cmake/DigikamGui/DigikamGuiConfig.cmake
-usr/lib/*/cmake/DigikamPlugin/DigikamPluginConfig.cmake
-usr/include/digikam/digikam_core_export.h
-usr/include/digikam/dplugindialog.h
-usr/include/digikam/dpluginaction.h
-usr/include/digikam/dpluginauthor.h
-usr/include/digikam/digikam_database_export.h
-usr/include/digikam/ditemslist.h
-usr/include/digikam/digikam_export.h
-usr/include/digikam/dwizardpage.h
-usr/include/digikam/dpreviewimage.h
-usr/include/digikam/dplugineditor.h
-usr/include/digikam/dsavesettingswidget.h
-usr/include/digikam/dwizarddlg.h
-usr/include/digikam/dinfointerface.h
-usr/include/digikam/dplugingeneric.h
-usr/include/digikam/dmetainfoiface.h
-usr/include/digikam/dplugin.h
-usr/include/digikam/dpreviewmanager.h
-usr/include/digikam/dbengineerrorhandler.h
-usr/include/digikam/dshareddata.h
-usr/include/digikam/gpsitemcontainer.h
-usr/include/digikam/dimgbuiltinfilter.h
-usr/include/digikam/drawinfo.h
-usr/include/digikam/dmessagebox.h
-usr/include/digikam/photoinfocontainer.h
-usr/include/digikam/dbengineconfig.h
-usr/include/digikam/dpluginbqm.h
-usr/include/digikam/gpsdatacontainer.h
-usr/include/digikam/drawdecoding.h
-usr/include/digikam/iofilesettings.h
-usr/include/digikam/coredbfields.h
-usr/include/digikam/filteraction.h
-usr/include/digikam/digikam_config.h
-usr/include/digikam/batchtool.h
-usr/include/digikam/imageiface.h
-usr/include/digikam/iteminfo.h
-usr/include/digikam/dpluginloader.h
-usr/include/digikam/dcolorcomposer.h
-usr/include/digikam/metaengine.h
-usr/include/digikam/drawdecodersettings.h
-usr/include/digikam/dcolorblend.h
-usr/include/digikam/queuesettings.h
-usr/include/digikam/drawdecoder.h
-usr/include/digikam/geoifacetypes.h
-usr/include/digikam/historyimageid.h
-usr/include/digikam/dcolorpixelaccess.h
-usr/include/digikam/coredbconstants.h
-usr/include/digikam/dbengineparameters.h
-usr/include/digikam/metaengine_data.h
-usr/include/digikam/wbcontainer.h
-usr/include/digikam/coredbaccess.h
-usr/include/digikam/dimg.h
-usr/include/digikam/iteminfolist.h
-usr/include/digikam/rginfo.h
-usr/include/digikam/coredburl.h
-usr/include/digikam/geocoordinates.h
-usr/include/digikam/dcolor.h
-usr/include/digikam/dbengineaction.h
-usr/include/digikam/coredbalbuminfo.h
-usr/include/digikam/dbengineconfigsettings.h
-usr/include/digikam/filesaveconflictbox.h
-usr/include/digikam/bcgcontainer.h
-usr/include/digikam/digikam_globals.h
-usr/include/digikam/iccprofile.h
-usr/include/digikam/curvescontainer.h
-usr/include/digikam/dimgthreadedanalyser.h
-usr/include/digikam/previewlayout.h
-usr/include/digikam/imageregionwidget.h
-usr/include/digikam/graphicsdimgview.h
-usr/include/digikam/dimgthreadedfilter.h
-usr/include/digikam/dimgpreviewitem.h
-usr/include/digikam/thumbnailinfo.h
-usr/include/digikam/editortool.h
-usr/include/digikam/previewtoolbar.h
-usr/include/digikam/previewsettings.h
-usr/include/digikam/dhistoryview.h
-usr/include/digikam/loadingdescription.h
-usr/include/digikam/dimgloaderobserver.h
-usr/include/digikam/graphicsdimgitem.h
-usr/include/digikam/dpluginrawimport.h
-usr/include/digikam/icctransform.h
-usr/include/digikam/imagezoomsettings.h
-usr/include/digikam/loadsavethread.h
-usr/include/digikam/dpluginaboutdlg.h
-usr/include/digikam/thumbnailloadthread.h
-usr/include/digikam/digikam_gui_export.h
-usr/include/digikam/dynamicthread.h
-usr/include/digikam/managedloadsavethread.h
-usr/include/digikam/dcolorselector.h
-usr/include/digikam/imagedialog.h
-usr/include/digikam/dactivelabel.h
-usr/include/digikam/wstooldialog.h
-usr/include/digikam/dprogresswdg.h
-usr/include/digikam/wstoolutils.h
-usr/lib/*/cmake/*
-usr/share/doc/HTML/*/showfoto
-usr/share/doc/HTML/*/digikam
-usr/include/digikam/previewloadthread.h
-usr/include/digikam/digikam_debug.h
-usr/include/digikam/digikam_version.h
-usr/include/digikam/wsitem.h
-usr/include/digikam/wslogindialog.h
-usr/include/digikam/wsnewalbumdialog.h
-usr/include/digikam/wssettingswidget.h
-usr/include/digikam/captionvalues.h
-usr/include/digikam/metadatainfo.h
-
diff --git a/debian/rules b/debian/rules
index c17fbf6..6a059a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,33 +21,25 @@ ifeq ($(DEB_HOST_ARCH), $(filter $(DEB_HOST_ARCH),$(has_qwebengine)))
endif
%:
- dh $@ --with kf5 --parallel
+ dh $@ --with kf5
override_dh_clean:
dh_clean
-#ifneq (,$(findstring git,$(DEB_VERSION_UPSTREAM)))
- # When building a git snapshot adjust the tarball to include the entire
- # Digikam software collection, just like a release tarball would.
- #ruby debian/git_extend_orig.rb
- # There are no translations for git builds alas
- #sed -i '/locale/d' debian/digikam-data.install
-#endif
- #rm -f core/data/about/js/bootstrap.min.js core/data/about/js/jquery.min.js
- #dh_clean
override_dh_auto_configure:
dh_auto_configure --buildsystem=kde -- \
-DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
-DDIGIKAMSC_COMPILE_DOC=on \
-DDIGIKAMSC_COMPILE_PO=on \
- -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_APPSTYLES=ON \
+ -DENABLE_DBUS=ON \
-DENABLE_INTERNALMYSQL=ON \
-DENABLE_KFILEMETADATASUPPORT=ON \
- -DENABLE_AKONADICONTACTSUPPORT=ON \
-DENABLE_MEDIAPLAYER=ON \
- -DENABLE_DBUS=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_QTMULTIMEDIA=ON \
-DENABLE_QWEBENGINE=$(ENABLE_QWEBENGINE) \
- -DENABLE_APPSTYLES=ON \
-DENABLE_SHOWFOTO=ON
# help2man -n 'digital photo management application' --no-info obj-*/core/app/digikam > debian/man/digikam.1
diff --git a/debian/showfoto.install b/debian/showfoto.install
index 0aab66d..8285069 100644
--- a/debian/showfoto.install
+++ b/debian/showfoto.install
@@ -1,4 +1,3 @@
-#usr/share/doc/HTML/*/showfoto
usr/bin/showfoto
usr/share/applications/org.kde.showfoto.desktop
usr/share/icons/hicolor/*/apps/showfoto.*
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index ffc511d..2f559dc 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,8 @@
# The following two files are removed in clean target, so not part of the build.
digikam source: source-is-missing core/data/about/js/bootstrap.min.js
digikam source: source-is-missing core/data/about/js/jquery.min.js
+
+digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/elegant/resources/js/lytebox.js
+digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/html5responsive/resources/js/photoswipe-ui-default.min.js
+digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/html5responsive/resources/js/photoswipe.min.js
+digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/vanilla/resources/js/lytebox.js
\ No newline at end of file
More information about the Neon-commits
mailing list