Commit 33c13039 authored by Urs Fleisch's avatar Urs Fleisch

Prepare documentation for version 3.3.2.

parent 82792869
......@@ -116,11 +116,11 @@ endif (NOT BUILD_SHARED_LIBS AND WITH_QML)
# Version information
set(CPACK_PACKAGE_VERSION_MAJOR 3)
set(CPACK_PACKAGE_VERSION_MINOR 3)
set(CPACK_PACKAGE_VERSION_PATCH 1)
set(CPACK_PACKAGE_VERSION_PATCH 2)
set(KID3_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(CPACK_PACKAGE_VERSION ${KID3_VERSION})
#set(CPACK_PACKAGE_VERSION "git20150916")
set(RELEASE_YEAR 2015)
set(RELEASE_YEAR 2016)
# Platform specific default installation paths
if (APPLE)
......@@ -148,7 +148,7 @@ elseif (ANDROID)
set(WITH_LIBDIR_DEFAULT ".")
set(WITH_PLUGINSDIR_DEFAULT ".")
set(QT_ANDROID_APP_VERSION ${KID3_VERSION})
set(QT_ANDROID_APP_VERSION_CODE 1)
set(QT_ANDROID_APP_VERSION_CODE 2)
else (APPLE)
set(WITH_DATAROOTDIR_DEFAULT "share")
set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt")
......
Thu Mar 10 17:55:29 CET 2016 Urs Fleisch <ufleisch@users.sourceforge.net>
* Release 3.3.2
* New:
+ Setting for text encoding used in playlists and exports.
* Improved:
+ Support removing tags in MPC, WavPack with TagLib 1.11.
* Fixed:
+ Windows: Fix plugin name in qmldir.
+ Windows: Crash when adding large pictures to Ogg files.
+ Windows: Go back to older Qt 5.4.2 to avoid random crashes.
+ Stripping of ID3v2 tags from WAV files with TagLib 1.11.
+ Adapted to Discogs server update.
Thu Dec 17 14:53:06 CET 2015 Urs Fleisch <ufleisch@users.sourceforge.net>
* Release 3.3.1
......
......@@ -38,7 +38,7 @@ PROJECT_NAME = kid3
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 3.3.1
PROJECT_NUMBER = 3.3.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
......
......@@ -40,8 +40,8 @@ else
qtversion=4
fi
if test "$qtversion" = "5"; then
sed -i -e '/# KDE 4 BEGIN/,/# KDE 4 END/{/# KDE/b;s/^/#/};/# KDE 5 BEGIN/,/# KDE 5 END/{/# KDE/b;s/^#//}' \
if test "$qtversion" = "4"; then
sed -i -e '/# KDE 5 BEGIN/,/# KDE 5 END/{/# KDE/b;s/^/#/};/# KDE 4 BEGIN/,/# KDE 4 END/{/# KDE/b;s/^#//}' \
debian/control debian/rules debian/kid3.install
fi
if test "$distribution" = "squeeze"; then
......
kid3 (3.3.1-0) unstable; urgency=low
kid3 (3.3.2-0) unstable; urgency=low
* New upstream release.
-- Urs Fleisch <ufleisch@users.sourceforge.net> Thu, 17 Dec 2015 14:53:06 +0100
-- Urs Fleisch <ufleisch@users.sourceforge.net> Thu, 10 Mar 2016 17:55:29 +0100
kid3 (3.3.1-2) unstable; urgency=medium
* Port package to KDE5 and Qt5.
* Sync long descriptions with upstream.
* Sync doc-base description with upstream.
* Add PGP signature.
-- Patrick Matthäi <pmatthaei@debian.org> Tue, 22 Dec 2015 10:32:42 +0100
kid3 (3.3.1-1) unstable; urgency=medium
* New upstream release.
-- Patrick Matthäi <pmatthaei@debian.org> Mon, 21 Dec 2015 13:47:27 +0100
kid3 (3.3.0-1) unstable; urgency=medium
......
......@@ -5,14 +5,20 @@ Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Mark Purcell <msp@debian.org>,
Patrick Matthäi <pmatthaei@debian.org>
Build-Depends: debhelper (>= 9),
# KDE 4 BEGIN
libqt4-dev, kdelibs5-dev,
# KDE 4 END
# KDE 5 BEGIN
# extra-cmake-modules, kio-dev, kdoctools-dev,
# qtmultimedia5-dev, qtdeclarative5-dev, qttools5-dev,
# qttools5-dev-tools, qtdeclarative5-dev-tools, qml-module-qtquick2,
extra-cmake-modules,
kio-dev,
kdoctools-dev,
qtmultimedia5-dev,
qtdeclarative5-dev,
qttools5-dev,
qttools5-dev-tools,
qtdeclarative5-dev-tools,
qml-module-qtquick2,
# KDE 5 END
# KDE 4 BEGIN
# libqt4-dev, kdelibs5-dev,
# KDE 4 END
cmake,
libid3-3.8.3-dev,
libflac++-dev,
......@@ -96,7 +102,7 @@ Depends: ${shlibs:Depends},
kid3-core (= ${binary:Version})
Breaks: kid3 (<< 3.0.2-2)
Replaces: kid3 (<< 3.0.2-2)
Description: Audio tag editor
Description: Command line audio tag editor
With Kid3, an audio tag editor you can:
* Edit ID3v1.1 tags in your MP3 files
* Edit all ID3v2.3 and ID3v2.4 frames in your MP3 files
......
/usr/bin/kid3
/usr/share/appdata/kid3.appdata.xml
/usr/share/icons/hicolor/*/apps/kid3.*
# KDE 4 BEGIN
/usr/share/applications/kde4/kid3.desktop
/usr/share/doc/kde/HTML/*/kid3/*
/usr/share/kde4/apps/kid3/kid3ui.rc
# KDE 4 END
# KDE 5 BEGIN
#/usr/share/applications/kid3.desktop
#/usr/share/doc/HTML/*/kid3/*
#/usr/share/kxmlgui5/kid3/kid3ui.rc
/usr/share/applications/kid3.desktop
/usr/share/doc/HTML/*/kid3/*
/usr/share/kxmlgui5/kid3/kid3ui.rc
# KDE 5 END
# KDE 4 BEGIN
#/usr/share/applications/kde4/kid3.desktop
#/usr/share/doc/kde/HTML/*/kid3/*
#/usr/share/kde4/apps/kid3/kid3ui.rc
# KDE 4 END
......@@ -9,16 +9,15 @@ DEB_CMAKE_PREFIX = /usr
DEB_CONFIG_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/kde4/config
DEB_HTML_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/doc/kde/HTML
# KDE 4 BEGIN
BASE_CMAKE_DEFS = -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
-DDATA_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/apps \
-DHTML_INSTALL_DIR=$(DEB_HTML_INSTALL_DIR) \
-DKCFG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/config.kcfg
# KDE 4 END
# KDE 5 BEGIN
#BASE_CMAKE_DEFS = -DWITH_QT5=ON \
# -DKDE_INSTALL_BINDIR=$(DEB_CMAKE_PREFIX)/bin -Wno-dev
BASE_CMAKE_DEFS = -DWITH_QT5=ON -DKDE_INSTALL_BINDIR=$(DEB_CMAKE_PREFIX)/bin -Wno-dev
# KDE 5 END
# KDE 4 BEGIN
#BASE_CMAKE_DEFS = -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
# -DDATA_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/apps \
# -DHTML_INSTALL_DIR=$(DEB_HTML_INSTALL_DIR) \
# -DKCFG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/config.kcfg
# KDE 4 END
%:
dh $@ --parallel --builddirectory=kid3-build
......@@ -42,7 +41,7 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install
# KDE 4 BEGIN
-rm $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/*/kid3/common
# -rm $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/*/kid3/common
# KDE 4 END
override_dh_makeshlibs:
......
# See uscan(1) for format
# Compulsory line, this is a version 3 file
version=3
# Uncomment to find new files on sourceforge, for debscripts >= 2.9
opts=pgpsigurlmangle=s/$/.asc/ \
http://sf.net/kid3/kid3-(.*)\.tar\.gz debian svn-upgrade
......@@ -22,13 +22,13 @@
</authorgroup>
<copyright>
<year>2015</year>
<year>2016</year>
<holder>Urs Fleisch</holder>
</copyright>
<legalnotice id="fdl-notice">&FDLNotice;</legalnotice>
<date>2015-12-17</date>
<releaseinfo>3.3.1</releaseinfo>
<date>2016-03-10</date>
<releaseinfo>3.3.2</releaseinfo>
<abstract>
<para>
......@@ -2156,6 +2156,10 @@ Wenn <guilabel>Änderungen markieren</guilabel> aktiviert ist, werden verändert
Felder markiert, indem der Hintergrund des Namens grau gesetzt wird.
<guilabel>Dateiname für Cover</guilabel> setzt den Namen, welcher
vorgeschlagen wird, wenn ein eingebettetes Bild als Datei exportiert wird.
Mit <guilabel>Textkodierung (Export, Stückliste)</guilabel> lässt sich die
Codierung einstellen, welche beim Schreiben von Dateien verwendet wird. Die
Voreinstellung <guilabel>System</guilabel> kann verändert werden wenn
beispielsweise Stücklisten auf einem anderen Gerät verwendet werden sollen.
</para>
<para>
<guilabel>Dateinamen Format</guilabel> enthält Einstellungen für das
......
......@@ -22,13 +22,13 @@
</authorgroup>
<copyright>
<year>2015</year>
<year>2016</year>
<holder>Urs Fleisch</holder>
</copyright>
<legalnotice id="fdl-notice">&FDLNotice;</legalnotice>
<date>2015-12-17</date>
<releaseinfo>3.3.1</releaseinfo>
<date>2016-03-10</date>
<releaseinfo>3.3.2</releaseinfo>
<abstract>
<para>
......@@ -2020,6 +2020,9 @@ select the last selected file when it is started the next time.
the file modification time stamp.
<guilabel>Filename for cover</guilabel> sets the name which is suggested
when an embedded image is exported to a file.
With <guilabel>Text encoding (Export, Playlist)</guilabel> the encoding used
when writing files can be set. The default <guilabel>System</guilabel> can be
changed for example if playlists have to be used on a different device.
</para>
<para>
If <guilabel>Mark changes</guilabel> is active, changed fields are marked with
......
Begin4
Title: Kid3 -- Efficient Audio Tagger
Version: 3.3.1
Entered-date: 2015-12-17
Version: 3.3.2
Entered-date: 2016-03-10
Description: Audio tagger to edit ID3v1.1, ID3v2.3, ID3v2.4, Ogg/Vorbis, Opus, DSF
FLAC, MPC, APE, MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV
and AIFF tags, multiple files, generate tags from file names
......@@ -12,7 +12,7 @@ Maintained-by: Urs Fleisch <ufleisch@users.sourceforge.net>
Home-page: http://kid3.sourceforge.net
Alternate-site: http://www.kde-apps.org/content/show.php?content=10415
Primary-site: http://www.sourceforge.net/projects/kid3
http://prdownloads.sourceforge.net/kid3/kid3-3.3.1.tar.gz?download
http://prdownloads.sourceforge.net/kid3/kid3-3.3.2.tar.gz?download
Platform: Linux, Windows.
Copying-policy: GPL
End
......@@ -6,7 +6,7 @@ Name: kid3
License: GPL
Group: Applications/Multimedia
Summary: Efficient ID3 tag editor
Version: 3.3.1
Version: 3.3.2
Release: 1%{?dist}
URL: http://kid3.sourceforge.net/
Source0: http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
......
......@@ -6,7 +6,7 @@
# Pavel Fric <fripohled@blogspot.com>, 2010, 2011, 2012, 2013, 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2015-10-02 21:58+0200\n"
......
......@@ -7,7 +7,7 @@
# Frank Steinmetzger <Warp_7@gmx.de>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-04-26 23:41+0200\n"
......
......@@ -7,7 +7,7 @@
# Urs Fleisch <ufleisch@users.sourceforge.net>, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-01-15 17:29+0100\n"
......
......@@ -5,7 +5,7 @@
# Urs Fleisch <ufleisch@users.sourceforge.net>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2014-01-23 22:00+0200\n"
......
......@@ -2,7 +2,7 @@
BASEDIR="../src" # root of translatable sources
PROJECT="kid3" # project name
PROJECTVERSION="3.3.1" # project version
PROJECTVERSION="3.3.2" # project version
BUGADDR="http://sourceforge.net/p/kid3/bugs/" # MSGID-Bugs
WDIR=`pwd` # working dir
......
......@@ -6,7 +6,7 @@
# Ville Skyttä <ville.skytta@iki.fi>, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2014-01-25 00:31+0200\n"
......
......@@ -7,7 +7,7 @@
# Urs Fleisch <ufleisch@users.sourceforge.net>, 2006, 2007, 2008, 2009, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-01-15 17:32+0100\n"
......
......@@ -5,7 +5,7 @@
# Urs Fleisch <ufleisch@users.sourceforge.net>, 2008, 2009, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-01-15 17:33+0100\n"
......
......@@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
......
......@@ -6,7 +6,7 @@
# Kenny Verstraete <verstraete_kenny@skynet.be>, 2008, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2012-12-07 15:47+0100\n"
......
......@@ -7,7 +7,7 @@
# Urs Fleisch <ufleisch@users.sourceforge.net>, 2008, 2009, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-01-15 17:37+0100\n"
......
......@@ -7,7 +7,7 @@
# "Egor S. Orlov" <Egor.Orlov@avalon.ru>, 2003, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-01-15 17:41+0100\n"
......
......@@ -5,7 +5,7 @@
# Mladen Pejaković <pejakm@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-04-26 23:41+0200\n"
......
......@@ -5,7 +5,7 @@
# Mladen Pejaković <pejakm@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-04-26 23:41+0200\n"
......
......@@ -5,7 +5,7 @@
# Mladen Pejaković <pejakm@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-04-26 23:41+0200\n"
......
......@@ -5,7 +5,7 @@
# Mladen Pejaković <pejakm@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-04-26 23:41+0200\n"
......
......@@ -5,7 +5,7 @@
# Urs Fleisch <ufleisch@users.sourceforge.net>, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-01-15 17:42+0100\n"
......
......@@ -5,7 +5,7 @@
# Urs Fleisch <ufleisch@users.sourceforge.net>, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Kid3 3.3.1\n"
"Project-Id-Version: Kid3 3.3.2\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/p/kid3/bugs/\n"
"POT-Creation-Date: 2016-01-09 10:45+0100\n"
"PO-Revision-Date: 2011-01-15 17:43+0100\n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment