[Python-apps-commits] r426 - in packages/pykaraoke/trunk/debian (11 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Sun Dec 16 19:29:08 UTC 2007
Date: Sunday, December 16, 2007 @ 19:29:08
Author: piotr
Revision: 426
* Build Python extension for all supported Python versions
- python-all-dev added to Build-Depends
- debian/rules file updated
* patches added: (quilt added to Build-Depends)
- fix_desktop_files
- disable_fonts_installation
- remove_hashbangs
* debian/watch file updated
* python-pykaraoke's section changed to python
* Standards-Version bumped to 3.7.3 (no changes needed)
Added:
packages/pykaraoke/trunk/debian/patches/
packages/pykaraoke/trunk/debian/patches/disable_fonts_installation.patch
packages/pykaraoke/trunk/debian/patches/fix_desktop_files.patch
packages/pykaraoke/trunk/debian/patches/remove_hashbangs.patch
packages/pykaraoke/trunk/debian/patches/series
Modified:
packages/pykaraoke/trunk/debian/changelog
packages/pykaraoke/trunk/debian/control
packages/pykaraoke/trunk/debian/docs
packages/pykaraoke/trunk/debian/rules
packages/pykaraoke/trunk/debian/watch
Deleted:
packages/pykaraoke/trunk/debian/overrides/
Modified: packages/pykaraoke/trunk/debian/changelog
===================================================================
--- packages/pykaraoke/trunk/debian/changelog 2007-12-16 12:54:14 UTC (rev 425)
+++ packages/pykaraoke/trunk/debian/changelog 2007-12-16 19:29:08 UTC (rev 426)
@@ -1,5 +1,6 @@
-pykaraoke (0.5.1.ds1-1) unstable; urgency=low
+pykaraoke (0.5.1-1) unstable; urgency=low
+ [ Miriam Ruiz ]
* New Upstream Release.
+ GUI: Now works with WxPython v2.8
+ GUI: Improved search results layout
@@ -12,8 +13,20 @@
* Replaced deprecated ${Source-Version} by ${source:Version} in control
* Added dh_desktop to rules
- -- Miriam Ruiz <little_miry at yahoo.es> Mon, 26 Nov 2007 21:57:22 +0000
+ [ Piotr Ożarowski ]
+ * Build Python extension for all supported Python versions
+ - python-all-dev added to Build-Depends
+ - debian/rules file updated
+ * patches added: (quilt added to Build-Depends)
+ - fix_desktop_files
+ - disable_fonts_installation
+ - remove_hashbangs
+ * debian/watch file updated
+ * python-pykaraoke's section changed to python
+ * Standards-Version bumped to 3.7.3 (no changes needed)
+ -- Miriam Ruiz <little_miry at yahoo.es> Sun, 16 Dec 2007 20:01:35 +0100
+
pykaraoke (0.5.0.ds1-2) unstable; urgency=low
* Moved python-support from Build-Depends-Indep to Build-Depends.
Modified: packages/pykaraoke/trunk/debian/control
===================================================================
--- packages/pykaraoke/trunk/debian/control 2007-12-16 12:54:14 UTC (rev 425)
+++ packages/pykaraoke/trunk/debian/control 2007-12-16 19:29:08 UTC (rev 426)
@@ -1,12 +1,12 @@
Source: pykaraoke
Section: games
Priority: optional
-Maintainer: "Python Applications Packaging Team" <python-apps-team at lists.alioth.debian.org>
+Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>
Homepage: http://www.kibosh.org/pykaraoke/
-Build-Depends: debhelper (>= 5.0.37.2), python-dev, python-support (>= 0.4),
- libsdl-dev | libsdl1.2-dev, python-pygame
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python-support (>= 0.4),
+ libsdl-dev | libsdl1.2-dev, python-pygame, quilt (>= 0.40-1)
+Standards-Version: 3.7.3
Package: pykaraoke
Architecture: all
@@ -34,8 +34,6 @@
MIDI/KAR support on Linux, requires the following:
* Timidity++
* Sounds/patches for Timidity++ (e.g. freepats or eawpatches)
- .
- Homepage: http://www.kibosh.org/pykaraoke/
Package: pykaraoke-bin
Architecture: all
@@ -61,10 +59,9 @@
MIDI/KAR support on Linux, requires the following:
* Timidity++
* Sounds/patches for Timidity++ (e.g. freepats or eawpatches)
- .
- Homepage: http://www.kibosh.org/pykaraoke/
Package: python-pykaraoke
+Section: python
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-pygame, ttf-dejavu,
${misc:Depends}
@@ -88,5 +85,3 @@
MIDI/KAR support on Linux, requires the following:
* Timidity++
* Sounds/patches for Timidity++ (e.g. freepats or eawpatches)
- .
- Homepage: http://www.kibosh.org/pykaraoke/
Modified: packages/pykaraoke/trunk/debian/docs
===================================================================
--- packages/pykaraoke/trunk/debian/docs 2007-12-16 12:54:14 UTC (rev 425)
+++ packages/pykaraoke/trunk/debian/docs 2007-12-16 19:29:08 UTC (rev 426)
@@ -1,2 +1 @@
README.txt
-README.txt
Added: packages/pykaraoke/trunk/debian/patches/disable_fonts_installation.patch
===================================================================
--- packages/pykaraoke/trunk/debian/patches/disable_fonts_installation.patch (rev 0)
+++ packages/pykaraoke/trunk/debian/patches/disable_fonts_installation.patch 2007-12-16 19:29:08 UTC (rev 426)
@@ -0,0 +1,22 @@
+Index: pykaraoke-0.5.1/setup.py
+===================================================================
+--- pykaraoke-0.5.1.orig/setup.py
++++ pykaraoke-0.5.1/setup.py
+@@ -36,11 +36,12 @@ data_files = [
+ 'icons/microphone.ico',
+ 'icons/pykaraoke.xpm',
+ 'icons/splash.jpg']),
+- ('share/pykaraoke/fonts', [
+- 'fonts/DejaVuSans.ttf',
+- 'fonts/DejaVuSansCondensed.ttf',
+- 'fonts/DejaVuSansCondensed-Bold.ttf',
+- ])]
++# ('share/pykaraoke/fonts', [
++# 'fonts/DejaVuSans.ttf',
++# 'fonts/DejaVuSansCondensed.ttf',
++# 'fonts/DejaVuSansCondensed-Bold.ttf',
++# ])]
++ ]
+
+ # These data files only make sense on Unix-like systems.
+ if env != ENV_WINDOWS:
Added: packages/pykaraoke/trunk/debian/patches/fix_desktop_files.patch
===================================================================
--- packages/pykaraoke/trunk/debian/patches/fix_desktop_files.patch (rev 0)
+++ packages/pykaraoke/trunk/debian/patches/fix_desktop_files.patch 2007-12-16 19:29:08 UTC (rev 426)
@@ -0,0 +1,37 @@
+Index: pykaraoke-0.5.1/install/pykaraoke.desktop
+===================================================================
+--- pykaraoke-0.5.1.orig/install/pykaraoke.desktop
++++ pykaraoke-0.5.1/install/pykaraoke.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Type=Application
+-Encoding=UTF-8
+ Name=PyKaraoke
+ Name[lt]=PyKaraoke
+ GenericName=Karaoke player
+@@ -9,5 +8,5 @@ Comment[lt]=Universalus karaoke muzikos
+ Icon=/usr/share/pykaraoke/icons/pykaraoke.xpm
+ Exec=pykaraoke
+ Terminal=false
+-MimeType=audio/x-karaoke;audio/x-midi;audio/midi
+-Categories=Application;AudioVideo;Player;
++MimeType=audio/x-karaoke;audio/x-midi;audio/midi;
++Categories=AudioVideo;Player;
+Index: pykaraoke-0.5.1/install/pykaraoke_mini.desktop
+===================================================================
+--- pykaraoke-0.5.1.orig/install/pykaraoke_mini.desktop
++++ pykaraoke-0.5.1/install/pykaraoke_mini.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+ Type=Application
+-Encoding=UTF-8
+ Name=PyKaraoke Mini
+ GenericName=Karaoke player
+ Comment=Minimum-interface PyKaraoke
+ Icon=/usr/share/pykaraoke/icons/pykaraoke.xpm
+ Exec=pykaraoke_mini
+ Terminal=false
+-MimeType=audio/x-karaoke;audio/x-midi;audio/midi
+-Categories=Application;AudioVideo;Player;
++MimeType=audio/x-karaoke;audio/x-midi;audio/midi;
++Categories=AudioVideo;Player;
Added: packages/pykaraoke/trunk/debian/patches/remove_hashbangs.patch
===================================================================
--- packages/pykaraoke/trunk/debian/patches/remove_hashbangs.patch (rev 0)
+++ packages/pykaraoke/trunk/debian/patches/remove_hashbangs.patch 2007-12-16 19:29:08 UTC (rev 426)
@@ -0,0 +1,45 @@
+Index: pykaraoke-0.5.1/pycdg.py
+===================================================================
+--- pykaraoke-0.5.1.orig/pycdg.py
++++ pykaraoke-0.5.1/pycdg.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+
+ # pycdg - CDG/MP3+G Karaoke Player
+
+Index: pykaraoke-0.5.1/pykar.py
+===================================================================
+--- pykaraoke-0.5.1.orig/pykar.py
++++ pykaraoke-0.5.1/pykar.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+
+ # pykar - KAR/MID Karaoke Player
+ #
+Index: pykaraoke-0.5.1/pykaraoke.py
+===================================================================
+--- pykaraoke-0.5.1.orig/pykaraoke.py
++++ pykaraoke-0.5.1/pykaraoke.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+
+ # pykaraoke - Karaoke Player Frontend
+ #
+Index: pykaraoke-0.5.1/pykaraoke_mini.py
+===================================================================
+--- pykaraoke-0.5.1.orig/pykaraoke_mini.py
++++ pykaraoke-0.5.1/pykaraoke_mini.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+
+ # pykaraoke - Karaoke Player Frontend
+ #
+Index: pykaraoke-0.5.1/pympg.py
+===================================================================
+--- pykaraoke-0.5.1.orig/pympg.py
++++ pykaraoke-0.5.1/pympg.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+
+ # pympg - MPEG Karaoke Player
+ #
Added: packages/pykaraoke/trunk/debian/patches/series
===================================================================
--- packages/pykaraoke/trunk/debian/patches/series (rev 0)
+++ packages/pykaraoke/trunk/debian/patches/series 2007-12-16 19:29:08 UTC (rev 426)
@@ -0,0 +1,3 @@
+disable_fonts_installation.patch
+fix_desktop_files.patch
+remove_hashbangs.patch
Modified: packages/pykaraoke/trunk/debian/rules
===================================================================
--- packages/pykaraoke/trunk/debian/rules 2007-12-16 12:54:14 UTC (rev 425)
+++ packages/pykaraoke/trunk/debian/rules 2007-12-16 19:29:08 UTC (rev 426)
@@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
+PYVERS=$(shell pyversions -vr)
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -11,59 +14,48 @@
CFLAGS += -O2
endif
-configure: configure-stamp
-configure-stamp:
+build: patch build-stamp
+build-stamp: $(PYVERS:%=build-ext-%)
+ touch $@
+build-ext-%:
dh_testdir
- touch fonts/DejaVuSans.ttf
- touch fonts/DejaVuSansCondensed.ttf
- touch fonts/DejaVuSansCondensed-Bold.ttf
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- python setup.py build
+ python$* setup.py build
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
- rm -rf `find . -name "*.pyc"`
- rm -rf fonts/* build debian/python-pykaraoke
- dh_clean
+ find . -name "*.pyc" -delete
+ rm -rf build
+ dh_clean build-stamp install-stamp python-ext-* build-ext-*
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- python setup.py install --root=$(CURDIR)/debian/python-pykaraoke --no-compile --verbose
+install: install-stamp
+install-stamp: $(PYVERS:%=install-ext-%)
+ touch $@
+install-ext-%:
+ python$* setup.py install --skip-build \
+ --root $(CURDIR)/debian/python-pykaraoke
+ touch $@
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
dh_testdir
dh_testroot
dh_install -i --sourcedir=debian/python-pykaraoke
- dh_link -ppykaraoke usr/share/doc/python-pykaraoke usr/share/doc/pykaraoke
- dh_link -ppykaraoke-bin usr/share/doc/python-pykaraoke usr/share/doc/pykaraoke-bin
dh_installmenu -ppykaraoke debian/menu
- dh_installman -ppykaraoke-bin debian/pykar.6
- dh_installman -ppykaraoke-bin debian/pycdg.6
- dh_installman -ppykaraoke-bin debian/pympg.6
- dh_installman -ppykaraoke-bin debian/pykaraoke_mini.6
+ dh_installman -ppykaraoke-bin debian/pykar.6 debian/pycdg.6 \
+ debian/pympg.6 debian/pykaraoke_mini.6
dh_installman -ppykaraoke debian/pykaraoke.6
+ dh_link -ppykaraoke usr/share/doc/python-pykaraoke usr/share/doc/pykaraoke
+ dh_link -ppykaraoke-bin usr/share/doc/python-pykaraoke usr/share/doc/pykaraoke-bin
rm -rf debian/python-pykaraoke/usr/share/pykaraoke/
rm -rf debian/python-pykaraoke/usr/share/applications
rm -rf debian/python-pykaraoke/usr/bin
- dh_strip -i
dh_compress -i
dh_fixperms -i
dh_pysupport -i
dh_desktop -i
dh_installdeb -i
- dh_shlibdeps -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
@@ -74,12 +66,9 @@
dh_testroot
dh_installchangelogs -ppython-pykaraoke
dh_installdocs -ppython-pykaraoke
- dh_install -a --sourcedir=debian/python-pykaraoke
- dh_installdirs -ppython-pykaraoke usr/share/lintian/overrides/
- dh_install -ppython-pykaraoke debian/overrides/python-pykaraoke usr/share/lintian/overrides/
- rm -rf debian/python-pykaraoke/usr/share/pykaraoke/
- rm -rf debian/python-pykaraoke/usr/share/applications
- rm -rf debian/python-pykaraoke/usr/bin
+ rm -rf debian/python-pykaraoke/usr/share/pykaraoke/ \
+ debian/python-pykaraoke/usr/share/applications \
+ debian/python-pykaraoke/usr/bin
dh_strip -a
dh_compress -a
dh_fixperms -a
@@ -93,4 +82,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Modified: packages/pykaraoke/trunk/debian/watch
===================================================================
--- packages/pykaraoke/trunk/debian/watch 2007-12-16 12:54:14 UTC (rev 425)
+++ packages/pykaraoke/trunk/debian/watch 2007-12-16 19:29:08 UTC (rev 426)
@@ -1,9 +1,5 @@
# watch control file for uscan
# See uscan(1) for format
-# Compulsory line, this is a version 3 file
version=3
-
-# Examine a Webpage
-# <Webpage URL> <string match>
-http://www.kibosh.org/pykaraoke/downloads.php pykaraoke-(.*)\.zip(.*)
+http://sf.net/pykaraoke/pykaraoke-(.*)\.zip
More information about the Python-apps-commits
mailing list