r1035 - in /unstable/libdvbpsi/debian: changelog control rules

[sho at users.alioth.debian.org]

Author: sho
Date: Sun Jan 20 15:30:57 2008
New Revision: 1035

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1035
Log:
  * debian/control:
    + Fix Conflicts: line.
    + Use ${binary:Version} instead of ${Source-Version}.
    + Set policy to 3.7.3.
  * debian/rules:
    + Don’t ignore make distclean errors.

Modified:
    unstable/libdvbpsi/debian/changelog
    unstable/libdvbpsi/debian/control
    unstable/libdvbpsi/debian/rules

Modified: unstable/libdvbpsi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libdvbpsi/debian/changelog?rev=1035&op=diff
==============================================================================
--- unstable/libdvbpsi/debian/changelog (original)
+++ unstable/libdvbpsi/debian/changelog Sun Jan 20 15:30:57 2008
@@ -1,12 +1,20 @@
 libdvbpsi5 (0.1.6-1) UNRELEASED; urgency=low
 
+  [ Christophe Mutricy ]
   * New upstream release
   * debian/control
     + Renamed source package to libdvbpsi5
     + Vcs fields are official now
     + Add Homepage field
 
- -- Christophe Mutricy <xtophe at videolan.org>  Sun, 9 Dec 2007 16:32:00 +0000
+  [ Sam Hocevar ]
+  * debian/control:
+    + Use ${binary:Version} instead of ${Source-Version}.
+    + Set policy to 3.7.3.
+  * debian/rules:
+    + Don’t ignore make distclean errors.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 20 Jan 2008 15:07:16 +0000
  
 libdvbpsi4 (0.1.5-3) unstable; urgency=low
 

Modified: unstable/libdvbpsi/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libdvbpsi/debian/control?rev=1035&op=diff
==============================================================================
--- unstable/libdvbpsi/debian/control (original)
+++ unstable/libdvbpsi/debian/control Sun Jan 20 15:30:57 2008
@@ -5,7 +5,7 @@
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Christophe Mutricy <xtophe at videolan.org>
 Build-Depends: debhelper (>= 5.0)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libdvbpsi
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libdvbpsi/
 Homepage: http://www.videolan.org/developers/libdvbpsi.html
@@ -23,8 +23,8 @@
 Package: libdvbpsi5-dev
 Section: libdevel
 Architecture: any
-Depends: libdvbpsi5 (= ${Source-Version})
-Conflicts: libdvbpsi0-dev, libdvbpsi1-dev, libdvbpsi2-dev, libdvbpsi3-dev, libdvbpsi5-dev
+Depends: libdvbpsi5 (>= ${binary:Version})
+Conflicts: libdvbpsi0-dev, libdvbpsi1-dev, libdvbpsi2-dev, libdvbpsi3-dev, libdvbpsi4-dev
 Description: development files for libdvbpsi5
  libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
  decoding and generating.

Modified: unstable/libdvbpsi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libdvbpsi/debian/rules?rev=1035&op=diff
==============================================================================
--- unstable/libdvbpsi/debian/rules (original)
+++ unstable/libdvbpsi/debian/rules Sun Jan 20 15:30:57 2008
@@ -27,7 +27,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 install: build