[Pkg-voip-commits] r2585 - opal/branches/sarge/debian opal/trunk/debian openh323/branches/sarge/debian openh323/trunk/debian pwlib/branches/sarge/debian pwlib/trunk/debian

Kilian Krause kilian at costa.debian.org
Sun Oct 22 09:25:31 UTC 2006


Author: kilian
Date: 2006-10-22 09:25:31 +0000 (Sun, 22 Oct 2006)
New Revision: 2585

Modified:
   opal/branches/sarge/debian/changelog
   opal/branches/sarge/debian/rules
   opal/trunk/debian/changelog
   opal/trunk/debian/rules
   openh323/branches/sarge/debian/changelog
   openh323/branches/sarge/debian/control
   openh323/branches/sarge/debian/rules
   openh323/branches/sarge/debian/watch
   openh323/trunk/debian/changelog
   openh323/trunk/debian/control
   openh323/trunk/debian/rules
   pwlib/branches/sarge/debian/changelog
   pwlib/branches/sarge/debian/control
   pwlib/branches/sarge/debian/rules
   pwlib/trunk/debian/changelog
   pwlib/trunk/debian/control
   pwlib/trunk/debian/rules
Log:
Correct the versioned dependency to the lib we're building right now to
overcome problems like #392522. Setting urgency=high, for we're closing an
RC-bug.



Modified: opal/branches/sarge/debian/changelog
===================================================================
--- opal/branches/sarge/debian/changelog	2006-10-20 18:05:08 UTC (rev 2584)
+++ opal/branches/sarge/debian/changelog	2006-10-22 09:25:31 UTC (rev 2585)
@@ -1,10 +1,18 @@
-opal (2.2.3.dfsg-1) UNRELEASED; urgency=low
+opal (2.2.3.dfsg-2) UNRELEASED; urgency=high
 
   * NOT RELEASED YET
+  * Correct the versioned dependency to the lib we're building right now to
+    overcome problems like #392522. Setting urgency=high, for we're closing an
+    RC-bug.
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 22 Oct 2006 11:04:26 +0200
+
+opal (2.2.3.dfsg-1) unstable; urgency=low
+
   * Rename configure target to config.status.
   * New upstream release.
 
- -- Kilian Krause <kilian at debian.org>  Sat,  7 Oct 2006 15:16:35 +0200
+ -- Kilian Krause <kilian at debian.org>  Mon,  9 Oct 2006 13:47:30 +0200
 
 opal (2.2.2.dfsg-1) unstable; urgency=low
 

Modified: opal/branches/sarge/debian/rules
===================================================================
--- opal/branches/sarge/debian/rules	2006-10-20 18:05:08 UTC (rev 2584)
+++ opal/branches/sarge/debian/rules	2006-10-22 09:25:31 UTC (rev 2585)
@@ -187,7 +187,7 @@
 	dh_link
 	dh_compress 
 	dh_fixperms
-	dh_makeshlibs -V "$(PACKAGE) (>= $(SHLIBSVER))"
+	dh_makeshlibs -V "$(PACKAGE) (>= $(DEBVERSION)"
 	dh_installdeb
 	
 	dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib

Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog	2006-10-20 18:05:08 UTC (rev 2584)
+++ opal/trunk/debian/changelog	2006-10-22 09:25:31 UTC (rev 2585)
@@ -1,8 +1,11 @@
-opal (2.2.3.dfsg-2) UNRELEASED; urgency=low
+opal (2.2.3.dfsg-2) UNRELEASED; urgency=high
 
   * NOT RELEASED YET
+  * Correct the versioned dependency to the lib we're building right now to
+    overcome problems like #392522. Setting urgency=high, for we're closing an
+    RC-bug.
 
- -- Kilian Krause <kilian at debian.org>  Mon,  9 Oct 2006 14:10:57 +0200
+ -- Kilian Krause <kilian at debian.org>  Sun, 22 Oct 2006 11:04:26 +0200
 
 opal (2.2.3.dfsg-1) unstable; urgency=low
 

Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules	2006-10-20 18:05:08 UTC (rev 2584)
+++ opal/trunk/debian/rules	2006-10-22 09:25:31 UTC (rev 2585)
@@ -187,7 +187,7 @@
 	dh_link
 	dh_compress 
 	dh_fixperms
-	dh_makeshlibs -V "$(PACKAGE) (>= $(SHLIBSVER))"
+	dh_makeshlibs -V "$(PACKAGE) (>= $(DEBVERSION)"
 	dh_installdeb
 	
 	dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib

Modified: openh323/branches/sarge/debian/changelog
===================================================================
--- openh323/branches/sarge/debian/changelog	2006-10-20 18:05:08 UTC (rev 2584)
+++ openh323/branches/sarge/debian/changelog	2006-10-22 09:25:31 UTC (rev 2585)
@@ -1,3 +1,20 @@
+openh323 (1.18.0-3) UNRELEASED; urgency=high
+
+  [ Kilian Krause ]
+  * NOT RELEASED YET
+  * Correct the versioned dependency to the lib we're building right now to
+    overcome problems like #392522. Setting urgency=high, for we're closing an
+    RC-bug.
+  * Add get-orig-source target.
+  * Minor cleanups to debian/rules like renaming Makefile target to
+    config.status and making the autotools target somewhat more violent to
+    keep somewhat a consistency among the libs.
+
+  [ Mark Purcell ]
+  * Update debian/watch for numerics
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 22 Oct 2006 11:17:20 +0200
+
 openh323 (1.18.0-2) unstable; urgency=low
 
   * debian/patches/ixjuser.h: Fix building on Ubuntu.

Modified: openh323/branches/sarge/debian/control
===================================================================
--- openh323/branches/sarge/debian/control	2006-10-20 18:05:08 UTC (rev 2584)
+++ openh323/branches/sarge/debian/control	2006-10-22 09:25:31 UTC (rev 2585)
@@ -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.9.3-1), libssl-dev, libgsm1-dev (>=1.0.10-11), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev
+Build-Depends: debhelper (>=4.0.2), libpt-dev (>=1.10.2-1), libssl-dev, libgsm1-dev (>=1.0.10-11), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev
 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
@@ -29,7 +29,7 @@
 Package: libopenh323-dev
 Section: libdevel
 Architecture: any
-Depends: libopenh323-1.18.0 (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.9.2-1)
+Depends: libopenh323-1.18.0 (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.10.2-1)
 Conflicts: liboh323-dev, libopenh323-dev
 Replaces: liboh323-dev
 Description: H.323 aka VoIP library development files

