[Pkg-voip-commits] r2841 - in
asterisk/branches/experimental/debian: . patches
Tzafrir Cohen
tzafrir-guest at alioth.debian.org
Mon Dec 25 03:25:59 CET 2006
Author: tzafrir-guest
Date: 2006-12-25 03:25:59 +0100 (Mon, 25 Dec 2006)
New Revision: 2841
Removed:
asterisk/branches/experimental/debian/asterisk-sounds-main.docs
asterisk/branches/experimental/debian/asterisk-sounds.install
asterisk/branches/experimental/debian/patches/makefile_noiaxy.dpatch
Modified:
asterisk/branches/experimental/debian/asterisk-doc.docs
asterisk/branches/experimental/debian/asterisk-doc.examples
asterisk/branches/experimental/debian/changelog
asterisk/branches/experimental/debian/examples
asterisk/branches/experimental/debian/patches/00list
asterisk/branches/experimental/debian/rules
Log:
* New upstream release.
* A package that builds.
* Removed asterisk-sounds.install: does not belong here.
* Removed makefile_noiaxy.dpatch: applied by upstream.
* Config examples in a separate examples subdirectory.
* Generate explicitly some missing subdirectories.
* Man pages are included in upstream now.
* set ASTDATADIR=/usr/share/asterisk .
* A bunch of other fils moved for 1.4 .
Modified: asterisk/branches/experimental/debian/asterisk-doc.docs
===================================================================
--- asterisk/branches/experimental/debian/asterisk-doc.docs 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/asterisk-doc.docs 2006-12-25 02:25:59 UTC (rev 2841)
@@ -1,9 +1,6 @@
BUGS
-asterisk.sgml
README
CREDITS
-HARDWARE
-SECURITY
doc/*
contrib
images/*.gif
Modified: asterisk/branches/experimental/debian/asterisk-doc.examples
===================================================================
--- asterisk/branches/experimental/debian/asterisk-doc.examples 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/asterisk-doc.examples 2006-12-25 02:25:59 UTC (rev 2841)
@@ -1,4 +1,3 @@
sample.call
-configs/*
-muted.conf.sample
+configs
agi/agi-test.agi
Deleted: asterisk/branches/experimental/debian/asterisk-sounds-main.docs
===================================================================
--- asterisk/branches/experimental/debian/asterisk-sounds-main.docs 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/asterisk-sounds-main.docs 2006-12-25 02:25:59 UTC (rev 2841)
@@ -1 +0,0 @@
-sounds.txt
Deleted: asterisk/branches/experimental/debian/asterisk-sounds.install
===================================================================
--- asterisk/branches/experimental/debian/asterisk-sounds.install 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/asterisk-sounds.install 2006-12-25 02:25:59 UTC (rev 2841)
@@ -1,3 +0,0 @@
-usr/share/asterisk/sounds
-usr/share/asterisk/mohmp3
-var/spool/asterisk
Modified: asterisk/branches/experimental/debian/changelog
===================================================================
--- asterisk/branches/experimental/debian/changelog 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/changelog 2006-12-25 02:25:59 UTC (rev 2841)
@@ -1,8 +1,16 @@
asterisk (1:1.4.0~dfsg-1) UNRELEASED; urgency=low
* New upstream release.
+ * A package that builds.
+ * Removed asterisk-sounds.install: does not belong here.
+ * Removed makefile_noiaxy.dpatch: applied by upstream.
+ * Config examples in a separate examples subdirectory.
+ * Generate explicitly some missing subdirectories.
+ * Man pages are included in upstream now.
+ * set ASTDATADIR=/usr/share/asterisk .
+ * A bunch of other fils moved for 1.4 .
- -- Tzafrir Cohen <tzafrir at boomtime.cohens.org.il> Fri, 15 Dec 2006 05:17:30 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Mon, 25 Dec 2006 04:17:41 +0200
asterisk (1:1.3.99~beta2.dfsg-1) UNRELEASED; urgency=low
Modified: asterisk/branches/experimental/debian/examples
===================================================================
--- asterisk/branches/experimental/debian/examples 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/examples 2006-12-25 02:25:59 UTC (rev 2841)
@@ -1,4 +1,3 @@
sample.call
-configs/*
-muted.conf.sample
+configs
agi/agi-test.agi
Modified: asterisk/branches/experimental/debian/patches/00list
===================================================================
--- asterisk/branches/experimental/debian/patches/00list 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/patches/00list 2006-12-25 02:25:59 UTC (rev 2841)
@@ -7,4 +7,3 @@
#vm_he
pubkey_jnctn
#nomarch
-makefile_noiaxy
Deleted: asterisk/branches/experimental/debian/patches/makefile_noiaxy.dpatch
===================================================================
--- asterisk/branches/experimental/debian/patches/makefile_noiaxy.dpatch 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/patches/makefile_noiaxy.dpatch 2006-12-25 02:25:59 UTC (rev 2841)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile_noiaxy.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't try to install iaxy.bin, as it is not there.
-
- at DPATCH@
-diff -urNad asterisk-1.3.99~beta2.dfsg~/Makefile asterisk-1.3.99~beta2.dfsg/Makefile
---- asterisk-1.3.99~beta2.dfsg~/Makefile 2006-09-20 00:48:57.000000000 +0300
-+++ asterisk-1.3.99~beta2.dfsg/Makefile 2006-10-08 02:07:08.000000000 +0200
-@@ -401,7 +401,6 @@
- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
-
- $(SUBDIRS_INSTALL):
- @$(MAKE) -C $(@:-install=) install
Modified: asterisk/branches/experimental/debian/rules
===================================================================
--- asterisk/branches/experimental/debian/rules 2006-12-24 20:41:09 UTC (rev 2840)
+++ asterisk/branches/experimental/debian/rules 2006-12-25 02:25:59 UTC (rev 2841)
@@ -22,7 +22,7 @@
MAKEFLAGS = OPTIMIZE=-O2 MAKECMDGOALS=dont-optimize
# Force music files selection:
-MAKEFLAGS += MENUSELECT_MOH= MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM
+MAKEFLAGS += MENUSELECT_MOH= ASTDARADIR=/usr/share/asterisk
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -141,7 +141,6 @@
dh_installdirs var/run/asterisk
# Add here commands to install the package into debian/<packagename>
- mkdir -p $(CURDIR)/tmp/debian/usr/share/asterisk/sounds
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install samples
mkdir -p $(CURDIR)/debian/tmp/etc/default/
cp debian/asterisk.default $(CURDIR)/debian/tmp/etc/default/asterisk
@@ -158,6 +157,8 @@
chmod +x $(CURDIR)/debian/asterisk/usr/share/asterisk/bin/asterisk_fix
mkdir -p $(CURDIR)/debian/tmp/usr/share/asterisk/firmware/iax
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/asterisk/mohmp3
+ mkdir -p $(CURDIR)/debian/tmp/var/lib/asterisk
dh_install --sourcedir=debian/tmp
@@ -187,7 +188,7 @@
dh_testdir -a
dh_testroot -a
dh_installdocs -a
- dh_installman *.[1-8] debian/*.1 debian/*.8
+ dh_installman utils/*.1 doc/*.8 contrib/scripts/*.8
dh_installexamples -a -XCVS
dh_installchangelogs ChangeLog -a
dh_strip -a
More information about the Pkg-voip-commits
mailing list