[Pkg-voip-commits] r7062 - in /opal/trunk/debian: changelog compat control libopal-dev.install patches/notrace.dpatch rules

[msp at alioth.debian.org]

Author: msp
Date: Mon Apr 27 02:37:44 2009
New Revision: 7062

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7062
Log:
* debian/compat -> 7
* Add libopal-dev.install & use dh_install

Added:
    opal/trunk/debian/libopal-dev.install
Removed:
    opal/trunk/debian/patches/notrace.dpatch
Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/compat
    opal/trunk/debian/control
    opal/trunk/debian/rules

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=7062&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Mon Apr 27 02:37:44 2009
@@ -9,7 +9,11 @@
   * debian/rules: Honour DEB_BUILD_OPTIONS parameter for parallel builds.
   * Build-Depends on libcelt-dev.
 
- -- Mark Purcell <msp at debian.org>  Fri, 03 Apr 2009 00:17:44 +1100
+  [ Mark Purcell ]
+  * debian/compat -> 7
+  * Add libopal-dev.install & use dh_install
+
+ -- Mark Purcell <msp at debian.org>  Mon, 27 Apr 2009 12:37:07 +1000
 
 opal (3.4.2~dfsg-2) experimental; urgency=low
 

Modified: opal/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/compat?rev=7062&op=diff
==============================================================================
--- opal/trunk/debian/compat (original)
+++ opal/trunk/debian/compat Mon Apr 27 02:37:44 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=7062&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Mon Apr 27 02:37:44 2009
@@ -27,7 +27,7 @@
  This package contains the shared version of the OPAL library, together
  with several free audio codecs and theora and H261 video codecs.
 
-Package: libopal3.6.1-dev
+Package: libopal-dev
 Section: libdevel
 Architecture: any
 Conflicts: openmpi-dev, libopal-snapshot-dev, libopal3.3-beta1-dev

Added: opal/trunk/debian/libopal-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/libopal-dev.install?rev=7062&op=file
==============================================================================
--- opal/trunk/debian/libopal-dev.install (added)
+++ opal/trunk/debian/libopal-dev.install Mon Apr 27 02:37:44 2009
@@ -1,0 +1,5 @@
+usr/include
+usr/lib/pkgconfig
+usr/lib/libopal_s.a
+usr/lib/libopal.so*
+version.h usr/include/opal/

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=7062&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Mon Apr 27 02:37:44 2009
@@ -86,7 +86,6 @@
 	rm lib
 
 	cp debian/libopal-doc.docs debian/$(PACKAGE)-doc.docs
-	cp debian/libopal-dev.dirs debian/$(PACKAGE)-dev.dirs
 	touch build-arch-stamp
 
 build-indep: build-indep-stamp
@@ -113,7 +112,7 @@
 	rm -rf debian/simpleopal/
 	rm -f debian/*substvars
 	rm -f debian/*.debhelper
-	rm -f debian/$(PACKAGE)-doc.docs debian/$(PACKAGE)-dev.dirs
+	rm -f debian/$(PACKAGE)-doc.docs
 	rm -f config.status
 	dh_clean
 
@@ -130,40 +129,19 @@
 	dh_clean -k -a
 	dh_installdirs -a
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/install install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 	#remove non-free video codecs (if any)
-	-rm debian/install/usr/lib/opal-*/codecs/video/h264*
-	-rm debian/install/usr/lib/opal-*/codecs/video/h263-1998*
-	-rm debian/install/usr/lib/opal-*/codecs/video/mpeg4*
-
-	mv debian/install/usr/include debian/$(PACKAGE)-dev/usr
-	mv debian/install/usr/lib/pkgconfig debian/$(PACKAGE)-dev/usr/lib
-	mv debian/install/usr/lib/libopal_s.a debian/$(PACKAGE)-dev/usr/lib
+	-rm debian/tmp/usr/lib/opal-*/codecs/video/h264*
+	-rm debian/tmp/usr/lib/opal-*/codecs/video/h263-1998*
+	-rm debian/tmp/usr/lib/opal-*/codecs/video/mpeg4*
+
 	mkdir debian/$(PACKAGE)/usr/lib
-	mv debian/install/usr/lib/libopal.so.*.*[.-]* debian/$(PACKAGE)/usr/lib
-	mv debian/install/usr/lib/libopal.so* debian/$(PACKAGE)-dev/usr/lib
-	mv debian/install/usr/lib/opal* debian/$(PACKAGE)/usr/lib
-
-	# to check that it is empty, i.e. all the files have been moved
-	rmdir debian/install/usr/lib
-	rmdir debian/install/usr
-	rmdir debian/install
+	mv debian/tmp/usr/lib/libopal.so.*.*[.-]* debian/$(PACKAGE)/usr/lib
+	mv debian/tmp/usr/lib/opal* debian/$(PACKAGE)/usr/lib
 
 	# simpleopal
 	cp -a samples/simple/obj*/simpleopal debian/simpleopal/usr/bin
-
-	#not sure 100%, but not needed anymore, as now pkg-config is used
-	#sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
-	#    opal_inc.mak > debian/$(PACKAGE)-dev/usr/share/opal/opal_inc.mak
-	#find debian/$(PACKAGE)-dev/usr/include -type f -exec chmod 644 {} \;
-
-	cp version.h debian/$(PACKAGE)-dev/usr/include/opal/
-
-	# linking stuff under usr/share/opal
-	#ln -s ../../include/opal/version.h debian/$(PACKAGE)-dev/usr/share/opal/
-	#ln -s ../../include/opal debian/$(PACKAGE)-dev/usr/share/opal/include
-	#ln -s ../../lib debian/$(PACKAGE)-dev/usr/share/opal/
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi
@@ -172,11 +150,11 @@
 	dh_testdir
 	dh_testroot
 	#only $(PACKAGE) has a directory, the others have just links
-	dh_installdocs -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
+	dh_installdocs -N$(PACKAGE)-dbg
 	dh_installman
 	dh_installexamples -p$(PACKAGE)
-	dh_installchangelogs -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
-	-test "x$(DH_OPTIONS)" = "x-a" && for pkg in dev dbg; do mkdir -p debian/$(PACKAGE)-$$pkg/usr/share/doc; ln -s $(PACKAGE) debian/$(PACKAGE)-$$pkg/usr/share/doc/$(PACKAGE)-$$pkg; done
+	dh_installchangelogs -N$(PACKAGE)-dbg
+	dh_install
 
 	dh_link
 	dh_compress