[SCM] idjc packaging branch, master, updated. upstream/0.8.2-8-g1d0cafd
quadrispro-guest at users.alioth.debian.org
quadrispro-guest at users.alioth.debian.org
Wed Apr 28 08:57:33 UTC 2010
The following commit has been merged in the master branch:
commit 0b2e4ce2c181651e56475a03ae5d67e74c39b0f0
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date: Wed Apr 28 00:56:26 2010 +0200
Re-patch sources.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..676706b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,165 @@
+idjc (0.8.1-4) unstable; urgency=medium
+
+ * Pass the correct libexecdir path to the configure script rather than
+ move the files (Closes: #572271); bump urgency to medium, the package
+ is already in squeeze.
+ * Fix launcher script to run idjc properly; thanks to Magnus Holmgren for
+ the patch.
+ * Bump Standards.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Thu, 11 Mar 2010 17:57:35 +0100
+
+idjc (0.8.1-3) unstable; urgency=low
+
+ * Drop python 2.4 support (Closes: #569308).
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Thu, 11 Feb 2010 17:24:54 +0100
+
+idjc (0.8.1-2) unstable; urgency=low
+
+ * Revert pycentral -> pysupport, Closes: #566042.
+ * Move idjcmixer,idjcsourceclient from /usr/lib/idjc to /usr/bin.
+ * Remove duplicated build-dependency on libshout3-dev.
+ * Allow uploads by Debian Maintainers.
+ * debian/rules: clean target should not remove idjcpython/idjc_config.py.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Mon, 25 Jan 2010 13:23:46 +0100
+
+idjc (0.8.1-1) unstable; urgency=low
+
+ [ Reinhard Tartler ]
+ * actually remove libshout on clean
+
+ [ Alessio Treglia ]
+ * New upstream release.
+ * Bump Standards.
+ * Add myself to Uploaders.
+ * Build-depend on python-mutagen.
+ * Bump cdbs build-dependency as per Python new policy.
+ * Convert from python-central to python-support.
+ * debian/copyright:
+ - Update (according to Debian DEP-5 spec).
+ - Fix lintian warning (copyright-refers-to-symlink-license).
+ * debian/patches/desktop_file.patch:
+ - Adjust desktop file as Freedesktop's per-spec.
+ * Remove debian/idjc.desktop,Man/idjc{,ctrl}.1, provided by upstream.
+ * Remove Man/idjcskype.1, idjcskype has been dropped by upstream.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Mon, 30 Nov 2009 23:17:43 +0100
+
+idjc (0.7.14-2) unstable; urgency=low
+
+ [ Alessio Treglia ]
+ * debian/rules:
+ - Use wildcard instead of site-packages (making ready for Python >= 2.6).
+ * Add debian/patches/python26_ready.patch to build with Python 2.6.
+ (Closes: #526838)
+
+ [ Reinhard Tartler ]
+ * add myself to uploaders.
+ * Convert (build-)dependency line to a multi-line field
+ * Change order of the toolame/mp3lame build dependency
+ (Closes: #482509, #534076)
+ * bump standards version
+ * fix docbase section
+ * add depends on python
+ * use official homepage field
+ * remove mistakenly install pyc files
+ * build against system libshout3, not against internal copy
+ * remove internal libshout copy
+ * remove generated idjcpython/idjc_config.py file
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 11 Jul 2009 08:53:51 +0200
+
+idjc (0.7.14-1) unstable; urgency=low
+
+ * New upstream release
+ * Replace liblame-dev dependency with libmp3lame-dev
+
+ -- Free Ekanayaka <freee at debian.org> Thu, 30 Apr 2009 09:05:00 +0200
+
+idjc (0.7.7-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Free Ekanayaka <freee at debian.org> Mon, 23 Jun 2008 01:16:42 +0100
+
+idjc (0.7.5-4) unstable; urgency=low
+
+ * Build against liblame-dev if available or toolame otherwise
+
+ -- Free Ekanayaka <freee at debian.org> Fri, 16 May 2008 11:50:12 +0100
+
+idjc (0.7.5-3) unstable; urgency=low
+
+ * Support DEB_BUILD_OPTIONS=dopot for optmised re-builds
+ * Build-Depend on libjack-dev and not on the the deprecated libjack0.100.0-dev
+
+ -- Free Ekanayaka <freee at debian.org> Tue, 13 May 2008 09:37:26 +0100
+
+idjc (0.7.5-2) unstable; urgency=low
+
+ * Do not run dh_pycentral, as it breaks upstream configuration
+
+ -- Free Ekanayaka <freee at debian.org> Mon, 12 May 2008 15:36:00 +0100
+
+idjc (0.7.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Set Debian Multimedia Team as maintainer and myself as Uploader (Closes: #479582)
+
+ -- Free Ekanayaka <freee at debian.org> Wed, 30 Apr 2008 08:57:34 +0100
+
+idjc (0.7.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #418909)
+ * Built against libflac8 (Closes: #426670, #427746)
+ * debian/control:
+ + Add libmad0-dev to Build-Depends (Closes: #431623, #431624)
+ + Add libavcodec-dev and libavformat-dev to Build-Depends for wma support
+ + Add ffmpeg to Suggests
+ * Update Maintainer's address
+ * Add a clean idjc.desktop
+ * Fix menu-item-uses-apps-section
+
+ -- Arthur Loiret <arthur.loiret at gmail.com> Thu, 16 Aug 2007 13:04:52 +0200
+
+idjc (0.6.12-1) unstable; urgency=low
+
+ * Adopting package (Closes: #424895)
+ * New upstream release
+ * debian/control: remove XS-X-Vcs-Svn and XS-Vcs-Browser tags
+
+ -- Arthur Loiret <freacky22527 at free.fr> Sat, 2 Jun 2007 17:50:13 +0200
+
+idjc (0.6.11-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + add python-gtk2 dependency (Closes: #416816)
+ + move python-eyed3 to Recommends:.
+
+ -- Lionel Le Folgoc (mr_pouit) <mrpouit at gmail.com> Mon, 26 Mar 2007 22:03:24 +0200
+
+idjc (0.6.10-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add debian/doc-base.
+ * debian/control:
+ + set XS-Python-Version to all instead of current
+ + add XS-*-Vcs fields.
+
+ -- Lionel Le Folgoc (mr_pouit) <mrpouit at gmail.com> Fri, 9 Mar 2007 10:46:27 +0100
+
+idjc (0.6.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: add libsndfile1-dev to Build-Depends.
+
+ -- Lionel Le Folgoc (mr_pouit) <mrpouit at gmail.com> Mon, 15 Jan 2007 01:49:58 +0100
+
+idjc (0.6.8-1) unstable; urgency=low
+
+ * Initial release (Closes: #346569)
+
+ -- Lionel Le Folgoc (mr_pouit) <mrpouit at gmail.com> Wed, 27 Dec 2006 16:20:52 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..c1a90cd
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,51 @@
+Source: idjc
+Section: sound
+Priority: optional
+Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Free Ekanayaka <freee at debian.org>,
+ Reinhard Tartler <siretart at tauware.de>,
+ Alessio Treglia <quadrispro at ubuntu.com>
+XS-Python-Version: >= 2.5
+Build-Depends: debhelper (>= 5.0.38),
+ cdbs (>= 0.4.49),
+ python-all-dev (>= 2.3.5-11),
+ python-central (>= 0.5.6),
+ libjack-dev,
+ python-gtk2-dev,
+ python-mutagen,
+ libvorbis-dev,
+ libxine-dev,
+ libsamplerate0-dev,
+ libflac-dev,
+ libshout3-dev,
+ libsndfile1-dev,
+ libmad0-dev,
+ libavcodec-dev,
+ libavformat-dev,
+ twolame | libmp3lame-dev
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.4
+Homepage: http://idjc.sourceforge.net/
+Vcs-Git: git://git.debian.org/git/pkg-multimedia/idjc.git
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/idjc.git;a=summary
+
+Package: idjc
+Architecture: any
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends},
+ ${python:Depends},
+ ${misc:Depends},
+ python,
+ python-gtk2,
+ python-mutagen,
+ jackd
+Recommends: python-eyed3
+Suggests: ffmpeg
+Provides: ${python:Provides}
+Description: graphical shoutcast/icecast client
+ Internet DJ Console is an Internet radio application for making a live radio
+ show or podcast. Features include two main media players with a crossfader,
+ a jingle player, microphone signal processing (compressor and noise gate),
+ IRC track announcements with X-Chat, an automatic stream shut-off timer, MP3
+ or Ogg streaming and recording at various bit rates, aux input for connecting
+ external JACK aware applications, and audio level meters.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..356a3e6
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Name: Internet DJ Console
+Maintainer: Stephen Fairchild <onlymeok at nildram.co.uk>
+Source: https://sourceforge.net/projects/idjc/files/
+
+Files: *
+Copyright: 2005-2009, Stephen Fairchild <onlymeok at nildram.co.uk>
+License: GPL-2
+
+Files: debian/*
+Copyright:
+ 2009, Alessio Treglia <quadrispro at ubuntu.com>
+ 2009, Reinhard Tartler <siretart at tauware.de>
+ 2007-2009, Free Ekanayaka <freee at debian.org>
+ 2007, Arthur Loiret <freacky22527 at free.fr>
+ 2006, Lionel Le Folgoc <mrpouit at gmail.com>
+License: GPL-2
+
+License: GPL-2
+ This package 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 package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+X-Comment: On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000..55c97ca
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,10 @@
+Document: idjc
+Title: Debian idjc Manual
+Author: Stephen Fairchild <onlymeok at nildram.co.uk>
+Abstract: This document provides a quick overview of
+ idjc and what it does.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/idjc/html/index.html
+Files: /usr/share/doc/idjc/html/*.html
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..c8d34fc
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,2 @@
+?package(idjc):needs="X11" section="Applications/Sound"\
+ title="idjc" command="/usr/bin/idjc"
diff --git a/debian/patches/desktop_file.patch b/debian/patches/desktop_file.patch
new file mode 100644
index 0000000..9efef63
--- /dev/null
+++ b/debian/patches/desktop_file.patch
@@ -0,0 +1,26 @@
+diff -Nur -x '*.orig' -x '*~' idjc-0.8.1/idjc.desktop_ idjc-0.8.1.new/idjc.desktop_
+--- idjc-0.8.1/idjc.desktop_ 2009-06-03 03:52:11.000000000 +0200
++++ idjc-0.8.1.new/idjc.desktop_ 2009-12-01 00:12:16.820428308 +0100
+@@ -1,5 +1,5 @@
+ [___Desktop Entry]
+-Categories=GNOME;Application;Network;
++Categories=GNOME;Network;
+ Comment=Create your live radio show or podcast
+ Comment[en_GB]=Create your live radio show or podcast
+ Comment[de]=Erstelle deine eigene Radiosendung oder Podcasts
+@@ -12,13 +12,11 @@
+ Icon=ICONPATHNAME
+ MimeType=
+ Name=Internet DJ Console
+-Path=
+ StartupNotify=true
+ Terminal=false
+-TerminalOptions=
+ Type=Application
+ Version=1.0
+ X-DCOP-ServiceType=
+ X-KDE-SubstituteUID=false
+ X-KDE-Username=
+-X-Ubuntu-Gettext-Domain=idjc
+\ Manca newline alla fine del file
++X-Ubuntu-Gettext-Domain=idjc
diff --git a/debian/patches/idjc_script.patch b/debian/patches/idjc_script.patch
new file mode 100644
index 0000000..d55c0c1
--- /dev/null
+++ b/debian/patches/idjc_script.patch
@@ -0,0 +1,15 @@
+Author: Magnus Holmgren <holmgren at debian.org>
+Description: Fix idjc script to run the gui properly.
+Bug-Debian: http://bugs.debian.org/572271
+diff -Nur -x '*.orig' -x '*~' idjc/idjc_ idjc.new/idjc_
+--- idjc/idjc_ 2010-03-11 18:30:57.802823705 +0100
++++ idjc.new/idjc_ 2010-03-11 18:31:29.362808632 +0100
+@@ -84,7 +84,7 @@
+ export python
+ which $python > /dev/null
+ if [ $? == "0" ] ; then
+- ${python} ${pyexecdir}/idjcgui.py
++ ${python} -m idjcgui
+ else
+ echo "Python interpreter not found. IDJC can not be run without it"
+ fi
diff --git a/debian/patches/python26_ready.patch b/debian/patches/python26_ready.patch
new file mode 100644
index 0000000..b96064a
--- /dev/null
+++ b/debian/patches/python26_ready.patch
@@ -0,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' idjc-0.7.14/configure idjc-0.7.14.new/configure
+--- idjc-0.7.14/configure 2009-04-22 16:24:49.000000000 +0200
++++ idjc-0.7.14.new/configure 2009-05-02 16:45:42.501619842 +0200
+@@ -2592,7 +2592,7 @@
+ if test "${am_cv_python_pythondir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
++ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+@@ -2609,7 +2609,7 @@
+ if test "${am_cv_python_pyexecdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
++ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null ||
+ echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
diff --git a/debian/patches/server_window_size.patch b/debian/patches/server_window_size.patch
new file mode 100644
index 0000000..3de0ceb
--- /dev/null
+++ b/debian/patches/server_window_size.patch
@@ -0,0 +1,20 @@
+--- idjcpython/sourceclientgui.py.orig 2008-06-21 11:18:18.000000000 +0200
++++ idjcpython/sourceclientgui.py 2008-06-21 11:19:10.000000000 +0200
+@@ -169,7 +169,7 @@
+ def __init__(self, parent, qty, default_text=""):
+ self.source_client_gui = parent
+ gtk.HBox.__init__(self)
+- self.set_spacing(13)
++ self.set_spacing(12)
+ left_hbox = gtk.HBox()
+ label = gtk.Label(ln.metadata)
+ left_hbox.pack_start(label, False, False, 0)
+@@ -616,7 +616,7 @@
+ scrolled = gtk.ScrolledWindow()
+ Tab.add(self, scrolled)
+ scrolled.show()
+- scrolled.set_size_request(-1, 355)
++ scrolled.set_size_request(-1, 162)
+ scrolled.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+ scrolled.set_shadow_type(gtk.SHADOW_NONE)
+ scrolled_vbox = gtk.VBox()
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/rules b/debian/rules
new file mode 100644
index 0000000..f7f310f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath --disable-static --libexecdir=/usr/bin
+
+ifneq (,$(findstring doopt,$(DEB_BUILD_OPTIONS)))
+# do optimization for the different architectures
+ ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
+ OPTI_FLAGS := -D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -mmmx -msse -mfpmath=sse -march=pentium4
+ CXXFLAGS += $(OPTI_FLAGS)
+ CFLAGS += $(OPTI_FLAGS)
+ endif
+endif
+
+cleanbuilddir/idjc::
+ rm -f AUTHORS.gz ChangeLog.gz NEWS.gz README.gz
+ rm -f idjcctrl idjcskype idjc
+ rm -f artwork/idjc.png
+ rm -fr libshout
+# rm -fv idjcpython/idjc_config.py
+
+install/idjc::
+ dh_installdirs -pidjc usr/share/doc/idjc/html
+ cp -a $(DEB_SRCDIR)/doc/* $(DEB_DESTDIR)/usr/share/doc/idjc/html/
+ # Delete auto-installed docs in wrong dir (rather than patching Makefiles)
+ rm -rf $(DEB_DESTDIR)/usr/share/doc/idjc-*
+ # Fix permission problem
+ -chmod u+x $(DEB_DESTDIR)/usr/lib/python*/*-packages/idjc/IDJCmultitagger.py
+ # remove pyc files
+ find $(DEB_DESTDIR) -name \*.pyc -exec rm -v {} +
+ find $(DEB_DESTDIR) -type d -empty -delete
+
+binary-install/idjc::
+ dh_pycentral -pidjc
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..78be0d8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/idjc/idjc-(.*)\.tar\.gz
--
idjc packaging
More information about the pkg-multimedia-commits
mailing list