[Pkg-voip-commits] r1588 - libpri/trunk/debian ohphone/trunk/debian
opal/branches/sarge/debian opal/trunk/debian
openam/trunk/debian openh323/branches/sarge/debian
openh323/trunk/debian openmcu/trunk/debian
pstngw/trunk/debian pwlib/branches/sarge/debian
pwlib/trunk/debian t38modem/trunk/debian
Kilian Krause
kilian at costa.debian.org
Sun Apr 16 22:57:19 UTC 2006
Author: kilian
Date: 2006-04-16 22:57:16 +0000 (Sun, 16 Apr 2006)
New Revision: 1588
Modified:
libpri/trunk/debian/changelog
libpri/trunk/debian/rules
ohphone/trunk/debian/changelog
ohphone/trunk/debian/rules
opal/branches/sarge/debian/changelog
opal/branches/sarge/debian/rules
opal/trunk/debian/changelog
opal/trunk/debian/rules
openam/trunk/debian/changelog
openam/trunk/debian/rules
openh323/branches/sarge/debian/changelog
openh323/branches/sarge/debian/rules
openh323/trunk/debian/changelog
openh323/trunk/debian/rules
openmcu/trunk/debian/changelog
openmcu/trunk/debian/rules
pstngw/trunk/debian/changelog
pstngw/trunk/debian/rules
pwlib/branches/sarge/debian/changelog
pwlib/branches/sarge/debian/rules
pwlib/trunk/debian/changelog
pwlib/trunk/debian/rules
t38modem/trunk/debian/changelog
t38modem/trunk/debian/rules
Log:
prepare all new uploads with the PWD => CURDIR fix and remove obj_ fix to make sudo happy.
Modified: libpri/trunk/debian/changelog
===================================================================
--- libpri/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ libpri/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,8 +1,8 @@
-libpri (1.2.2-3) UNRELEASED; urgency=low
+libpri (1.2.2-3) unstable; urgency=low
- * NOT RELEASED YET
+ * Use CURDIR rather than PWD to make sure we can build with sudo.
- -- Kilian Krause <kilian at debian.org> Thu, 9 Feb 2006 17:52:14 +0000
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:55:59 +0000
libpri (1.2.2-2) unstable; urgency=low
Modified: libpri/trunk/debian/rules
===================================================================
--- libpri/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ libpri/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -50,7 +50,7 @@
mkdir -p $(BRISTUFF_DIR)
tar cf - . --exclude=./debian/ --exclude=./$(BRISTUFF_DIR)/ \
| tar xf - -C $(BRISTUFF_DIR)
- cd $(BRISTUFF_DIR); patch <$(PWD)/debian/patches/bristuff.dpatch -p1
+ cd $(BRISTUFF_DIR); patch <$(CURDIR)/debian/patches/bristuff.dpatch -p1
endif
touch $@
Modified: ohphone/trunk/debian/changelog
===================================================================
--- ohphone/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ ohphone/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,8 +1,8 @@
-ohphone (1:1.4.5+20060204-2) UNRELEASED; urgency=low
+ohphone (1:1.4.5+20060204-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Use CURDIR rather than PWD to make sure we can build with sudo.
- -- Kilian Krause <kilian at debian.org> Sun, 26 Feb 2006 14:28:46 +0100
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:55:22 +0000
ohphone (1:1.4.5+20060204-1) unstable; urgency=low
Modified: ohphone/trunk/debian/rules
===================================================================
--- ohphone/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ ohphone/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -37,10 +37,10 @@
dh_installdirs -s
$(MAKE) $(MAKE_BUILD_PARAM) optshared
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/ohphone-basic/usr install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/ohphone-basic/usr install
$(MAKE) $(MAKE_BUILD_PARAM) optclean clean
$(MAKE) $(MAKE_BUILD_PARAM) DEBIANFULL=1 optshared
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/ohphone/usr install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/ohphone/usr install
touch build-arch-stamp
build-indep: build-indep-stamp
Modified: opal/branches/sarge/debian/changelog
===================================================================
--- opal/branches/sarge/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ opal/branches/sarge/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,7 +1,14 @@
-opal (2.2.1.dfsg-1) UNRELEASED; urgency=low
+opal (2.2.1.dfsg-2) UNRELEASED; urgency=low
+ * NOT RELEASED YET
+ * debian/rules: Use CURDIR rather than PWD to make sure we can build with
+ sudo.
+
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:53:05 +0000
+
+opal (2.2.1.dfsg-1) unstable; urgency=low
+
[ Kilian Krause ]
- * NOT RELEASED YET
* debian/control: No need to have debug symbols depend on -dev.
[ Jose Carlos Garcia Sogo ]
@@ -14,11 +21,11 @@
* debian/rules:
+ check that iLBC code has been removed. It also includes an RFC.
-
+
* debian/patches:
+ remove_ilbc: new. Removes any reference to iLBC code in Makefile.in
- -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 15 Apr 2006 23:56:45 +0200
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 17:06:06 +0000
opal (2.2.1-1) unstable; urgency=low
Modified: opal/branches/sarge/debian/rules
===================================================================
--- opal/branches/sarge/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ opal/branches/sarge/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -14,7 +14,7 @@
SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-MAKE_BUILD_PARAM=OPALDIR=$(PWD) PWLIBDIR=/usr/share/pwlib
+MAKE_BUILD_PARAM=OPALDIR=$(CURDIR) PWLIBDIR=/usr/share/pwlib
include /usr/share/dpatch/dpatch.make
@@ -27,7 +27,14 @@
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+FILENAME := opal_$(UPVERSION).dfsg.orig.tar.gz
+UPFILENAME := opal_$(UPVERSION).orig.tar.gz
+URL := http://www.voxgratia.org/releases/opal-v2_2_1-src-tar.gz
+
build: build-arch build-indep
build-arch: build-arch-stamp
@@ -51,6 +58,12 @@
touch autotools
+check-ilbc:
+ ( [ ! -d src/codec/iLBC ] ) || \
+ ( echo "ERROR: iLBC code must be removed from upstream sources" ; false )
+
+ touch $@
+
build-arch-stamp: Makefile
$(MAKE) $(MAKE_BUILD_PARAM) opt
@@ -58,7 +71,7 @@
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean opt
# Check that there is not any blatant error
- LD_LIBRARY_PATH=$(PWD)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
+ LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
touch build-arch-stamp
@@ -68,7 +81,7 @@
$(MAKE) $(MAKE_BUILD_PARAM) docs
touch build-indep-stamp
-clean: clean-patched unpatch
+clean: check-ilbc clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
@@ -110,7 +123,7 @@
dh_clean -k -a
dh_installdirs -a
- $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(PWD)/debian/$(PACKAGE) OPAL_LIBDIR=/usr/lib install
+ $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) OPAL_LIBDIR=/usr/lib install
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT))
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT)
@@ -119,7 +132,7 @@
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT2)
endif
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/simpleopal/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-rmdir samples/simple/obj*
@@ -133,7 +146,7 @@
#cp -v lib/libopal.a debian/libopal-dev/usr/lib
sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak
- #cp -vr include/* $(PWD)/debian/libopal-dev/usr/include/opal/.
+ #cp -vr include/* $(CURDIR)/debian/libopal-dev/usr/include/opal/.
#find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
cp version.h debian/libopal-dev/usr/include/opal/
@@ -188,5 +201,24 @@
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-strip
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+print-version:
+ @@echo "Debian version: $(DEBVERSION)"
+ @@echo "Upstream version: $(UPVERSION)"
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@echo Downloading $(UPFILENAME) from $(URL) ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+ @@echo Repacking as DFSG-free...
+ @@mkdir -p ../tarballs/opal-$(UPVERSION).tmp/
+ @@cd ../tarballs/opal-$(UPVERSION).tmp ; \
+ tar xfz ../$(UPFILENAME)
+ @@rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/src/codec/iLBC
+ @@cd ../tarballs/opal-$(UPVERSION).tmp ; \
+ tar cfz ../$(FILENAME) *
+ @@echo Cleaning up...
+ @@$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/
+
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean-patched
Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ opal/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,8 +1,10 @@
opal (2.2.1.dfsg-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * debian/rules: Use CURDIR rather than PWD to make sure we can build with
+ sudo.
- -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 17:23:54 +0000
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:53:05 +0000
opal (2.2.1.dfsg-1) unstable; urgency=low
Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ opal/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -14,7 +14,7 @@
SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-MAKE_BUILD_PARAM=OPALDIR=$(PWD) PWLIBDIR=/usr/share/pwlib
+MAKE_BUILD_PARAM=OPALDIR=$(CURDIR) PWLIBDIR=/usr/share/pwlib
include /usr/share/dpatch/dpatch.make
@@ -71,7 +71,7 @@
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean opt
# Check that there is not any blatant error
- LD_LIBRARY_PATH=$(PWD)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
+ LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
touch build-arch-stamp
@@ -123,7 +123,7 @@
dh_clean -k -a
dh_installdirs -a
- $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(PWD)/debian/$(PACKAGE) OPAL_LIBDIR=/usr/lib install
+ $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) OPAL_LIBDIR=/usr/lib install
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT))
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT)
@@ -132,7 +132,7 @@
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT2)
endif
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/simpleopal/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-rmdir samples/simple/obj*
@@ -146,7 +146,7 @@
#cp -v lib/libopal.a debian/libopal-dev/usr/lib
sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak
- #cp -vr include/* $(PWD)/debian/libopal-dev/usr/include/opal/.
+ #cp -vr include/* $(CURDIR)/debian/libopal-dev/usr/include/opal/.
#find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
cp version.h debian/libopal-dev/usr/include/opal/
Modified: openam/trunk/debian/changelog
===================================================================
--- openam/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ openam/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,3 +1,11 @@
+openam (1.1.18+20050304-3) unstable; urgency=low
+
+ * Fix clean target to not leave behind dirs when run with sudo.
+ (Closes:#362704)
+ * Also fix install target to use CURDIR rather than PWD
+
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:38:14 +0000
+
openam (1.1.18+20050304-2) unstable; urgency=low
* Recompiled with new openh323 and pwlib dependencies to complete C++ ABI
Modified: openam/trunk/debian/rules
===================================================================
--- openam/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ openam/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -9,7 +9,7 @@
export DH_COMPAT=3
MAKE_BUILD_PARAM=OPENH323DIR=/usr/share/openh323 PWLIBDIR=/usr/share/pwlib
-MAKE_INSTALL_PARAM=$(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/openam/usr
+MAKE_INSTALL_PARAM=$(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/openam/usr
build: build-stamp
build-stamp:
@@ -25,6 +25,7 @@
rm -f build-stamp
-$(MAKE) $(MAKE_BUILD_PARAM) optclean clean
+ rm -rf obj_*
dh_clean
Modified: openh323/branches/sarge/debian/changelog
===================================================================
--- openh323/branches/sarge/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ openh323/branches/sarge/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,9 +1,11 @@
-openh323 (1.18.0-2) UNRELEASED; urgency=low
+openh323 (1.18.0-2) unstable; urgency=low
- * NOT RELEASED YET
* debian/patches/ixjuser.h: Fix building on Ubuntu.
+ * debian/control: Conflict with openh323 1.17.3. (Closes: #359130)
+ * debian/rules: Use CURDIR rather than PWD to make sure we can build with
+ sudo.
- -- Kilian Krause <kilian at debian.org> Thu, 16 Mar 2006 23:59:11 +0100
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:52:10 +0000
openh323 (1.18.0-1) unstable; urgency=low
Modified: openh323/branches/sarge/debian/rules
===================================================================
--- openh323/branches/sarge/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ openh323/branches/sarge/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -14,7 +14,7 @@
SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-MAKE_BUILD_PARAM=OPENH323DIR=$(PWD)
+MAKE_BUILD_PARAM=OPENH323DIR=$(CURDIR)
include /usr/share/dpatch/dpatch.make
@@ -33,7 +33,7 @@
build-arch: build-arch-stamp
Makefile: patch-stamp autotools configure
- CFLAGS=-I$(PWD)/include ./configure $(confflags) --prefix=/usr --enable-plugins
+ CFLAGS=-I$(CURDIR)/include ./configure $(confflags) --prefix=/usr --enable-plugins
autotools:
-if [ -f config.sub.old ]; then \
@@ -72,7 +72,7 @@
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean opt
# Check that there is not any blatant error
- LD_LIBRARY_PATH=$(PWD)/lib samples/simple/obj_*_r/simph323 --help >/dev/null
+ LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simph323 --help >/dev/null
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
touch build-arch-stamp
@@ -134,13 +134,13 @@
dh_clean -k -a
dh_installdirs -a
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/$(PACKAGE)/usr -C src install
- $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(PWD)/debian/$(PACKAGE) -C plugins install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/$(PACKAGE)/usr -C src install
+ $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
ifneq ($(SHLIBSVER),$(LIBH323COMPAT))
ln -s libopenh323.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopenh323.so.$(LIBH323COMPAT)
endif
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/simph323/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simph323/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-rmdir samples/simple/obj*
@@ -153,7 +153,7 @@
cp -v lib/libopenh323.a debian/libopenh323-dev/usr/lib
sed -e 's#^OPENH323DIR.*#OPENH323DIR = \/usr\/share\/openh323#g' \
openh323u.mak > debian/libopenh323-dev/usr/share/openh323/openh323u.mak
- cp -vr include/* $(PWD)/debian/libopenh323-dev/usr/include/openh323/.
+ cp -vr include/* $(CURDIR)/debian/libopenh323-dev/usr/include/openh323/.
cp version.h debian/libopenh323-dev/usr/include/openh323/
find debian/libopenh323-dev/usr/include -type f -exec chmod 644 {} \;
Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ openh323/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,10 +1,11 @@
-openh323 (1.18.0-2) UNRELEASED; urgency=low
+openh323 (1.18.0-2) unstable; urgency=low
- * NOT RELEASED YET
* debian/patches/ixjuser.h: Fix building on Ubuntu.
* debian/control: Conflict with openh323 1.17.3. (Closes: #359130)
+ * debian/rules: Use CURDIR rather than PWD to make sure we can build with
+ sudo.
- -- Kilian Krause <kilian at debian.org> Wed, 29 Mar 2006 10:29:23 +0300
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:52:10 +0000
openh323 (1.18.0-1) unstable; urgency=low
Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ openh323/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -14,7 +14,7 @@
SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-MAKE_BUILD_PARAM=OPENH323DIR=$(PWD)
+MAKE_BUILD_PARAM=OPENH323DIR=$(CURDIR)
include /usr/share/dpatch/dpatch.make
@@ -33,7 +33,7 @@
build-arch: build-arch-stamp
Makefile: patch-stamp autotools configure
- CFLAGS=-I$(PWD)/include ./configure $(confflags) --prefix=/usr --enable-plugins
+ CFLAGS=-I$(CURDIR)/include ./configure $(confflags) --prefix=/usr --enable-plugins
autotools:
-if [ -f config.sub.old ]; then \
@@ -72,7 +72,7 @@
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean opt
# Check that there is not any blatant error
- LD_LIBRARY_PATH=$(PWD)/lib samples/simple/obj_*_r/simph323 --help >/dev/null
+ LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simph323 --help >/dev/null
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
touch build-arch-stamp
@@ -134,13 +134,13 @@
dh_clean -k -a
dh_installdirs -a
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/$(PACKAGE)/usr -C src install
- $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(PWD)/debian/$(PACKAGE) -C plugins install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/$(PACKAGE)/usr -C src install
+ $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
ifneq ($(SHLIBSVER),$(LIBH323COMPAT))
ln -s libopenh323.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopenh323.so.$(LIBH323COMPAT)
endif
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/simph323/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simph323/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-rmdir samples/simple/obj*
@@ -153,7 +153,7 @@
cp -v lib/libopenh323.a debian/libopenh323-dev/usr/lib
sed -e 's#^OPENH323DIR.*#OPENH323DIR = \/usr\/share\/openh323#g' \
openh323u.mak > debian/libopenh323-dev/usr/share/openh323/openh323u.mak
- cp -vr include/* $(PWD)/debian/libopenh323-dev/usr/include/openh323/.
+ cp -vr include/* $(CURDIR)/debian/libopenh323-dev/usr/include/openh323/.
cp version.h debian/libopenh323-dev/usr/include/openh323/
find debian/libopenh323-dev/usr/include -type f -exec chmod 644 {} \;
Modified: openmcu/trunk/debian/changelog
===================================================================
--- openmcu/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ openmcu/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,3 +1,9 @@
+openmcu (2.1.1-3) unstable; urgency=low
+
+ * Don't use PWD, but CURDIR as sudo no longer provides PWD (Closes:#362705)
+
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:43:44 +0000
+
openmcu (2.1.1-2) unstable; urgency=low
* Fix clean target when run with sudo instead of fakeroot.
Modified: openmcu/trunk/debian/rules
===================================================================
--- openmcu/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ openmcu/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -9,7 +9,7 @@
export DH_COMPAT=4
MAKE_BUILD_PARAM=OPENH323DIR=/usr/share/openh323 PWLIBDIR=/usr/share/pwlib PTLIB_FILE=.
-MAKE_INSTALL_PARAM=$(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/openmcu/usr
+MAKE_INSTALL_PARAM=$(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/openmcu/usr
include /usr/share/dpatch/dpatch.make
PACKAGE=openmcu
Modified: pstngw/trunk/debian/changelog
===================================================================
--- pstngw/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ pstngw/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,3 +1,9 @@
+pstngw (1.3.1-7) unstable; urgency=low
+
+ * Don't use PWD, but CURDIR as sudo no longer provides PWD (Closes:362706)
+
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:45:04 +0000
+
pstngw (1.3.1-6) unstable; urgency=low
* Fix clean target when run with sudo instead of fakeroot. (Closes: #347940)
Modified: pstngw/trunk/debian/rules
===================================================================
--- pstngw/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ pstngw/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -9,7 +9,7 @@
export DH_COMPAT=4
MAKE_BUILD_PARAM=OPENH323DIR=/usr/share/openh323 PWLIBDIR=/usr/share/pwlib ASNPARSER=`which asnparser`
-MAKE_INSTALL_PARAM=$(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/pstngw/usr
+MAKE_INSTALL_PARAM=$(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/pstngw/usr
build: build-stamp
build-stamp:
Modified: pwlib/branches/sarge/debian/changelog
===================================================================
--- pwlib/branches/sarge/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ pwlib/branches/sarge/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,11 +1,18 @@
-pwlib (1.10.0-1) UNRELEASED; urgency=low
+pwlib (1.10.0-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * debian/rules: Use CURDIR rather than PWD to make sure we can build with
+ sudo.
+
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:51:10 +0000
+
+pwlib (1.10.0-1) unstable; urgency=low
+
* New upstream release (Phobos_release).
* hush version.h error message when tarball not yet extracted
* Sarge compatibility: if debhelper compat is 4, use older strip
- -- Kilian Krause <kilian at debian.org> Mon, 13 Mar 2006 00:07:52 +0100
+ -- Kilian Krause <kilian at debian.org> Mon, 13 Mar 2006 23:46:34 +0000
pwlib (1.9.3-2) unstable; urgency=low
Modified: pwlib/branches/sarge/debian/rules
===================================================================
--- pwlib/branches/sarge/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ pwlib/branches/sarge/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -62,25 +62,25 @@
build-arch-stamp:
# Compile it all, first static and then shared, so we get shared bins
- $(MAKE) PWLIBDIR=$(PWD) optnoshared clean
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ optnoshared
+ $(MAKE) PWLIBDIR=$(CURDIR) optnoshared clean
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ optnoshared
samples/hello_world/obj_*_r/hello
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ clean
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
- $(MAKE) PWLIBDIR=$(PWD) optshared
+ $(MAKE) PWLIBDIR=$(CURDIR) optshared
# try if our build actually works ;)
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ optshared
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ optshared
- LD_LIBRARY_PATH=$(PWD)/lib samples/hello_world/obj_*_r/hello
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ clean
+ LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj_*_r/hello
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
# if this won't work, we needn't even try going any further...
touch build-arch-stamp
build-indep: build-indep-stamp
build-indep-stamp:
- $(MAKE) PWLIBDIR=$(PWD) docs
+ $(MAKE) PWLIBDIR=$(CURDIR) docs
touch build-indep-stamp
clean: clean-patched unpatch
@@ -88,7 +88,7 @@
$(checkdir)
-rm -f build-arch-stamp build-indep-stamp patch-stamp
-if [ -f Makefile ];then \
- $(MAKE) PWLIBDIR=$(PWD) clean || true;\
+ $(MAKE) PWLIBDIR=$(CURDIR) clean || true;\
fi
-rm -f include/ptbuildopts.h
-rm -f Makefile config.log config.status autotools
@@ -120,7 +120,7 @@
dh_installdirs -a
#INSTALL#
- $(MAKE) -C src/ptlib/unix install PWLIBDIR=$(PWD) INSTALL_DIR=`pwd`/debian/$(PACKAGE)/usr
+ $(MAKE) -C src/ptlib/unix install PWLIBDIR=$(CURDIR) INSTALL_DIR=$(CURDIR)/debian/$(PACKAGE)/usr
ifneq ($(SHLIBSVER),$(LIBPTCOMPAT))
ln -s libpt.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT)
Modified: pwlib/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ pwlib/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,8 +1,10 @@
pwlib (1.10.0-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * debian/rules: Use CURDIR rather than PWD to make sure we can build with
+ sudo.
- -- Kilian Krause <kilian at debian.org> Tue, 14 Mar 2006 00:14:34 +0000
+ -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 22:51:10 +0000
pwlib (1.10.0-1) unstable; urgency=low
Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ pwlib/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -62,25 +62,25 @@
build-arch-stamp:
# Compile it all, first static and then shared, so we get shared bins
- $(MAKE) PWLIBDIR=$(PWD) optnoshared clean
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ optnoshared
+ $(MAKE) PWLIBDIR=$(CURDIR) optnoshared clean
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ optnoshared
samples/hello_world/obj_*_r/hello
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ clean
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
- $(MAKE) PWLIBDIR=$(PWD) optshared
+ $(MAKE) PWLIBDIR=$(CURDIR) optshared
# try if our build actually works ;)
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ optshared
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ optshared
- LD_LIBRARY_PATH=$(PWD)/lib samples/hello_world/obj_*_r/hello
- $(MAKE) PWLIBDIR=$(PWD) -C samples/hello_world/ clean
+ LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj_*_r/hello
+ $(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
# if this won't work, we needn't even try going any further...
touch build-arch-stamp
build-indep: build-indep-stamp
build-indep-stamp:
- $(MAKE) PWLIBDIR=$(PWD) docs
+ $(MAKE) PWLIBDIR=$(CURDIR) docs
touch build-indep-stamp
clean: clean-patched unpatch
@@ -88,7 +88,7 @@
$(checkdir)
-rm -f build-arch-stamp build-indep-stamp patch-stamp
-if [ -f Makefile ];then \
- $(MAKE) PWLIBDIR=$(PWD) clean || true;\
+ $(MAKE) PWLIBDIR=$(CURDIR) clean || true;\
fi
-rm -f include/ptbuildopts.h
-rm -f Makefile config.log config.status autotools
@@ -120,7 +120,7 @@
dh_installdirs -a
#INSTALL#
- $(MAKE) -C src/ptlib/unix install PWLIBDIR=$(PWD) INSTALL_DIR=`pwd`/debian/$(PACKAGE)/usr
+ $(MAKE) -C src/ptlib/unix install PWLIBDIR=$(CURDIR) INSTALL_DIR=$(CURDIR)/debian/$(PACKAGE)/usr
ifneq ($(SHLIBSVER),$(LIBPTCOMPAT))
ln -s libpt.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT)
Modified: t38modem/trunk/debian/changelog
===================================================================
--- t38modem/trunk/debian/changelog 2006-04-16 17:24:01 UTC (rev 1587)
+++ t38modem/trunk/debian/changelog 2006-04-16 22:57:16 UTC (rev 1588)
@@ -1,6 +1,7 @@
-t38modem (0.8.0+20050304-4) UNRELEASED; urgency=low
+t38modem (0.8.0+20050304-4) unstable; urgency=low
- * NOT RELEASED YET
+ * Make sure clean target leaves behind no newly created files
+ (Closes: #362707)
-- Kilian Krause <kilian at debian.org> Mon, 5 Dec 2005 19:00:38 +0000
Modified: t38modem/trunk/debian/rules
===================================================================
--- t38modem/trunk/debian/rules 2006-04-16 17:24:01 UTC (rev 1587)
+++ t38modem/trunk/debian/rules 2006-04-16 22:57:16 UTC (rev 1588)
@@ -54,6 +54,7 @@
# Add here commands to clean up after the build process.
-$(MAKE) clean
rm -f t38modem.1
+ rm -rf obj_*
dh_clean
More information about the Pkg-voip-commits
mailing list