Bug#97568: marked as done (xmp: NMU 1.1.3-1.*)
Your message dated Sun, 3 Feb 2002 19:34:52 +0000
with message-id <20020203193452.GA31488@arborlon.riva.ucam.org>
and subject line No longer applicable
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 15 May 2001 13:10:10 +0000
>From cjw44@flatline.org.uk Tue May 15 08:10:10 2001
Return-path: <cjw44@flatline.org.uk>
Received: from mta02-svc.ntlworld.com [62.253.162.42]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 14zeaW-00051x-00; Tue, 15 May 2001 08:10:08 -0500
Received: from riva.ucam.org ([213.107.104.43]) by mta02-svc.ntlworld.com
(InterMail vM.4.01.02.27 201-229-119-110) with ESMTP
id <20010515131007.RDBO290.mta02-svc.ntlworld.com@riva.ucam.org>
for <submit@bugs.debian.org>; Tue, 15 May 2001 14:10:07 +0100
Received: from cjw44 by riva.ucam.org with local (Exim 3.22 #1 (Debian))
for submit@bugs.debian.org
id 14zeaU-0006mU-00; Tue, 15 May 2001 14:10:06 +0100
Date: Tue, 15 May 2001 14:10:06 +0100
From: Colin Watson <cjw44@flatline.org.uk>
To: submit@bugs.debian.org
Subject: xmp: NMU 1.1.3-1.1
Message-ID: <20010515141006.A25923@riva.ucam.org>
References: <20010422125800.A28093@riva.ucam.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.17i
In-Reply-To: <20010422125800.A28093@riva.ucam.org>; from cjw44@flatline.org.uk on Sun, Apr 22, 2001 at 12:58:01PM +0100
Organization: riva.ucam.org
Sender: Colin Watson <cjw44@riva.ucam.org>
Delivered-To: submit@bugs.debian.org
Package: xmp
Version: 1.1.3-1
Severity: normal
As I said I would do a few weeks ago, I just uploaded an NMU for xmp to
perform the FHS transition and fix a few other policy-related bugs.
Here's the diff:
--- xmp-1.1.3.orig/Makefile.rules.in
+++ xmp-1.1.3/Makefile.rules.in
@@ -61,15 +61,19 @@
clean::
rm -Rf *.o core errlist depend $(CFILES)
+ifdef DDIRS
for i in $(DDIRS); do \
cd $$i; [ -f Makefile ] && $(MAKE) clean; cd ..; \
done
+endif
distclean::
rm -Rf depend $(CFILES) $(DCFILES)
+ifdef DDIRS
-for i in $(DDIRS); do \
cd $$i; [ -f Makefile ] && $(MAKE) distclean; cd ..; \
done
+endif
ifdef DDIRS
install::
--- xmp-1.1.3.orig/debian/changelog
+++ xmp-1.1.3/debian/changelog
@@ -1,3 +1,19 @@
+xmp (1.1.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Updated to policy version 3.1.1 and added build dependencies.
+ * FHS transition (closes: #91096, #91708).
+ * Converted to update-mime, via dh_installmime (closes: #74486, #81341).
+ * Let dh_installdocs do the doc-base handling.
+ * Removed call to obsolete dh_suidregister.
+ * Removed add-log-mailing-address from this changelog (~/.emacs is
+ preferred).
+ * The clean target didn't work for me, so fixed it.
+ * Updated GPL pointer in copyright file.
+ * Removed package name from short description (lintian).
+
+ -- Colin Watson <cjwatson@debian.org> Tue, 15 May 2001 13:28:48 +0100
+
xmp (1.1.3-1) unstable; urgency=low
* New release.
@@ -22,5 +38,4 @@
Local variables:
mode: debian-changelog
-add-log-mailing-address: "tom@lpsg.demon.co.uk"
End:
--- xmp-1.1.3.orig/debian/control
+++ xmp-1.1.3/debian/control
@@ -2,12 +2,13 @@
Section: sound
Priority: extra
Maintainer: Tom Lees <tom@lpsg.demon.co.uk>
-Standards-Version: 2.4.0.0
+Standards-Version: 3.1.1
+Build-Depends: debhelper (>= 2.0.40), xlibs-dev
Package: xmp
Architecture: any
Depends: ${shlibs:Depends}
-Description: XMP, a module player supporting AWE32, GUS, and software-mixing
+Description: A module player supporting AWE32, GUS, and software-mixing
xmp is a module player for Linux/FreeBSD/Solaris. Initially designed as a
XM player, today it recognizes the following module formats:
.
--- xmp-1.1.3.orig/debian/copyright
+++ xmp-1.1.3/debian/copyright
@@ -19,4 +19,4 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/doc/copyright/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- xmp-1.1.3.orig/debian/doc-base
+++ xmp-1.1.3/debian/doc-base
@@ -5,5 +5,5 @@
Section: Apps/Sound
Format: HTML
-Index: /usr/doc/xmp/xmp.html
-Files: /usr/doc/xmp/xmp.html
+Index: /usr/share/doc/xmp/xmp.html
+Files: /usr/share/doc/xmp/xmp.html
--- xmp-1.1.3.orig/debian/doc-base.faq
+++ xmp-1.1.3/debian/doc-base.faq
@@ -5,9 +5,9 @@
Section: Apps/Sound
Format: HTML
-Index: /usr/doc/xmp/FAQ.html
-Files: /usr/doc/xmp/FAQ.html
+Index: /usr/share/doc/xmp/FAQ.html
+Files: /usr/share/doc/xmp/FAQ.html
Format: text
-Index: /usr/doc/xmp/xmp.txt.gz
-Files: /usr/doc/xmp/xmp.txt.gz
+Index: /usr/share/doc/xmp/xmp.txt.gz
+Files: /usr/share/doc/xmp/xmp.txt.gz
--- xmp-1.1.3.orig/debian/menu
+++ xmp-1.1.3/debian/menu
@@ -2,5 +2,5 @@
title="XMP FAQ" \
longtitle="eXtended Module Player FAQ" \
description="Frequently Asked Questions about the XMP module player" \
- command="/usr/doc/xmp/FAQ.html" \
+ command="/usr/share/doc/xmp/FAQ.html" \
section=Apps/Sound
--- xmp-1.1.3.orig/debian/postinst
+++ xmp-1.1.3/debian/postinst
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-mime_types="xm mod s3m stm mtm ptm okt far wow amd rad 669 alm"
-
-if [ -x /usr/sbin/install-mime ]; then
- for i in $mime_types; do
- /usr/sbin/install-mime --install --package=xmp --content=application/x-$i \
- --comment="XMP player" --needsterminal=t --copiousoutput=t \
- --description="Module file" --textualnewlines=f \
- --nametemplate="%s.$i" --view="/usr/bin/xmp-view %s"
- done
-fi
-
-if [ -x /usr/sbin/install-docs ]; then
- /usr/sbin/install-docs -i /usr/share/doc-base/xmp
- /usr/sbin/install-docs -i /usr/share/doc-base/xmp-faq
-fi
-#DEBHELPER#
--- xmp-1.1.3.orig/debian/postrm
+++ xmp-1.1.3/debian/postrm
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -x /usr/sbin/install-mime ]; then
- /usr/sbin/install-mime --remove --package=xmp
-fi
--- xmp-1.1.3.orig/debian/prerm
+++ xmp-1.1.3/debian/prerm
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ -x /usr/sbin/install-docs ]; then
- /usr/sbin/install-docs -r xmp
- /usr/sbin/install-docs -r xmp-faq
-fi
-#DEBHELPER#
--- xmp-1.1.3.orig/debian/rules
+++ xmp-1.1.3/debian/rules
@@ -17,16 +17,25 @@
dh_testdir
dh_testroot
rm -f build-stamp
- dh_clean
+ dh_clean debian/mime
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ -$(MAKE) clean distclean
+
+mime_types=xm mod s3m stm mtm ptm okt far wow amd rad 669 alm
+
+debian/mime:
+ set -e; for i in $(mime_types); do \
+ echo "application/x-$$i; /usr/bin/xmp-view %s;" \
+ 'needsterminal; copiousoutput; description=Module file;' \
+ "nametemplate=%s.$$i"; \
+ done > debian/mime
# Build architecture-independent files here.
binary-indep: build
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build-stamp
+binary-arch: build-stamp debian/mime
# dh_testversion
dh_testdir
dh_testroot
@@ -37,21 +46,19 @@
cp debian/xmp-view debian/tmp/usr/bin
chmod +x debian/tmp/usr/bin/xmp-view
cp debian/xmp-view.conf debian/tmp/etc/xmp-view.conf
- cp debian/doc-base debian/tmp/usr/share/doc-base/xmp
- cp debian/doc-base debian/tmp/usr/share/doc-base/xmp-faq
dh_installdocs docs/FAQ.txt docs/FAQ.html docs/bugs.txt \
docs/relnotes.txt README docs/xmp.html
dh_installexamples
dh_installmenu
# dh_installinit
dh_installcron
+ dh_installmime
dh_installmanpages
dh_undocumented xmp-view.1
dh_installchangelogs docs/changes.txt
dh_strip
dh_compress
dh_fixperms
- dh_suidregister
dh_installdeb
dh_shlibdeps
dh_gencontrol
--- xmp-1.1.3.orig/src/main/Makefile
+++ xmp-1.1.3/src/main/Makefile
@@ -10,7 +10,7 @@
XPMS = bg1.xpm bg2.xpm bg3.xpm
DFILES = Makefile $(OBJS:.o=.c) $(X11OBJS:.o=.c) main.c xpanel.h $(XPMS)
DDIRS =
-CFILES =
+CFILES = xmp xxmp
DCFILES =
all: bins
Thanks,
--
Colin Watson [cjw44@flatline.org.uk]
---------------------------------------
Received: (at 97568-done) by bugs.debian.org; 3 Feb 2002 19:35:27 +0000
>From cjwatson@flatline.org.uk Sun Feb 03 13:35:27 2002
Return-path: <cjwatson@flatline.org.uk>
Received: from rhenium.btinternet.com (rhenium) [194.73.73.93]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 16XSQB-0004BJ-00; Sun, 03 Feb 2002 13:35:27 -0600
Received: from host217-35-46-184.in-addr.btopenworld.com ([217.35.46.184] helo=arborlon.lab.dotat.at)
by rhenium with esmtp (Exim 3.22 #8)
id 16XSQ5-0001Yc-00
for 97568-done@bugs.debian.org; Sun, 03 Feb 2002 19:35:21 +0000
Received: from cjwatson by arborlon.lab.dotat.at with local (Exim 3.34 #1 (Debian))
id 16XSPc-0008CE-00
for <97568-done@bugs.debian.org>; Sun, 03 Feb 2002 19:34:52 +0000
Date: Sun, 3 Feb 2002 19:34:52 +0000
From: Colin Watson <cjwatson@flatline.org.uk>
To: 97568-done@bugs.debian.org
Subject: No longer applicable
Message-ID: <20020203193452.GA31488@arborlon.riva.ucam.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.27i
Sender: Colin Watson <cjwatson@flatline.org.uk>
Delivered-To: 97568-done@bugs.debian.org
Since xmp is now maintained by QA, there's no point in leaving this bug
open with a record of the NMUs I did. Closing.
--
Colin Watson [cjwatson@flatline.org.uk]
Reply to: