[Pkg-voip-commits] r9000 - in /ptlib/trunk/debian: changelog control rules

[kilian at alioth.debian.org]

Author: kilian
Date: Tue Jun 21 13:00:46 2011
New Revision: 9000

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9000
Log:
Replace jquery.js with Debian's version to make lintian happy

Modified:
    ptlib/trunk/debian/changelog
    ptlib/trunk/debian/control
    ptlib/trunk/debian/rules

Modified: ptlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/changelog?rev=9000&op=diff
==============================================================================
--- ptlib/trunk/debian/changelog (original)
+++ ptlib/trunk/debian/changelog Tue Jun 21 13:00:46 2011
@@ -12,8 +12,9 @@
   * Remove unused ${shlibs:Depends} from libpt-dev, libpt-dbg and libpt-doc
   * Re-Add more complete clean target and debian/clean for dh_clean to wipe
     out leftover files
-
- -- Kilian Krause <kilian at debian.org>  Tue, 21 Jun 2011 14:20:12 +0200
+  * Replace jquery.js with Debian's version to make lintian happy
+
+ -- Kilian Krause <kilian at debian.org>  Tue, 21 Jun 2011 14:58:39 +0200
 
 ptlib (2.8.4-1) experimental; urgency=low
 

Modified: ptlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/control?rev=9000&op=diff
==============================================================================
--- ptlib/trunk/debian/control (original)
+++ ptlib/trunk/debian/control Tue Jun 21 13:00:46 2011
@@ -54,7 +54,7 @@
 Package: libpt-doc
 Section: doc
 Priority: extra
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Architecture: all
 Description: Portable Tools Library documentation & sample files
  This package contains the documentation and samples to program with

Modified: ptlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/rules?rev=9000&op=diff
==============================================================================
--- ptlib/trunk/debian/rules (original)
+++ ptlib/trunk/debian/rules Tue Jun 21 13:00:46 2011
@@ -9,11 +9,9 @@
 URL := http://transact.dl.sourceforge.net/sourceforge/opalvoip/ptlib-$(UPVERSION).tar.bz2
 
 %:
-	dh $@
+	dh $@ --with autotools_dev --parallel
 
-clean:
-	$(checkdir)
-	rm -f build-arch-stamp build-indep-stamp 
+override_dh_clean:
 	if [ -f Makefile ];then \
 		$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world clean||true ; \
 		$(MAKE) distclean || true ; \
@@ -29,6 +27,11 @@
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libpt-dbg
+
+override_dh_link:
+	# replace jquery.js with Debian's version
+	rm -f debian/libpt-doc/usr/share/doc/libpt-doc/html/jquery.js
+	dh_link
 
 override_dh_auto_test:
 	$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world clean