[SCM] mpd-sima/master: Major package refactoring

kaliko-guest at users.alioth.debian.org kaliko-guest at users.alioth.debian.org
Sun Sep 28 11:34:25 UTC 2014 

The following commit has been merged in the master branch:
commit 0edb56f2a0bf5e780d946eb25ceb93b3704f63f2
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date:   Tue Jan 21 23:53:18 2014 +0100

    Major package refactoring
    
    upstream snapshot from future 0.12.0 (commit 0f274b8)
    
    Git-Dch: Ignore

diff --git a/debian/README.Debian b/debian/README.Debian
index 5c50c54..db28047 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -13,7 +13,7 @@ following configuration and database files:
 	database:      /var/lib/mpd-sima/sima.db
 
 Launch MPD_sima using:
-	invoke-rc.d mpd-sima start
+	service mpd-sima start
 
 
 LAUNCH IT FROM YOUR USER ACCOUNT:
diff --git a/debian/changelog b/debian/changelog
index 40019e6..64f5b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-mpd-sima (0.10.0-2) unstable; urgency=low
+mpd-sima (0.12.0-1~1~0f274b8) UNRELEASED; urgency=low
 
-  * Set package priority to optional.
+  * python3 convertion, major package refactoring
+  * Migrate to dh-python
+  * Bumped Standards-Version to 3.9.5
 
- -- Geoffroy Youri Berret <efrim at azylum.org>  Tue, 21 May 2013 18:35:59 +0200
+ -- Geoffroy Youri Berret <efrim at azylum.org>  Tue, 21 Jan 2014 22:47:29 +0100
 
-mpd-sima (0.10.0-1) experimental; urgency=low
+mpd-sima (0.10.0-1) unstable; urgency=low
 
   * Add weak dependencies on MPD in init script (Closes: #687426)
   * Set minimum MPD version in Suggests field
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index be517e1..fd5daa7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,26 +3,26 @@ Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Geoffroy Youri Berret <efrim at azylum.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: python, bash-completion
-X-Python-Version: >=2.6
-Standards-Version: 3.9.4.0
-Vcs-Git: git://git.debian.org/pkg-multimedia/mpd-sima.git
-Vcs-browser: http://git.debian.org/?p=pkg-multimedia/mpd-sima.git;a=summary
-Homepage: http://codingteam.net/project/sima
+Build-Depends: debhelper (>= 9), python3, python-setuptools (>= 2.0.2), dh-python
+Build-Depends-Indep: bash-completion
+X-Python3-Version: >=3.2
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/mpd-sima.git
+Vcs-browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/mpd-sima.git
+Homepage: http://kaliko.me/code/mpd-sima
 
 Package: mpd-sima
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
-    python-mpd (>= 0.3),
+Depends: ${misc:Depends}, ${python3:Depends},
     adduser,
+    python-musicpd (>= 0.4.0),
     lsb-base
 Suggests: mpd (>= 0.14)
 Provides: mpd-client
 Enhances: mpd
 Description: Automagically add titles to MPD playlist
  MPD_Sima is a Python script meant to feed your MPD playlist with tracks
- from artists similar to your currently playing track, provided that these 
+ from artists similar to your currently playing track, provided that these
  artists are found in MPD library. Similar artists are fetched from last.fm.
  .
  MPD_sima can queue track, top track or whole album for similar artists.
diff --git a/debian/copyright b/debian/copyright
index e29c101..cbaf807 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,14 +8,14 @@ Source: <http://codingteam.net/project/sima/download>
  http://codingteam.net/project/sima/download
 
 Files: *
-Copyright: Copyright 2009-2012 Jack Kaliko <efrim at azylum.org>
+Copyright: Copyright 2009-2014 Jack Kaliko <efrim at azylum.org>
            Copyright 2010 Eric Casteleijn <thisfred at gmail.com>
            Copyright 2007, 2009 Sander Marechal <s.marechal at jejik.com>
            Copyright 2008 Rick van Hattem
 License: GPL-3+
 
-Files: launch.sh Makefile src/mpd_sima src/simadb_cli data/* src/utils/*
-Copyright: Copyright 2009-2012, Geoffroy Youri Berret <efrim at azylum.org>
+Files: launch.sh src/mpd_sima src/simadb_cli data/* src/utils/*
+Copyright: Copyright 2009-2014, Geoffroy Youri Berret <efrim at azylum.org>
 License: GPL-3+
 
 Files: src/lib/daemon.py
@@ -24,20 +24,20 @@ Comment: Daemon code is meant to be public domain.
  its code and because of the few simple lines it was.
  The upstream author decided to use GPL for its modifications.
  http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/
-Copyright: Copyright 2010-2012 Geoffroy Youri Berret <efrim at azylum.org>
+Copyright: Copyright 2010-2014 Geoffroy Youri Berret <efrim at azylum.org>
            Copyright 2007, 2009 Sander Marechal <s.marechal at jejik.com>
 License: GPL-3+
 
 Files: src/lib/tracks.py src/lib/simadb.py src/lib/simafm.py src/lib/simafm.py
 Comment: The throttle decorator in simafm.py is copyrighted to Eric Casteleijn.
  Rick van Hattem owns copyrights in simadb.py for database management.
-Copyright: Copyright 2009-2012 Jack Kaliko <efrim at azylum.org>
+Copyright: Copyright 2009-2014 Jack Kaliko <efrim at azylum.org>
            Copyright 2010 Eric Casteleijn <thisfred at gmail.com>
            Copyright 2008 Rick van Hattem
 License: GPL-3+
 
 Files: debian/*
-Copyright: Copyright 2010-2013 Geoffroy Youri Berret <efrim at azylum.org>
+Copyright: Copyright 2010-2014 Geoffroy Youri Berret <efrim at azylum.org>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/mpd-sima.bash-completion b/debian/mpd-sima.bash-completion
deleted file mode 100644
index d5e6677..0000000
--- a/debian/mpd-sima.bash-completion
+++ /dev/null
@@ -1 +0,0 @@
-data/mpd_sima.completion.sh mpd-sima
diff --git a/debian/mpd-sima.cfg b/debian/mpd-sima.cfg
deleted file mode 100644
index f940b43..0000000
--- a/debian/mpd-sima.cfg
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# For complete list of options availble please refer to documentation
-# 	/usr/share/doc/mpd-sima/examples/all_settings.cfg
-#
-
-########################## MPD SECTION ################################
-#
-[MPD]
-host = localhost
-port = 6600
-# comment password field if not set
-#password = s3cre1
-
-#
-#######################################################################
-
-#######################################################################
-#
-#
-
-## LOGGING FACILITY ##
-[log]
-# pick verbosity in : debug, info, warning, error
-# default, if not specify, is "info"
-# *DEBUG LEVEL WILL PRINT OUT YOUR MPD PASSWORD*
-verbosity = info
-##
-
-[sima]
-## Queue Mode
-##
-# The default is to queue random tracks from similar artists.
-#
-## QUEUE_MODE # type: string
-# Possible values:
-#	track : Will queue tracks from similar artists.
-#	album : Will queue whole album from similar artists.
-#	top   : Will queue top tracks from similar artists.
-queue_mode = track
-
-## SIMILARITY # type: integer in [0 100]
-# Similarity as a percentage of similarity for the artist the code is
-# looking for.
-similarity = 15
-##
-
-## CONSUME # type integer
-# How many played tracks to keep in the playlist.
-# Crop the playlist to maintain it to a fixed length.
-# Set to 0 to keep all played tracks.
-#
-consume = 0
-##
-
-#
-####################### END OF CONFIGURATION ##########################
-
-# vim: syntax=cfg fileencoding=utf-8
diff --git a/debian/mpd-sima.docs b/debian/mpd-sima.docs
deleted file mode 100644
index 838308a..0000000
--- a/debian/mpd-sima.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-doc/FAQ
-doc/README.mpd_sima
-doc/README.simadb_cli
-doc/THANKS
diff --git a/debian/mpd-sima.init b/debian/mpd-sima.init
index 24ba7e4..1a7471c 100755
--- a/debian/mpd-sima.init
+++ b/debian/mpd-sima.init
@@ -7,7 +7,7 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Starts and daemonize MPD_sima
-# Description:       Starts and daemonize MPD_sima  
+# Description:       Starts and daemonize MPD_sima
 ### END INIT INFO
 
 # Author: Geoffroy Youri Berret <efrim at azylum.org>
diff --git a/debian/mpd-sima.install b/debian/mpd-sima.install
deleted file mode 100644
index 7d41801..0000000
--- a/debian/mpd-sima.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/mpd-sima.cfg /etc
-src/* /usr/share/mpd-sima
diff --git a/debian/mpd-sima.links b/debian/mpd-sima.links
deleted file mode 100644
index e93c43a..0000000
--- a/debian/mpd-sima.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/mpd-sima/mpd_sima /usr/bin/mpd-sima
-/usr/share/mpd-sima/simadb_cli /usr/bin/simadb_cli
diff --git a/debian/mpd-sima.manpages b/debian/mpd-sima.manpages
deleted file mode 100644
index dcd26dc..0000000
--- a/debian/mpd-sima.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-data/mpd-sima.1
-data/simadb_cli.1
-data/mpd-sima.cfg.5
diff --git a/debian/rules b/debian/rules
index 432628c..759fafe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,12 @@
 #
 
 %:
-	dh $@ --with bash_completion,python2
+	dh $@ --with bash_completion,python3 --buildsystem=pybuild
 
-override_dh_installchangelogs:
-	dh_installchangelogs doc/Changelog
+#override_dh_installchangelogs:
+#	dh_installchangelogs doc/Changelog
 
-# Previous version of MPD_sima (< 0.7) did not have any installation script.
-# With 0.7 appears a Makefile but I kept using dh to install the source.
-# This is why debian/rules overrides upstream Makefile calls (clean, install
-# and build)
-#
-# Prevent calling upstream make targets
-override_dh_auto_clean:
-override_dh_auto_install:
-override_dh_auto_build:
+#override_dh_clean:
+#	rm -rf build/
+#	rm -rf src/MPD_sima.egg-info/
+#	dh_clean

-- 
mpd-sima packaging

More information about the pkg-multimedia-commits mailing list