[Pkg-voip-commits] r7290 - in /ptlib/branches/ptlib-2.0.1/debian: changelog control libpt2.0.1-dev.install libpt2.0.1-doc.docs patches/00list patches/20_fixup_so.dpatch rules

Thu May 28 22:59:09 UTC 2009

Author: msp
Date: Thu May 28 22:59:09 2009
New Revision: 7290

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7290
Log:
cleanup soname Add 20_fixup_so.dpatch

Added:
    ptlib/branches/ptlib-2.0.1/debian/patches/20_fixup_so.dpatch   (with props)
Modified:
    ptlib/branches/ptlib-2.0.1/debian/changelog
    ptlib/branches/ptlib-2.0.1/debian/control
    ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-dev.install
    ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-doc.docs
    ptlib/branches/ptlib-2.0.1/debian/patches/00list
    ptlib/branches/ptlib-2.0.1/debian/rules

Modified: ptlib/branches/ptlib-2.0.1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.0.1/debian/changelog?rev=7290&op=diff
==============================================================================

--- ptlib/branches/ptlib-2.0.1/debian/changelog (original)
+++ ptlib/branches/ptlib-2.0.1/debian/changelog Thu May 28 22:59:09 2009
@@ -4,8 +4,9 @@
     - Version necessary for h323plus packages (openh3232 continued)
   * Switch to cdbs
   * new 11_versioned_plugindirs.dpatch
-
- -- Mark Purcell <msp at debian.org>  Fri, 24 Apr 2009 12:46:46 +1000
+  * cleanup soname Add 20_fixup_so.dpatch
+
+ -- Mark Purcell <msp at debian.org>  Fri, 29 May 2009 08:58:54 +1000
 
 pwlib-titan (1.11.2-3) UNRELEASED; urgency=low
 

Modified: ptlib/branches/ptlib-2.0.1/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.0.1/debian/control?rev=7290&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.0.1/debian/control (original)
+++ ptlib/branches/ptlib-2.0.1/debian/control Thu May 28 22:59:09 2009
@@ -12,6 +12,7 @@
   libpt-1.10.10, libpt-1.10.10-ptrace, libpt-1.10.10-develop, 
   libpt-1.10.0, libpt-1.10.0-ptrace, libpt-1.10.0-develop, 
   libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a,
+  libpt2.4.2-dev,
   libpt-dev
 Standards-Version: 3.8.1
 Homepage: http://www.voxgratia.org/
@@ -33,7 +34,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libpt2.0.1 (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
-Conflicts: libpt-dev
+Conflicts: libpt-dev, libpt2.4.2-dev
 Description: Portable Tools Library development files
  This package contains the headers and a static version of the library
  PTLib, which is a moderately large class library that has its genesis

Modified: ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-dev.install?rev=7290&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-dev.install (original)
+++ ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-dev.install Thu May 28 22:59:09 2009
@@ -3,3 +3,5 @@
 usr/lib/lib*.so
 #usr/lib/*.la
 usr/share/ptlib/*
+version.h usr/include/ptlib
+usr/bin/*

Modified: ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-doc.docs
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-doc.docs?rev=7290&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-doc.docs (original)
+++ ptlib/branches/ptlib-2.0.1/debian/libpt2.0.1-doc.docs Thu May 28 22:59:09 2009
@@ -1,2 +1,2 @@
 samples
-html
+#html

Modified: ptlib/branches/ptlib-2.0.1/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.0.1/debian/patches/00list?rev=7290&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.0.1/debian/patches/00list (original)
+++ ptlib/branches/ptlib-2.0.1/debian/patches/00list Thu May 28 22:59:09 2009
@@ -2,3 +2,4 @@
 04_names
 05_hppa
 11_versioned_plugindirs.dpatch
+20_fixup_so

Added: ptlib/branches/ptlib-2.0.1/debian/patches/20_fixup_so.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.0.1/debian/patches/20_fixup_so.dpatch?rev=7290&op=file
==============================================================================
--- ptlib/branches/ptlib-2.0.1/debian/patches/20_fixup_so.dpatch (added)
+++ ptlib/branches/ptlib-2.0.1/debian/patches/20_fixup_so.dpatch Thu May 28 22:59:09 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fixup_so.dpatch by  <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad ptlib-2.0.1~/Makefile.in ptlib-2.0.1/Makefile.in
+--- ptlib-2.0.1~/Makefile.in	2009-04-25 10:44:05.000000000 +1000
++++ ptlib-2.0.1/Makefile.in	2009-04-25 10:44:27.000000000 +1000
+@@ -272,7 +272,7 @@
+ 	)
+ 	(cd $(DESTDIR)$(LIBDIR); \
+ 		rm -f  libpt. at SHAREDLIBEXT@ ; \
+-		ln -sf $(PTLIB_FILE) libpt. at SHAREDLIBEXT@ \
++		ln -sf $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ libpt. at SHAREDLIBEXT@ \
+ 	)
+ ifeq (1, $(HAS_PLUGINS))
+ 	cd plugins/ptlib/device/ ; \

Propchange: ptlib/branches/ptlib-2.0.1/debian/patches/20_fixup_so.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: ptlib/branches/ptlib-2.0.1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-2.0.1/debian/rules?rev=7290&op=diff
==============================================================================
--- ptlib/branches/ptlib-2.0.1/debian/rules (original)
+++ ptlib/branches/ptlib-2.0.1/debian/rules Thu May 28 22:59:09 2009
@@ -8,9 +8,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-oss --enable-v4l --disable-avc --disable-dc
 DEB_MAKE_CLEAN_TARGET := clean
+#DEB_MAKE_BUILD_TARGET := all docs
 
 clean::
 	rm -fR lib/ config.status config.log a.out Makefile plugins/config.log plugins/config.status
-
-build/libpt2.0.1-docs::
-	$(MAKE) docs


