[SCM] audacious/experimental: * Drop qt5 interface: (Closes: #820472, LP: #1600318) - debian/rules: Remove --enable-qt. - Drop debian/libaudqt0.install. - Drop debian/libaudqt0.symbols.

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Wed Aug 31 19:41:06 UTC 2016


The following commit has been merged in the experimental branch:
commit 66d524c01720835a30716cb6861606f95629faea
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Wed Aug 31 21:41:31 2016 +0200

      * Drop qt5 interface: (Closes: #820472, LP: #1600318)
       - debian/rules: Remove --enable-qt.
       - Drop debian/libaudqt0.install.
       - Drop debian/libaudqt0.symbols.

diff --git a/debian/audacious-qt.desktop b/debian/audacious-qt.desktop
deleted file mode 100644
index 9d78daf..0000000
--- a/debian/audacious-qt.desktop
+++ /dev/null
@@ -1,80 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Audacious Qt Interface
-GenericName=Music Player
-Comment=Listen to music
-Icon=audacious
-Categories=AudioVideo;Audio;Player;Qt;
-Exec=audacious --qt %U
-TryExec=audacious
-Terminal=false
-MimeType=application/ogg;application/x-cue;application/x-ogg;application/xspf+xml;audio/midi;audio/mp3;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-vorbis+ogg;audio/x-wav;audio/x-xm;inode/directory;x-content/audio-cdda;
-Keywords=audio;player;audacious;music;qt;
-
-Comment[be]=Слухайце музыку
-Comment[bg]=Слушай музика
-Comment[cs]=Poslouchej hudbu
-Comment[da]=Lyt til musik
-Comment[de]=Musik hören
-Comment[el]=Ακρόαση μουσικής
-Comment[eo]=Aŭskulti muzikon
-Comment[es_MX]=Escuchar la música
-Comment[es]=Escuchar música
-Comment[fi]=Kuuntele musiikkia
-Comment[fr]=Écouter de la musique
-Comment[gl]=Escoitar música
-Comment[hu]=Hallgasson zenét
-Comment[id_ID]=Dengarkan musik
-Comment[it]=Ascolta la musica
-Comment[ja]=音楽を聴きます
-Comment[ko]=음악을 들어요
-Comment[lt]=Klausyti muzikos
-Comment[lv]=Klausīties mūziku
-Comment[ms]=Dengar muzik
-Comment[nl]=Luister naar muziek
-Comment[pl]=Słuchaj muzyki
-Comment[pt_BR]=Ouvir Música
-Comment[pt_PT]=Reprodução de músicas
-Comment[ro]=Ascultă muzică
-Comment[ru]=Слушать музыку
-Comment[sr]=Слушајте музику
-Comment[sr_RS]=Слушајте музику
-Comment[sv]=Lyssna på musik
-Comment[tr]=Müzik dinleyin
-Comment[uk]=Слухати музику
-Comment[zh_CN]=聆听音乐
-Comment[zh_TW]=音樂鑑賞
-
-GenericName[be]=Музычны плэер
-GenericName[bg]=Музикален плейър
-GenericName[cs]=Hudební přehrávač
-GenericName[da]=Musikafspiller
-GenericName[de]=Musikspieler
-GenericName[el]=Πρόγραμμα αναπαραγωγής μουσικής
-GenericName[eo]=Muzik-ludilo
-GenericName[es_MX]=Reproductor de Música
-GenericName[es]=Reproductor de música
-GenericName[fi]=Musiikkisoitin
-GenericName[fr]=Diffuseur de musique
-GenericName[gl]=Reprodutor de música
-GenericName[hu]=Zene lejátszó
-GenericName[id_ID]=Pemutar musik
-GenericName[it]=Lettore musicale
-GenericName[ja]=音楽プレイヤー
-GenericName[ko]=음악 재생기
-GenericName[lt]=Muzikos grotuvas
-GenericName[lv]=Mūzikas atskaņotājs
-GenericName[ms]=Pemain Muzik
-GenericName[nl]=Muziekspeler
-GenericName[pl]=Odtwarzacz muzyczny
-GenericName[pt_BR]=Player de Música
-GenericName[pt_PT]=Reprodutor áudio
-GenericName[ro]=Player de muzică
-GenericName[ru]=Музыкальный проигрыватель
-GenericName[sr]=Програм за слушање музике
-GenericName[sv]=Musikspelare
-GenericName[tr]=Müzik Çalar
-GenericName[uk]=Музичний програвач
-GenericName[zh_CN]=音乐播放器
-GenericName[zh_TW]=音樂播放器
diff --git a/debian/audacious.install b/debian/audacious.install
index 0a1ba23..f7177e8 100644
--- a/debian/audacious.install
+++ b/debian/audacious.install
@@ -1,3 +1,2 @@
 usr/bin
 usr/share
-debian/audacious-qt.desktop usr/share/applications
diff --git a/debian/changelog b/debian/changelog
index 12166e2..efb1b27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ audacious (3.8~beta2-1) UNRELEASED; urgency=medium
   * debian/control:
     - Switch from dbus-x11 to default-dbus-session-bus | dbus-session-bus
       (Closes: #836078)
+  * Drop qt5 interface: (Closes: #820472, LP: #1600318)
+   - debian/rules: Remove --enable-qt.
+   - Drop debian/libaudqt0.install.
+   - Drop debian/libaudqt0.symbols.
 
  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Wed, 31 Aug 2016 15:54:52 +0200
 
diff --git a/debian/control b/debian/control
index c2370c0..bd42941 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,7 @@ Build-Depends:
  libdbus-glib-1-dev (>= 0.60),
  libgtk2.0-dev,
  libguess-dev (>= 1.2~),
- librsvg2-bin,
- qtbase5-dev
+ librsvg2-bin
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/audacious.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/audacious.git
@@ -65,7 +64,6 @@ Depends:
  libdbus-1-dev (>= 0.60),
  libdbus-glib-1-dev (>= 0.60),
  libgtk2.0-dev,
- qtbase5-dev,
  ${misc:Depends}
 Description: audacious development files
  Audacious is a fork of beep-media-player which supports Winamp skins
@@ -173,29 +171,3 @@ Description: audacious media player (libaudtag shared library)
  .
  This package provides the libaudtag shared library.
 
-Package: libaudqt0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Description: audacious media player (libaudqt shared library)
- Audacious is a fork of beep-media-player which supports Winamp skins
- and many codecs.
- .
- In the default install, the following codecs are supported:
- .
-  * MP3
-  * Ogg Vorbis / Theora
-  * AAC and AAC+
-  * FLAC
-  * ALAC
-  * Windows Media (WMA)
-  * WAVE
- .
- Additionally, Audacious is extendable through plugins, and contains
- other useful features like LIRC support. Support for many more codecs
- can also be added through plugins.
- .
- This package provides the libaudqt shared library.
diff --git a/debian/libaudqt0.install b/debian/libaudqt0.install
deleted file mode 100644
index 746293a..0000000
--- a/debian/libaudqt0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libaudqt.so.*
diff --git a/debian/libaudqt0.symbols b/debian/libaudqt0.symbols
deleted file mode 100644
index d7d175e..0000000
--- a/debian/libaudqt0.symbols
+++ /dev/null
@@ -1,57 +0,0 @@
-libaudqt.so.0 libaudqt0 #MINVER#
- _ZN10QByteArrayD1Ev at Base 3.7.1
- _ZN10QByteArrayD2Ev at Base 3.7.1
- _ZN5audqt10InfoWidget10updateFileEv at Base 3.7.1
- _ZN5audqt10InfoWidget8fillInfoEiiPKcRK5TupleP12PluginHandleb at Base 3.7.1
- _ZN5audqt10InfoWidgetC1EP7QWidget at Base 3.7.1
- _ZN5audqt10InfoWidgetC2EP7QWidget at Base 3.7.1
- _ZN5audqt10InfoWidgetD0Ev at Base 3.7.1
- _ZN5audqt10InfoWidgetD1Ev at Base 3.7.1
- _ZN5audqt10InfoWidgetD2Ev at Base 3.7.1
- _ZN5audqt10menu_buildE8ArrayRefINS_8MenuItemEEPKcP7QWidget at Base 3.7.1
- _ZN5audqt11art_requestEPKcjjb at Base 3.7.1
- _ZN5audqt11menu_actionERKNS_8MenuItemEPKcP7QWidget at Base 3.7.1
- _ZN5audqt11menu_removeE9AudMenuIDPFvvE at Base 3.7.1
- _ZN5audqt12VolumeButtonC1EP7QWidget at Base 3.7.1
- _ZN5audqt12VolumeButtonC2EP7QWidget at Base 3.7.1
- _ZN5audqt12clear_layoutEP7QLayout at Base 3.7.1
- _ZN5audqt12infowin_hideEv at Base 3.7.1
- _ZN5audqt12infowin_showEii at Base 3.7.1
- _ZN5audqt12plugin_aboutEP12PluginHandle at Base 3.7.1
- _ZN5audqt12plugin_prefsEP12PluginHandle at Base 3.7.1
- _ZN5audqt13enable_layoutEP7QLayoutb at Base 3.7.1
- _ZN5audqt13menubar_buildE8ArrayRefINS_8MenuItemEEPKcP7QWidget at Base 3.7.1
- _ZN5audqt13prefswin_hideEv at Base 3.7.1
- _ZN5audqt13prefswin_showEv at Base 3.7.1
- _ZN5audqt13translate_strEPKcS1_ at Base 3.7.1
- _ZN5audqt14equalizer_hideEv at Base 3.7.1
- _ZN5audqt14equalizer_showEv at Base 3.7.1
- _ZN5audqt14menu_get_by_idE9AudMenuID at Base 3.7.1
- _ZN5audqt14simple_messageEPKcS1_ at Base 3.7.1
- _ZN5audqt14simple_messageEPKcS1_N11QMessageBox4IconE at Base 3.7.1
- _ZN5audqt14urlopener_showEb at Base 3.7.1
- _ZN5audqt15fileopener_showENS_8FileModeE at Base 3.7.1
- _ZN5audqt16aboutwindow_hideEv at Base 3.7.1
- _ZN5audqt16aboutwindow_showEv at Base 3.7.1
- _ZN5audqt18log_inspector_hideEv at Base 3.7.1
- _ZN5audqt18log_inspector_showEv at Base 3.7.1
- _ZN5audqt18prefswin_show_pageEib at Base 3.7.1
- _ZN5audqt18queue_manager_hideEv at Base 3.7.1
- _ZN5audqt18queue_manager_showEv at Base 3.7.1
- _ZN5audqt19art_request_currentEjjb at Base 3.7.1
- _ZN5audqt20infowin_show_currentEv at Base 3.7.1
- _ZN5audqt20playlist_show_renameEi at Base 3.7.1
- _ZN5audqt21window_bring_to_frontEP7QWidget at Base 3.7.1
- _ZN5audqt23playlist_confirm_deleteEi at Base 3.7.1
- _ZN5audqt25prefswin_show_plugin_pageE10PluginType at Base 3.7.1
- _ZN5audqt3runEv at Base 3.7.1
- _ZN5audqt4initEv at Base 3.7.1
- _ZN5audqt4quitEv at Base 3.7.1
- _ZN5audqt7cleanupEv at Base 3.7.1
- _ZN5audqt8menu_addE9AudMenuIDPFvvEPKcS4_ at Base 3.7.1
- _ZN7QStringD1Ev at Base 3.7.1
- _ZN7QStringD2Ev at Base 3.7.1
- (c++)"non-virtual thunk to audqt::InfoWidget::~InfoWidget()@Base" 3.7.1
- (c++)"non-virtual thunk to audqt::InfoWidget::~InfoWidget()@Base" 3.7.1
- (c++)"non-virtual thunk to audqt::InfoWidget::~InfoWidget()@Base" 3.7.1
- (c++)"non-virtual thunk to audqt::InfoWidget::~InfoWidget()@Base" 3.7.1
diff --git a/debian/rules b/debian/rules
index 4c1ec13..b133e96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 	dh $@ --with autoreconf --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-rpath --enable-chardet --enable-qt $(additional_confflags) \
+	dh_auto_configure -- --disable-rpath --enable-chardet $(additional_confflags) \
 		--with-buildstamp="$(shell dpkg-vendor --query vendor) package" 
 
 override_dh_auto_install:

-- 
Small and fast audio player which supports lots of formats



More information about the pkg-multimedia-commits mailing list