[Pkg-voip-commits] r3987 - openh323/trunk/debian

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-08-11 12:51:26 +0000 (Sat, 11 Aug 2007)
New Revision: 3987

Modified:
   openh323/trunk/debian/changelog
   openh323/trunk/debian/control
   openh323/trunk/debian/rules
Log:
* Fix Source-Version to binary:Version depends to allow clean binNMUs.
* Don't ignore make clean error.

Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog	2007-08-11 12:21:51 UTC (rev 3986)
+++ openh323/trunk/debian/changelog	2007-08-11 12:51:26 UTC (rev 3987)
@@ -4,6 +4,8 @@
   * Don't conflict with previous API/ABI version. Move plugins to their own
     namespace. (Closes: #424049)
   * Don't suggest libopenh323-dev (Closes: #369339)
+  * Fix Source-Version to binary:Version depends to allow clean binNMUs.
+  * Don't ignore make clean error.
 
  -- Kilian Krause <kilian at debian.org>  Sat, 11 Aug 2007 11:47:38 +0200
 

Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control	2007-08-11 12:21:51 UTC (rev 3986)
+++ openh323/trunk/debian/control	2007-08-11 12:51:26 UTC (rev 3987)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
-Build-Depends: debhelper (>=4.0.2), libpt-dev (>=1.10.7~dfsg~), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev, binutils (>= 2.17-1)
+Build-Depends: debhelper (>=4.0.2), libpt-dev (>=1.10.7~dfsg~), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev, binutils (>= 2.17-1), dpkg-dev (>= 1.13.19)
 Build-Depends-Indep: doxygen
 Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopenh323-1.15.3c2, libopenh323-1.15.6
 Standards-Version: 3.6.2
@@ -69,7 +69,7 @@
 Package: libopenh323-dev
 Section: libdevel
 Architecture: any
-Depends: libopenh323-1.18.0 (= ${Source-Version})|libopenh323-1.18.0-ptrace (= ${Source-Version})|libopenh323-1.18.0-develop (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.10.7~dfsg~)
+Depends: libopenh323-1.18.0 (= ${binary:Version})|libopenh323-1.18.0-ptrace (= ${binary:Version})|libopenh323-1.18.0-develop (= ${binary:Version}), libssl-dev, libpt-dev (>= 1.10.7~dfsg~)
 Conflicts: liboh323-dev, libopenh323-dev
 Replaces: liboh323-dev
 Description: H.323 aka VoIP library development files
@@ -109,7 +109,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libopenh323-1.18.0 (= ${Source-Version})
+Depends: libopenh323-1.18.0 (= ${binary:Version})
 Replaces: liboh323-dbg
 Description: H.323 aka VoIP library development debug files
  This package contains the shared and static debug version of the

Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules	2007-08-11 12:21:51 UTC (rev 3986)
+++ openh323/trunk/debian/rules	2007-08-11 12:51:26 UTC (rev 3987)
@@ -80,7 +80,7 @@
 	
 	# ensure we do a fresh check with hello world.
 	# ...first static
-	-$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+	[ ! -f samples/simple/Makefile ]||$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	$(RM) -rf samples/simple/obj_*
 	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace -C samples/simple optnoshared