Hello,
I'm doing an NMU of obexserver to fix #260741 and #292840; diff
attached.
Thanks,
Matej
diff -Nru /tmp/HkKndwQ1KD/obexserver-1.0/debian/changelog
/tmp/N1CgrO5Lsg/obexserver-1.0/debian/changelog
--- /tmp/HkKndwQ1KD/obexserver-1.0/debian/changelog 2003-06-25
03:04:53.000000000 +0200
+++ /tmp/N1CgrO5Lsg/obexserver-1.0/debian/changelog 2006-06-05
11:18:11.000000000 +0200
@@ -1,3 +1,12 @@
+obexserver (1.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Replace debmake with debhelper. Closes: #292840.
+ * src/obex_put_common.c: Fix build failure with gcc 3.4. Thanks to
+ Andreas Jochens for the patch. Closes: #260741.
+
+ -- Matej Vela <[EMAIL PROTECTED]> Mon, 5 Jun 2006 11:18:11 +0200
+
obexserver (1.0-3) unstable; urgency=low
* Added build dependancy on automake1.4 (closes: Bug#198090)
diff -Nru /tmp/HkKndwQ1KD/obexserver-1.0/debian/compat
/tmp/N1CgrO5Lsg/obexserver-1.0/debian/compat
--- /tmp/HkKndwQ1KD/obexserver-1.0/debian/compat 1970-01-01
01:00:00.000000000 +0100
+++ /tmp/N1CgrO5Lsg/obexserver-1.0/debian/compat 2006-06-05
11:04:17.000000000 +0200
@@ -0,0 +1 @@
+5
diff -Nru /tmp/HkKndwQ1KD/obexserver-1.0/debian/control
/tmp/N1CgrO5Lsg/obexserver-1.0/debian/control
--- /tmp/HkKndwQ1KD/obexserver-1.0/debian/control 2003-06-25
03:03:53.000000000 +0200
+++ /tmp/N1CgrO5Lsg/obexserver-1.0/debian/control 2006-06-05
11:04:09.000000000 +0200
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Michael Holzt <[EMAIL PROTECTED]>
Standards-Version: 3.5.8.0
-Build-Depends: debmake, libopenobex-1.0-0-dev, automake1.4
+Build-Depends: debhelper (>= 5), libopenobex-1.0-0-dev, automake1.4
Package: obexserver
Architecture: any
diff -Nru /tmp/HkKndwQ1KD/obexserver-1.0/debian/dirs
/tmp/N1CgrO5Lsg/obexserver-1.0/debian/dirs
--- /tmp/HkKndwQ1KD/obexserver-1.0/debian/dirs 2003-06-02 00:42:39.000000000
+0200
+++ /tmp/N1CgrO5Lsg/obexserver-1.0/debian/dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-usr/bin
diff -Nru /tmp/HkKndwQ1KD/obexserver-1.0/debian/rules
/tmp/N1CgrO5Lsg/obexserver-1.0/debian/rules
--- /tmp/HkKndwQ1KD/obexserver-1.0/debian/rules 2003-06-02 00:39:37.000000000
+0200
+++ /tmp/N1CgrO5Lsg/obexserver-1.0/debian/rules 2006-06-05 11:18:01.000000000
+0200
@@ -1,50 +1,54 @@
#!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# This file is public domain software, originally written by Joey Hess.
-package=obexserver
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp:
+ dh_testdir
-build:
- $(checkdir)
./configure --prefix=/usr
$(MAKE) CFLAGS="-O2 -g -Wall"
- touch build
+
+ touch build-stamp
clean:
- $(checkdir)
- rm -f build
- -$(MAKE) distclean
- rm -f `find . -name "*~"`
- rm -rf debian/tmp debian/files* core debian/substvars
-
-binary-indep: checkroot build
- $(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package. If there were any they would be
-# made here.
-
-binary-arch: checkroot build
- $(checkdir)
- rm -rf debian/tmp
- install -d debian/tmp
- cd debian/tmp && install -d `cat ../dirs`
- $(MAKE) install prefix=`pwd`/debian/tmp/usr
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
- debstd ChangeLog NEWS README
- dpkg-gencontrol -isp
- chown -R root.root debian/tmp
- chmod -R go=rX debian/tmp
- dpkg --build debian/tmp ..
-
-define checkdir
- test -f debian/rules
-endef
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) DESTDIR=$(CURDIR)/debian/obexserver install
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installman src/obexserver.1
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
-
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: build clean binary-indep binary-arch binary install
diff -Nru /tmp/HkKndwQ1KD/obexserver-1.0/src/obex_put_common.c
/tmp/N1CgrO5Lsg/obexserver-1.0/src/obex_put_common.c
--- /tmp/HkKndwQ1KD/obexserver-1.0/src/obex_put_common.c 2003-06-02
00:04:38.000000000 +0200
+++ /tmp/N1CgrO5Lsg/obexserver-1.0/src/obex_put_common.c 2006-06-05
11:13:27.000000000 +0200
@@ -82,7 +82,7 @@
break;
default:
- printf(__FUNCTION__ "() Skipped header %02x\n", hi);
+ printf("%s() Skipped header %02x\n", __func__, hi);
}
}
if(!body) {
@@ -123,7 +123,7 @@
OBEX_ObjectSetRsp(object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS);
break;
default:
- printf(__FUNCTION__ "() Denied %02x request\n", cmd);
+ printf("%s() Denied %02x request\n", __func__, cmd);
OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED,
OBEX_RSP_NOT_IMPLEMENTED);
break;
}
