Some minor debianization fixes

diff --git a/debian/control b/debian/control
index 0dd9034c7d388456a5ddf4a1882b37db68a93eeb..aa63349c12bfc967b76ae7ca51cc02a3eb84b7ee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: disorder
 Maintainer: Richard Kettlewell <rjk@greenend.org.uk>
 Source: disorder
 Maintainer: Richard Kettlewell <rjk@greenend.org.uk>

+Section: sound

 Priority: optional
 Standards-Version: 3.7.2.2
 Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, libao-dev, python, libflac-dev, libgtk2.0-dev
 Priority: optional
 Standards-Version: 3.7.2.2
 Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, libao-dev, python, libflac-dev, libgtk2.0-dev

diff --git a/debian/copyright b/debian/copyright
index 3a4abe5da09be4d1f1e7dd53c1e4ddda688fbf34..78f57333138e2cf2ac3fde5e77788944fe2a82d0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,9 @@ Packaged by:
   Richard Kettlewell <rjk@greenend.org.uk>
 
 DisOrder - select and play digital audio files
   Richard Kettlewell <rjk@greenend.org.uk>
 
 DisOrder - select and play digital audio files

-Copyright (C) 2003, 2004, 2005, 2006, 2007 Richard Kettlewell
+Copyright (C) 2003-2008 Richard Kettlewell
+Portions copyright (C) 2007 Ross Younger
+Portions copyright (C) 2007 Mark Wooding

 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) (C) 2000-2001 Robert Leslie
 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) (C) 2000-2001 Robert Leslie

diff --git a/debian/rules b/debian/rules
index 53dc48610e37ac648038d62f423f25f51948b1b5..ce385d7715d172415d70ba1348d04121276a5924 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,15 +48,14 @@ export INSTALL_PROGRAM
 LIBTOOL=./libtool
 FAKEROOT=fakeroot
 
 LIBTOOL=./libtool
 FAKEROOT=fakeroot
 

-.PHONY: build

 # ./prepare is the script that generates configure etc.  It only needs to be
 # run if building from a checkout rather than a tarball.
 build:
 # ./prepare is the script that generates configure etc.  It only needs to be
 # run if building from a checkout rather than a tarball.
 build:

-       @if test ! -f configure; then \
+       @set -e;if test ! -f configure; then \

          echo ./prepare;\
          ./prepare;\
        fi
          echo ./prepare;\
          ./prepare;\
        fi

-       @if test ! -f config.status; then \
+       @set -e;if test ! -f config.status; then \

          echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
          ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
        else\
          echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
          ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
        else\


@@ -65,11 +64,6 @@ build:
        fi
        $(MAKE)
 
        fi
        $(MAKE)
 

-.PHONY: cleanpkg-disorder
-cleanpkg-disorder:
-       rm -rf debian/disorder
-
-.PHONY: pkg-disorder

 pkg-disorder: build
        rm -rf debian/disorder
        $(MKDIR) debian/disorder
 pkg-disorder: build
        rm -rf debian/disorder
        $(MKDIR) debian/disorder


@@ -115,12 +109,6 @@ pkg-disorder: build
        chmod -R g-ws debian/disorder
        dpkg --build debian/disorder ..
 
        chmod -R g-ws debian/disorder
        dpkg --build debian/disorder ..
 

-
-.PHONY: cleanpkg-disorder-server
-cleanpkg-disorder-server:
-       rm -rf debian/disorder-server
-
-.PHONY: pkg-disorder-server

 pkg-disorder-server: build
        rm -rf debian/disorder-server
        $(MKDIR) debian/disorder-server
 pkg-disorder-server: build
        rm -rf debian/disorder-server
        $(MKDIR) debian/disorder-server


@@ -172,12 +160,6 @@ pkg-disorder-server: build
        chmod -R g-ws debian/disorder-server
        dpkg --build debian/disorder-server ..
 
        chmod -R g-ws debian/disorder-server
        dpkg --build debian/disorder-server ..
 

-
-.PHONY: cleanpkg-disorder-playrtp
-cleanpkg-disorder-playrtp:
-       rm -rf debian/disorder-playrtp
-
-.PHONY: pkg-disorder-playrtp

 pkg-disorder-playrtp: build
        rm -rf debian/disorder-playrtp
        $(MKDIR) debian/disorder-playrtp
 pkg-disorder-playrtp: build
        rm -rf debian/disorder-playrtp
        $(MKDIR) debian/disorder-playrtp


@@ -212,12 +194,6 @@ pkg-disorder-playrtp: build
        chmod -R g-ws debian/disorder-playrtp
        dpkg --build debian/disorder-playrtp ..
 
        chmod -R g-ws debian/disorder-playrtp
        dpkg --build debian/disorder-playrtp ..
 

-
-.PHONY: cleanpkg-disobedience
-cleanpkg-disobedience:
-       rm -rf debian/disobedience
-
-.PHONY: pkg-disobedience

 pkg-disobedience: build
        rm -rf debian/disobedience
        $(MKDIR) debian/disobedience
 pkg-disobedience: build
        rm -rf debian/disobedience
        $(MKDIR) debian/disobedience


@@ -255,7 +231,6 @@ pkg-disobedience: build
        chmod -R g-ws debian/disobedience
        dpkg --build debian/disobedience ..
 
        chmod -R g-ws debian/disobedience
        dpkg --build debian/disobedience ..
 

-

 DEBVERSION:=$(shell dpkg-parsechangelog|awk '/Version:/ {print $$2}')
 DSC=disorder_$(DEBVERSION).dsc
 DEBSRC=disorder_$(DEBVERSION).tar.gz
 DEBVERSION:=$(shell dpkg-parsechangelog|awk '/Version:/ {print $$2}')
 DSC=disorder_$(DEBVERSION).dsc
 DEBSRC=disorder_$(DEBVERSION).tar.gz


@@ -273,16 +248,20 @@ source-check: source
        dpkg-source -x $(DSC)
        cd disorder-$(DEBVERSION) && dpkg-buildpackage -r$(FAKEROOT)
 
        dpkg-source -x $(DSC)
        cd disorder-$(DEBVERSION) && dpkg-buildpackage -r$(FAKEROOT)
 

-.PHONY: source source-check
-
-.PHONY: binary binary-arch binary-indep

 binary: binary-arch binary-indep
 binary: binary-arch binary-indep

-binary-arch:  pkg-disorder pkg-disorder-server pkg-disorder-playrtp pkg-disobedience
+binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
+            pkg-disobedience

 binary-indep: 
 
 binary-indep: 
 

-.PHONY: clean
-clean:  cleanpkg-disorder cleanpkg-disorder-server cleanpkg-disorder-playrtp cleanpkg-disobedience
+clean:

        -$(MAKE) distclean
        rm -f config.cache
        rm -f debian/files
        rm -f debian/substvars.*
        -$(MAKE) distclean
        rm -f config.cache
        rm -f debian/files
        rm -f debian/substvars.*

+       rm -rf debian/disorder
+       rm -rf debian/disorder-server
+       rm -rf debian/disorder-playrtp
+       rm -rf debian/disobedience
+
+.PHONY: clean build pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
+       pkg-disobedience source source-check binary binary-arch binary-indep