[Pkg-voip-commits] r6075 - in /dahdi-linux/trunk/debian: TODO.Debian changelog control dahdi-linux.install dahdi-source.dirs dahdi-source.install rules
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Mon Aug 25 14:14:34 UTC 2008
Author: tzafrir-guest
Date: Mon Aug 25 14:14:33 2008
New Revision: 6075
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6075
Log:
Make dahdi-linux arch-independent.
Added:
dahdi-linux/trunk/debian/dahdi-source.install
Modified:
dahdi-linux/trunk/debian/TODO.Debian
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/control
dahdi-linux/trunk/debian/dahdi-linux.install
dahdi-linux/trunk/debian/dahdi-source.dirs
dahdi-linux/trunk/debian/rules
Modified: dahdi-linux/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/TODO.Debian?rev=6075&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/TODO.Debian (original)
+++ dahdi-linux/trunk/debian/TODO.Debian Mon Aug 25 14:14:33 2008
@@ -1,3 +1,3 @@
-* Sort out names . Probably use dahdi-{source,modules} rather than dahdi-linux*
-* Make dahdi-linux arch-indep . No arch-dependent here (only the modules).
+* Sort out descriptions in debian/control .
+* Add some lintian ignore lines.
* Fix other modules.
Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=6075&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Mon Aug 25 14:14:33 2008
@@ -1,4 +1,4 @@
-dahdi-linux (2.0.0~dfsg~rc2) UNRELEASED; urgency=low
+dahdi-linux (2.0.0~dfsg~rc2-1) UNRELEASED; urgency=low
* Initial Release (Closes: #XXXXXX)
Modified: dahdi-linux/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/control?rev=6075&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/control (original)
+++ dahdi-linux/trunk/debian/control Mon Aug 25 14:14:33 2008
@@ -11,7 +11,7 @@
Package: dahdi-linux
Section: comm
-Architecture: any
+Architecture: all
# Xorcom packages depend on dahdi-firmware. Debian zaptel will probably
# just recommend it.
Depends: ${shlibs:Depends}, procps, fxload
Modified: dahdi-linux/trunk/debian/dahdi-linux.install
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/dahdi-linux.install?rev=6075&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/dahdi-linux.install (original)
+++ dahdi-linux/trunk/debian/dahdi-linux.install Mon Aug 25 14:14:33 2008
@@ -1,1 +1,3 @@
-usr/share/dahdi/*
+drivers/dahdi/xpp/xpp.conf etc/dahdi
+drivers/dahdi/xpp/init_card_* usr/share/dahdi/
+drivers/dahdi/xpp/XppConfig.pm usr/share/dahdi/
Modified: dahdi-linux/trunk/debian/dahdi-source.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/dahdi-source.dirs?rev=6075&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/dahdi-source.dirs (original)
+++ dahdi-linux/trunk/debian/dahdi-source.dirs Mon Aug 25 14:14:33 2008
@@ -1,2 +1,2 @@
usr/src
-usr/include/linux
+usr/include/dahdi
Added: dahdi-linux/trunk/debian/dahdi-source.install
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/dahdi-source.install?rev=6075&op=file
==============================================================================
--- dahdi-linux/trunk/debian/dahdi-source.install (added)
+++ dahdi-linux/trunk/debian/dahdi-source.install Mon Aug 25 14:14:33 2008
@@ -1,0 +1,1 @@
+include/dahdi/* usr/include/dahdi/
Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=6075&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Mon Aug 25 14:14:33 2008
@@ -125,37 +125,21 @@
#rm -f debian/manpage.links debian/manpage.refs debian/*.8
dh_clean
-install: install-arch install-indep
-
-install-arch: build-stamp
+TARPARDIR=$(CURDIR)/debian/tmp
+TARDIR=$(TARPARDIR)/modules/$(PREFIX)
+install: build-stamp
dh_testdir
dh_testroot
- dh_clean -k -a
- dh_installdirs -a
+ dh_clean -k
+ dh_installdirs
- # Add here commands to install the package into debian/tmp
-
- dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
- #cp debian/$(PREFIX).lintian \
- # $(CURDIR)/debian/$(PREFIX)/usr/share/lintian/overrides/$(PREFIX)
-
-TARPARDIR=$(CURDIR)/debian/tmp
-TARDIR=$(TARPARDIR)/modules/$(PREFIX)
-install-indep: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
-
+ dh_install
# driver source code
mkdir -p $(TARDIR)/debian/generated
cp Makefile $(TARDIR)/
for dir in build_tools firmware include drivers; do \
if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
done
- #cp -a $(GENERATED_SOURCES) $(TARDIR)/debian/generated/
- dh_install -i include/dahdi/* usr/include/dahdi/
# Packaging infrastructure
cp -r debian/rules debian/changelog debian/copyright\
@@ -175,46 +159,21 @@
endif
# Build architecture-independent files here.
-binary-indep: build install-indep
+binary: install
dh_testdir
dh_testroot
- dh_installdocs -i
+ dh_installdocs
dh_installchangelogs -i ChangeLog
#dh_installexamples -i $(BRISTUFF_EXAMPLES)
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install-arch
- dh_testdir
- dh_testroot
-
- dh_installdocs -a
-
- # should be removed, eventually. Still left for compatibility
- dh_installinit --update-rcd-params="defaults 15 30"
- #dh_installexamples -a system.conf.sample \
- # kernel/oslec/oslec-ctrl-panel.sh
-
-
- #dh_installmodules -a
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a -V
- dh_installdeb -a
- dh_shlibdeps -a -ldebian/libtonezone1/usr/lib
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ dh_perl
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
print-version:
@@echo "Debian version: $(DEBVERSION)"
@@ -237,5 +196,4 @@
@@$(RM) -rf $(TARBALL_DIR)/
@@$(RM) -f ../tarballs/$(UPFILENAME)
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+.PHONY: build clean binary install configure patch unpatch
More information about the Pkg-voip-commits
mailing list