tags 445399 + patch

thank you


Hi,

Here is an NMU that fixes this bug as well as a significant amount of
standards clean-up and such.  Which mean it would probably be better as
a straight maintainer upload if you prefer.

Because the package is arch: all, the install-python-% stuff is probably
overkill so it's up to you if you want to use it that way or not.

Thank you,

Barry deFreese


diff -u musiclibrarian-1.6/debian/menu musiclibrarian-1.6/debian/menu
--- musiclibrarian-1.6/debian/menu
+++ musiclibrarian-1.6/debian/menu
@@ -1,2 +1,2 @@
-?package(musiclibrarian):needs="X11" section="Apps/Sound"\
+?package(musiclibrarian):needs="X11" section="Applications/Sound"\
   title="Music Librarian" command="/usr/bin/music-librarian"
diff -u musiclibrarian-1.6/debian/control musiclibrarian-1.6/debian/control
--- musiclibrarian-1.6/debian/control
+++ musiclibrarian-1.6/debian/control
@@ -5,22 +5,20 @@
-Build-Depends: debhelper (>= 5.0.37.2), python-central (>= 0.5)
-Build-Depends-Indep: debhelper (>= 5.0.37.2), python-central (>= 0.5), python (>= 2.3.0), python-dev (>= 2.3.0)
-Standards-Version: 3.6.0
+Build-Depends: debhelper (>= 5.0.38)
+Build-Depends-Indep: python-central (>= 0.5.6), python-all-dev (>= 2.3.5-11)
+Standards-Version: 3.7.3
+XS-Python-Version: all
+Homepage: http://alioth.debian.org/projects/musiclibrarian
 
 Package: musiclibrarian
 Architecture: all
 Depends: ${python:Depends}, python-gtk2 (>= 2.4.0), python-glade2, python-pyvorbis, python-id3, python-pyao, python-pymad, libglade2-0 (>= 1:2.4.1)
-XS-Python-Version: current
 XB-Python-Version: ${python:Versions}
 Description: A simple GUI tool to organize collections of music
  Music Librarian is a tool to assist you in organizing your collection
- of music files.  It provides an interface from which you can view the
+ of music files. It provides an interface from which you can view the
  list of files in your collection and modify the tags of one or more
  files.
  .
  Music Librarian handles ogg files natively, but also has support for
- the legacy mp3 format.  It displays music in a hierarchical
+ the legacy mp3 format. It displays music in a hierarchical
  organization according to one of several rules, and allows you to
  undo any number of changes to files.
- .
- The upstream Web site of Music Librarian is
- http://alioth.debian.org/projects/musiclibrarian.
\ No newline at end of file
diff -u musiclibrarian-1.6/debian/rules musiclibrarian-1.6/debian/rules
--- musiclibrarian-1.6/debian/rules
+++ musiclibrarian-1.6/debian/rules
@@ -6,29 +6,35 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PYVERS=$(shell pyversions -vr)
+
 CFLAGS = -Wall -g
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	-rm -rf build
+	rm -f build-stamp configure-stamp install-stamp
 
 	dh_clean 
 
 # Nothing to do to build the package.
 build:
 
-install:
+install: install-stamp
+install-stamp: $(PYVERS:%=install-python-%)
+	touch $@
+
+	sed -i -e '1s/python.*/python/' $(CURDIR)/debian/musiclibrarian/usr/bin/music-librarian
+
+install-python-%:
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs
 
-	./setup.py install --no-compile --prefix=$(CURDIR)/debian/musiclibrarian/usr
+	python$* ./setup.py install --no-compile --prefix=$(CURDIR)/debian/musiclibrarian/usr
 
 binary-indep: install
 	dh_testdir
-	dh_installdirs
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
@@ -39,7 +45,7 @@
 	dh_compress
 	dh_fixperms
 	dh_pycentral
-	dh_python /usr/share/musiclibrarian
+	rmdir $(CURDIR)/debian/musiclibrarian/usr/lib
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff -u musiclibrarian-1.6/debian/changelog musiclibrarian-1.6/debian/changelog
--- musiclibrarian-1.6/debian/changelog
+++ musiclibrarian-1.6/debian/changelog
@@ -1,3 +1,19 @@
+musiclibrarian (1.6-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Bump versioned build-deps for debhelper and python-central.
+  * XS-Python-Version: all. (Closes: #445399).
+  * Build depend python-all-dev, not python-dev.
+  * Add Copyright holder to debian/copyright.
+    + Link to GPL-2.
+  * Add Homepage field.
+    + Remove upstream URL from package description.
+  * Bump compat to 5 to match debhelper build-dep.
+  * Bump Standards Version to 3.7.3.
+    + Menu policy transition.
+
+ -- Barry deFreese <[EMAIL PROTECTED]>  Tue, 12 Feb 2008 22:36:16 -0500
+
 musiclibrarian (1.6-2) unstable; urgency=low
 
   * Try to follow the new Python policy. (Closes: #380878)
diff -u musiclibrarian-1.6/debian/compat musiclibrarian-1.6/debian/compat
--- musiclibrarian-1.6/debian/compat
+++ musiclibrarian-1.6/debian/compat
@@ -1 +1 @@
-4
+5
diff -u musiclibrarian-1.6/debian/copyright musiclibrarian-1.6/debian/copyright
--- musiclibrarian-1.6/debian/copyright
+++ musiclibrarian-1.6/debian/copyright
@@ -5,7 +5,7 @@
 
 Upstream Author: Daniel Burrows <[EMAIL PROTECTED]>
 
-Copyright:
+Copyright: Copyright (C) 2003-2004 Daniel Burrows <[EMAIL PROTECTED]>
 
    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
@@ -24,3 +24,3 @@
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

Reply via email to