[Pkg-voip-commits] r5051 - in /pwlib/trunk/debian: changelog patches/04_names.dpatch rules

[kilian at alioth.debian.org]

Author: kilian
Date: Wed Dec  5 19:08:32 2007
New Revision: 5051

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5051
Log:
* Revert part of 04_names patch to not include OBJDIR_SUFFIX to plugins dir
  anymore.

Modified:
    pwlib/trunk/debian/changelog
    pwlib/trunk/debian/patches/04_names.dpatch
    pwlib/trunk/debian/rules

Modified: pwlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/changelog?rev=5051&op=diff
==============================================================================
--- pwlib/trunk/debian/changelog (original)
+++ pwlib/trunk/debian/changelog Wed Dec  5 19:08:32 2007
@@ -14,6 +14,8 @@
   * Remove entire -ptrace and -debug build and leave only opt build with
     PTRACE code as new binary library. Discussion with Robert Jongbloed proved
     that there's no point shipping any other configuration.
+  * Revert part of 04_names patch to not include OBJDIR_SUFFIX to plugins dir
+    anymore.
 
  -- Kilian Krause <kilian at debian.org>  Wed,  5 Dec 2007 19:06:14 +0100
 

Modified: pwlib/trunk/debian/patches/04_names.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/patches/04_names.dpatch?rev=5051&op=diff
==============================================================================
--- pwlib/trunk/debian/patches/04_names.dpatch (original)
+++ pwlib/trunk/debian/patches/04_names.dpatch Wed Dec  5 19:08:32 2007
@@ -36,18 +36,6 @@
  
  # distinguish betweek building and using pwlib
  ifeq (,$(wildcard $(PWLIBDIR)/src))
-diff -urNad pwlib-1.10.3~dfsg~/make/plugins.mak pwlib-1.10.3~dfsg/make/plugins.mak
---- pwlib-1.10.3~dfsg~/make/plugins.mak	2006-01-08 15:16:15.000000000 +0000
-+++ pwlib-1.10.3~dfsg/make/plugins.mak	2007-05-20 10:55:06.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- PLUGIN_FILENAME = $(PLUGIN_NAME)_pwplugin.$(LIB_SUFFIX)
- 
--OBJDIR = ../pwlib/$(PLUGIN_FAMILY)
-+OBJDIR = ../pwlib$(OBJDIR_SUFFIX)/$(PLUGIN_FAMILY)
- 
- TARGET = $(OBJDIR)/$(PLUGIN_FILENAME)
- 
 diff -urNad pwlib-1.10.3~dfsg~/make/unix.mak pwlib-1.10.3~dfsg/make/unix.mak
 --- pwlib-1.10.3~dfsg~/make/unix.mak	2007-05-20 10:52:38.000000000 +0000
 +++ pwlib-1.10.3~dfsg/make/unix.mak	2007-05-20 10:52:38.000000000 +0000

Modified: pwlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/rules?rev=5051&op=diff
==============================================================================
--- pwlib/trunk/debian/rules (original)
+++ pwlib/trunk/debian/rules Wed Dec  5 19:08:32 2007
@@ -105,7 +105,7 @@
 	else \
 		echo opt hello_world sample correctly compiled non-static; \
 	fi
-	LD_LIBRARY_PATH=$(CURDIR)/lib/opt samples/hello_world/obj_*_r/hello
+	LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj_*_r/hello
 	# if this won't work, we needn't even try going any further...
 	# cleanup to make sure we don't install any of the samples we just compiled
 	$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
@@ -162,7 +162,7 @@
 	dh_installdirs -a
 	
 	install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib
-	install -m 755 lib/opt/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
+	install -m 755 lib/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
 	cp debian/libpt.docs debian/$(PACKAGE).docs
 	
 #       $(PACKAGE)-dbg (will be filled by dh_strip)
@@ -176,7 +176,7 @@
 	sed -i -e 's#$$(PWLIBDIR)/include/ptlib/unix#/usr/include/ptlib/unix#g' \
 	    -e 's#$$(PWLIBDIR)/lib#/usr/lib#g' debian/libpt-dev/usr/share/pwlib/make/unix.mak
 	# copy static opt version to libpt-dev
-	install -m 755 lib/opt/libpt_s.a debian/libpt-dev/usr/lib/
+	install -m 755 lib/libpt_s.a debian/libpt-dev/usr/lib/
 	find debian/libpt-dev/usr/include -type f -exec chmod 644 {} \;
 	# ptlib-config in libpt-dev
 	# changing build/machine dependent data in ptlib-config