* debian/rules:

    + Replaced $(DEB_BUILD_ARCH) with `dpkg-architecture -qDEB_BUILD_GNU_CPU`
      so that the rules can be called directly.
  * debian/control:
    + Removed leading "a"s from package descriptions.
    + Set policy to 3.5.10.
  * debian/copyright:
    + Removed debian/vlc.copyright.

diff --git a/debian/Makefile.am b/debian/Makefile.am
index a2be9c8c2a016240c93999cda03ce6ec971dadb7..f7aaba1d5320abe1ff7cfacb9f49337d100e86a9 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -4,8 +4,8 @@ EXTRA_DIST = \
        README.Debian \
        changelog \
        control \
+       copyright \
        rules \
-       vlc.copyright \
        vlc.dirs \
        vlc.docs \
        vlc.menu \

diff --git a/debian/changelog b/debian/changelog
index 7e20e1ddf5c905202b4a713d0923b293879ac943..53ad06a29932feb48382a0b581845013dc909557 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+vlc (0.5.3-4) unstable; urgency=low
+
+  * debian/rules:
+    + Replaced $(DEB_BUILD_ARCH) with `dpkg-architecture -qDEB_BUILD_GNU_CPU`
+      so that the rules can be called directly.
+  * debian/control:
+    + Removed leading "a"s from package descriptions.
+    + Set policy to 3.5.10.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat,  7 Jun 2003 17:46:36 +0200
+
 vlc (0.5.3-3) unstable; urgency=low
 
   * Built-in modules were linked twice in the mozilla plugin; removed the

diff --git a/debian/control b/debian/control
index 371100c3c723d8eb6a15f2dfc540eec4664d09d8..ea209039a8bc1d8427a35c2e794284db74765def 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
 Build-Depends: debhelper (>=3.0), gettext, fortune-mod, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev (>=1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>=1.1.0)
 Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
-Standards-Version: 3.5.9.0
+Standards-Version: 3.5.10
 
 Package: vlc
 Section: graphics
@@ -15,7 +15,7 @@ Suggests: gnome-vlc
 Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0)
 Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0)
 Provides: mp3-decoder
-Description: a complete multimedia player
+Description: complete multimedia player
  This is the VideoLAN project's VLC media player. It plays MPEG, MPEG2,
  MPEG4, DivX, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia streams
  from various network sources.
@@ -174,7 +174,7 @@ Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Recommends: mozilla-browser
-Description: a multimedia plugin for Mozilla based on VLC
+Description: multimedia plugin for Mozilla based on VLC
  This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
  more formats to your Mozilla browser. The decoding process is done by VLC
  and the output window is embedded in a webpage or directly in the browser

diff --git a/debian/vlc.copyright b/debian/copyright
similarity index 94%
rename from debian/vlc.copyright
rename to debian/copyright
index 30917befcd2c7fd4a4655ce23c31d08809b36f2d..c9fcbf26e61b6dd6b7ddabd1bc08d09ab97492a0 100644 (file)
--- a/debian/vlc.copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This package was debianized by Samuel Hocevar <sam@zoy.org> on
+This package was debianized by Sam Hocevar <sam@zoy.org> on
 Mon, 13 Mar 2000 02:21:45 +0100.
 
 It was taken from the CVS tree. See http://www.videolan.org/cvs.html

diff --git a/debian/rules b/debian/rules
index ddcf4d102fc46270b5ebd224ad5fb3eaf51a85b7..766b3ac3cf18be284cf7799b855c362d5a07eb3a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad
 CONFIG_FLAGS += --enable-libmpeg2 --with-libmpeg2-tree=extras/mpeg2dec
 
 # Glide is only for x86
-ifeq ($(DEB_BUILD_ARCH),i386)
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
 CONFIG_FLAGS += --enable-glide
 CONFIG_FLAGS += --enable-svgalib
 else
@@ -127,7 +127,7 @@ build-stamp:
        # Build only VLC, with the non-PIC libs
        $(MAKE) vlc
 
-ifneq ($(DEB_BUILD_ARCH),i386)
+ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
        # Hackety hackety hack
        if test ! -d CVS; then \
                cd extras/ffmpeg/libavcodec \
@@ -276,7 +276,7 @@ install: build
        ln -s vlc debian/vlc-ggi/usr/share/doc/vlc-ggi
 
        # Package: vlc-plugin-glide
-ifeq ($(DEB_BUILD_ARCH),i386)
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
        ln -s vlc debian/vlc-plugin-glide/usr/share/doc/vlc-plugin-glide
        mv debian/vlc/usr/lib/vlc/video_output/libglide_plugin.so \
                debian/vlc-plugin-glide/usr/lib/vlc/video_output/
@@ -320,7 +320,7 @@ endif
        mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
 
        # Package: vlc-plugin-svgalib
-ifeq ($(DEB_BUILD_ARCH),i386)
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
        ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
        mv debian/vlc/usr/lib/vlc/video_output/libsvgalib_plugin.so \
                debian/vlc-plugin-svgalib/usr/lib/vlc/video_output