Modified: openh323/branches/sarge/debian/rules
===================================================================
--- openh323/branches/sarge/debian/rules	2006-10-20 18:05:08 UTC (rev 2584)
+++ openh323/branches/sarge/debian/rules	2006-10-22 09:25:31 UTC (rev 2585)
@@ -12,7 +12,7 @@
 VER_MINOR := $(shell awk '/MINOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
 VER_SUB   := $(shell awk '/BUILD_NUMBER/  { print $$3 }' version.h 2>/dev/null)
 
-SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
+SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 
 MAKE_BUILD_PARAM=OPENH323DIR=$(CURDIR)
 
@@ -27,45 +27,33 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
 
+FILENAME := openh323_$(UPVERSION)~dfsg.orig.tar.gz
+UPFILENAME := openh323_$(UPVERSION).orig.tar.gz
+URL := http://www.voxgratia.org/releases/openh323-v$(URLVERSION)-src-tar.gz
+
+
 build: build-arch build-indep
 
-build-arch: build-arch-stamp
+build-arch: config.status build-arch-stamp
 
-Makefile: patch-stamp autotools configure
+config.status: patch-stamp autotools configure
 	CFLAGS=-I$(CURDIR)/include ./configure $(confflags) --prefix=/usr --enable-plugins
 
 autotools:
-	-if [ -f config.sub.old ]; then \
-	  rm -f config.sub; \
-	elif [ -f config.sub ];then \
-	  mv config.sub config.sub.old; \
-	fi
-	-if [ -f config.guess.old ]; then \
-	  rm -f config.guess; \
-	elif [ -f config.guess ];then \
-	  mv config.guess config.guess.old; \
-	fi
-	ln -s /usr/share/misc/config.sub config.sub
-	ln -s /usr/share/misc/config.guess config.guess
-	
-	- (cd plugins ; \
-	if [ -f config.sub.old ]; then \
-	  rm -f config.sub; \
-	elif [ -f config.sub ];then \
-	  mv config.sub config.sub.old; \
-	fi; \
-	if [ -f config.guess.old ]; then \
-	  rm -f config.guess; \
-	elif [ -f config.guess ];then \
-	  mv config.guess config.guess.old; \
-	fi; \
-	ln -s /usr/share/misc/config.sub config.sub; \
-	ln -s /usr/share/misc/config.guess config.guess; \
-	cd ..)
+	rm -f config.sub config.guess
+	cp /usr/share/misc/config.sub config.sub
+	cp /usr/share/misc/config.guess config.guess
+	rm -f plugins/config.sub plugins/config.guess
+	cp /usr/share/misc/config.sub plugins/config.sub
+	cp /usr/share/misc/config.guess plugins/config.guess
 	touch autotools
 
-build-arch-stamp: Makefile
+build-arch-stamp: config.status
 	$(MAKE) opt optnoshared 
 	
 	# This dirty stuff is done to compile simple with apropiate options
@@ -104,21 +92,7 @@
 	-rm -f debian/*.debhelper
 	-rm -f debian/libopenh323-*.*.docs
 
-	-if [ -f config.sub.old ]; then \
-	   mv config.sub.old config.sub; \
-	fi
-	-if [ -f config.guess.old ]; then \
-	   mv config.guess.old config.guess; \
-	fi
-	
-	-(cd plugins; \
-	if [ -f config.sub.old ]; then \
-	   mv -f config.sub.old config.sub; \
-	fi; \
-	if [ -f config.guess.old ]; then \
-	   mv -f config.guess.old config.guess; \
-	fi; \
-	cd ..)
+	-rm -f config.sub config.guess plugins/config.sub plugins/config.guess
 	dh_clean
 
 install: install-indep install-arch
@@ -184,7 +158,7 @@
 	dh_link
 	dh_compress 
 	dh_fixperms
-	dh_makeshlibs -V "$(PACKAGE) (>= $(SHLIBSVER))"
+	dh_makeshlibs -V "$(PACKAGE) (>= $(DEBVERSION))"
 	dh_installdeb
 
 	dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
@@ -210,5 +184,16 @@
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-strip
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(UPFILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	@@echo Ready for packaging.;\
+
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean-patched

Modified: openh323/branches/sarge/debian/watch
===================================================================
--- openh323/branches/sarge/debian/watch	2006-10-20 18:05:08 UTC (rev 2584)
+++ openh323/branches/sarge/debian/watch	2006-10-22 09:25:31 UTC (rev 2585)
@@ -1,8 +1,8 @@
 # format version number, currently 2; this line is compulsory!
-version=2
+version=3
 
 # Line continuations are performed with \
 
 # This the format for an FTP site:
 # Full‐site‐with‐pattern  [Version  [Action]]
-http://www.voxgratia.org/releases/openh323-v(.*)\.tar\.gz	debian	uupdate
+http://www.voxgratia.org/releases/openh323-v(\d+)_(\d+)_(\d+)-src-tar\.gz	debian	uupdate

Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog	2006-10-20 18:05:08 UTC (rev 2584)
+++ openh323/trunk/debian/changelog	2006-10-22 09:25:31 UTC (rev 2585)
@@ -1,12 +1,19 @@
-openh323 (1.18.0-3) UNRELEASED; urgency=low
+openh323 (1.18.0-3) UNRELEASED; urgency=high
 
   [ Kilian Krause ]
   * NOT RELEASED YET
+  * Correct the versioned dependency to the lib we're building right now to
+    overcome problems like #392522. Setting urgency=high, for we're closing an
+    RC-bug.
+  * Add get-orig-source target.
+  * Minor cleanups to debian/rules like renaming Makefile target to
+    config.status and making the autotools target somewhat more violent to
+    keep somewhat a consistency among the libs.
 
   [ Mark Purcell ]
   * Update debian/watch for numerics
 
- -- Mark Purcell <msp at debian.org>  Sat,  6 May 2006 11:49:53 +0100
+ -- Kilian Krause <kilian at debian.org>  Sun, 22 Oct 2006 11:17:20 +0200
 
 openh323 (1.18.0-2) unstable; urgency=low
 

Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control	2006-10-20 18:05:08 UTC (rev 2584)
+++ openh323/trunk/debian/control	2006-10-22 09:25:31 UTC (rev 2585)
@@ -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.9.3-1), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev
+Build-Depends: debhelper (>=4.0.2), libpt-dev (>=1.10.2-1), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev
 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
@@ -29,7 +29,7 @@
 Package: libopenh323-dev
 Section: libdevel
 Architecture: any
-Depends: libopenh323-1.18.0 (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.10.0)
+Depends: libopenh323-1.18.0 (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.10.2)
 Conflicts: liboh323-dev, libopenh323-dev
 Replaces: liboh323-dev
 Description: H.323 aka VoIP library development files

Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules	2006-10-20 18:05:08 UTC (rev 2584)
+++ openh323/trunk/debian/rules	2006-10-22 09:25:31 UTC (rev 2585)
@@ -12,7 +12,7 @@
 VER_MINOR := $(shell awk '/MINOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
 VER_SUB   := $(shell awk '/BUILD_NUMBER/  { print $$3 }' version.h 2>/dev/null)
 
-SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
+SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 
 MAKE_BUILD_PARAM=OPENH323DIR=$(CURDIR)
 
@@ -27,45 +27,33 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
 
+FILENAME := openh323_$(UPVERSION)~dfsg.orig.tar.gz
+UPFILENAME := openh323_$(UPVERSION).orig.tar.gz
+URL := http://www.voxgratia.org/releases/openh323-v$(URLVERSION)-src-tar.gz
+
+
 build: build-arch build-indep
 
-build-arch: build-arch-stamp
+build-arch: config.status build-arch-stamp
 
-Makefile: patch-stamp autotools configure
+config.status: patch-stamp autotools configure
 	CFLAGS=-I$(CURDIR)/include ./configure $(confflags) --prefix=/usr --enable-plugins
 
 autotools:
-	-if [ -f config.sub.old ]; then \
-	  rm -f config.sub; \
-	elif [ -f config.sub ];then \
-	  mv config.sub config.sub.old; \
-	fi
-	-if [ -f config.guess.old ]; then \
-	  rm -f config.guess; \
-	elif [ -f config.guess ];then \
-	  mv config.guess config.guess.old; \
-	fi
-	ln -s /usr/share/misc/config.sub config.sub
-	ln -s /usr/share/misc/config.guess config.guess
-	
-	- (cd plugins ; \
-	if [ -f config.sub.old ]; then \
-	  rm -f config.sub; \
-	elif [ -f config.sub ];then \
-	  mv config.sub config.sub.old; \
-	fi; \
-	if [ -f config.guess.old ]; then \
-	  rm -f config.guess; \
-	elif [ -f config.guess ];then \
-	  mv config.guess config.guess.old; \
-	fi; \
-	ln -s /usr/share/misc/config.sub config.sub; \
-	ln -s /usr/share/misc/config.guess config.guess; \
-	cd ..)
+	rm -f config.sub config.guess
+	cp /usr/share/misc/config.sub config.sub
+	cp /usr/share/misc/config.guess config.guess
+	rm -f plugins/config.sub plugins/config.guess
+	cp /usr/share/misc/config.sub plugins/config.sub
+	cp /usr/share/misc/config.guess plugins/config.guess
 	touch autotools
 
-build-arch-stamp: Makefile
+build-arch-stamp: config.status
 	$(MAKE) opt optnoshared 
 	
 	# This dirty stuff is done to compile simple with apropiate options
@@ -104,21 +92,7 @@
 	-rm -f debian/*.debhelper
 	-rm -f debian/libopenh323-*.*.docs
 
-	-if [ -f config.sub.old ]; then \
-	   mv config.sub.old config.sub; \
-	fi
-	-if [ -f config.guess.old ]; then \
-	   mv config.guess.old config.guess; \
-	fi
-	
-	-(cd plugins; \
-	if [ -f config.sub.old ]; then \
-	   mv -f config.sub.old config.sub; \
-	fi; \
-	if [ -f config.guess.old ]; then \
-	   mv -f config.guess.old config.guess; \
-	fi; \
-	cd ..)
+	-rm -f config.sub config.guess plugins/config.sub plugins/config.guess
 	dh_clean
 
 install: install-indep install-arch
@@ -184,7 +158,7 @@
 	dh_link
 	dh_compress 
 	dh_fixperms
-	dh_makeshlibs -V "$(PACKAGE) (>= $(SHLIBSVER))"
+	dh_makeshlibs -V "$(PACKAGE) (>= $(DEBVERSION))"
 	dh_installdeb
 
 	dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
@@ -210,5 +184,16 @@
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-strip
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(UPFILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	@@echo Ready for packaging.;\
+
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean-patched

Modified: pwlib/branches/sarge/debian/changelog
===================================================================
--- pwlib/branches/sarge/debian/changelog	2006-10-20 18:05:08 UTC (rev 2584)
+++ pwlib/branches/sarge/debian/changelog	2006-10-22 09:25:31 UTC (rev 2585)
@@ -1,6 +1,14 @@
-pwlib (1.10.2-1) UNRELEASED; urgency=low
+pwlib (1.10.2-2) UNRELEASED; urgency=high
 
   * NOT RELEASED YET
+  * Correct the versioned dependency to the lib we're building right now to
+    overcome problems like #392522. Setting urgency=high, for we're closing an
+    RC-bug.
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 22 Oct 2006 11:05:39 +0200
+
+pwlib (1.10.2-1) unstable; urgency=low
+
   * New upstream release. No more dfsg-repack should be needed, RFC files
     deleted upstream.
 
@@ -13,7 +21,7 @@
     rebuild for the user or even automagically be added to more powerful
     platforms. (Closes: #345511)
 
- -- Kilian Krause <kilian at debian.org>  Sat,  7 Oct 2006 14:30:18 +0200
+ -- Kilian Krause <kilian at debian.org>  Mon,  9 Oct 2006 13:27:28 +0200
 
 pwlib (1.10.1.dfsg-1) unstable; urgency=low
 

Modified: pwlib/branches/sarge/debian/control
===================================================================
--- pwlib/branches/sarge/debian/control	2006-10-20 18:05:08 UTC (rev 2584)
+++ pwlib/branches/sarge/debian/control	2006-10-22 09:25:31 UTC (rev 2585)
@@ -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.2.32), bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libdc1394-11-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers, binutils (>= 2.14.90.0.7)
+Build-Depends: debhelper (>=4.2.32), libdc1394-11-dev, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers, binutils (>= 2.14.90.0.7)
 Build-Depends-Indep: doxygen
 Build-Conflicts: libpt-1.10.0, libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-dev
 Standards-Version: 3.6.2

Modified: pwlib/branches/sarge/debian/rules
===================================================================
--- pwlib/branches/sarge/debian/rules	2006-10-20 18:05:08 UTC (rev 2584)
+++ pwlib/branches/sarge/debian/rules	2006-10-22 09:25:31 UTC (rev 2585)
@@ -115,6 +115,7 @@
 	-rm -rf html
 	-rm -f debian/libpt-*.*.docs
 	-rm -f core a.out
+	dh_clean
 
 install: install-indep install-arch
 install-indep:
@@ -231,7 +232,7 @@
 		
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs -V "$(PACKAGE) (>= $(DEBVERSION)"
 	dh_installdeb
 	dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
 	dh_gencontrol

Modified: pwlib/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog	2006-10-20 18:05:08 UTC (rev 2584)
+++ pwlib/trunk/debian/changelog	2006-10-22 09:25:31 UTC (rev 2585)
@@ -1,8 +1,11 @@
-pwlib (1.10.2-2) UNRELEASED; urgency=low
+pwlib (1.10.2-2) UNRELEASED; urgency=high
 
   * NOT RELEASED YET
+  * Correct the versioned dependency to the lib we're building right now to
+    overcome problems like #392522. Setting urgency=high, for we're closing an
+    RC-bug.
 
- -- Kilian Krause <kilian at debian.org>  Mon,  9 Oct 2006 13:45:45 +0200
+ -- Kilian Krause <kilian at debian.org>  Sun, 22 Oct 2006 11:05:39 +0200
 
 pwlib (1.10.2-1) unstable; urgency=low
 

Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control	2006-10-20 18:05:08 UTC (rev 2584)
+++ pwlib/trunk/debian/control	2006-10-22 09:25:31 UTC (rev 2585)
@@ -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.9.0), bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libdc1394-13-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers, binutils (>= 2.14.90.0.7)
+Build-Depends: debhelper (>=4.9.0), libdc1394-13-dev, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers, binutils (>= 2.14.90.0.7)
 Build-Depends-Indep: doxygen
 Build-Conflicts: libpt-1.10.0, libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-dev
 Standards-Version: 3.6.2

Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2006-10-20 18:05:08 UTC (rev 2584)
+++ pwlib/trunk/debian/rules	2006-10-22 09:25:31 UTC (rev 2585)
@@ -115,6 +115,7 @@
 	-rm -rf html
 	-rm -f debian/libpt-*.*.docs
 	-rm -f core a.out
+	dh_clean
 
 install: install-indep install-arch
 install-indep:
@@ -231,7 +232,7 @@
 		
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs -V "$(PACKAGE) (>= $(DEBVERSION)"
 	dh_installdeb
 	dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
 	dh_gencontrol




More information about the Pkg-voip-commits mailing list