[Pkg-voip-commits] r6417 - in /dahdi-tools/trunk/debian: libtonezone-dev.install libtonezone-dev.links libtonezone2.0.links rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Wed Nov 12 15:12:07 2008
New Revision: 6417

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6417
Log:
* Headers are under /usr/include/dahdi (not zaptel).
* Upstream's 'make install' doesn't need fixing anymore.

Removed:
    dahdi-tools/trunk/debian/libtonezone-dev.links
    dahdi-tools/trunk/debian/libtonezone2.0.links
Modified:
    dahdi-tools/trunk/debian/libtonezone-dev.install
    dahdi-tools/trunk/debian/rules

Modified: dahdi-tools/trunk/debian/libtonezone-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/libtonezone-dev.install?rev=6417&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/libtonezone-dev.install (original)
+++ dahdi-tools/trunk/debian/libtonezone-dev.install Wed Nov 12 15:12:07 2008
@@ -1,3 +1,3 @@
-usr/include/zaptel/tonezone.h
+usr/include/dahdi/tonezone.h
 usr/lib/lib*.a
 usr/lib/lib*.so

Modified: dahdi-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/rules?rev=6417&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/rules (original)
+++ dahdi-tools/trunk/debian/rules Wed Nov 12 15:12:07 2008
@@ -65,15 +65,9 @@
 	
 	# Add here commands to install the package into debian/tmp
 	
-	$(MAKE) install-programs DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	# Until upstream kill this stupid thing:
 	rm -f $(CURDIR)/debian/tmp/usr/sbin/dahdi_speed
-	$(MAKE) install-libs DESTDIR=$(CURDIR)/debian/tmp
-	/sbin/ldconfig -n $(CURDIR)/debian/tmp/usr/lib
-	install -D -m 644 tonezone.h $(CURDIR)/debian/tmp/usr/include/zaptel/tonezone.h
-	# TODO: The following is already fixed in SVN before 2.0.0
-	rm -f $(CURDIR)/debian/tmp/usr/sbin/genzaptelconf
-	rm -f $(CURDIR)/debian/tmp/usr/share/man/man8/genzaptelconf.8
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp