reverted: --- dibbler-0.7.1/Makefile +++ dibbler-0.7.1.orig/Makefile @@ -163,11 +163,12 @@ libposlib: poslib-configure @echo "[MAKE ] /poslib/poslib" $(MAKE) -C $(PREFIX)/poslib > poslib.log + rm -f $(POSLIB)/*.so* poslib-configure: @echo "[CONFIG ] /poslib/" cd $(PREFIX)/poslib; test -e "config.h" || \ + ./configure --host=$(CHOST) --build=$(CBUILD) >configure-poslib.log; - ./configure --disable-shared --host=$(CHOST) --build=$(CBUILD) >configure-poslib.log; relaylibs: includes @for dir in $(RELSUBDIRS); do \ reverted: --- dibbler-0.7.1/Makefile.inc +++ dibbler-0.7.1.orig/Makefile.inc @@ -67,8 +67,7 @@ #XMLLIBS = `pkg-config libxml-2.0 --libs` # === do not modify anything below === +MAKEFLAGS += -s -SILENTMAKE = -s -MAKEFLAGS += $(SILENTMAKE) VERSION = `$(TOPDIR)/test/xtract_version` INST_WORKDIR = $(DESTDIR)'/var/lib/dibbler' INST_MANDIR = $(DESTDIR)'/usr/local/man' diff -u dibbler-0.7.1/debian/changelog dibbler-0.7.1/debian/changelog --- dibbler-0.7.1/debian/changelog +++ dibbler-0.7.1/debian/changelog @@ -1,9 +1,30 @@ +dibbler (0.7.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #257575), Ubuntu remaining changes: + - Added dpatch support. + - Added glibc28_FTBFS.dpatch, fix FTBFS. + - Added makefile_makefileinc.dpatch in order to fix + patch-system-but-direct-changes-in-diff lintian warnings. + - Updated Standards-Version to 3.8.0. + + -- Alessio Treglia Wed, 13 Aug 2008 15:38:34 +0200 + dibbler (0.7.1-2) unstable; urgency=low * ucf is now used properly (closes: #494265) -- Tomasz Mrugalski Tue, 12 Aug 2008 00:52:36 +0200 +dibbler (0.7.1-1ubuntu1) intrepid; urgency=low + + * Add dpatch support. + * Add glibc28_FTBFS.dpatch patch, fix FTBFS (LP: #252017). + * Fix patch-system-but-direct-changes-in-diff lintian warnings: + - add makefile_makefileinc.dpatch patch. + * Modify Standards-Version to 3.8.0. + + -- Devid Filoni Sat, 26 Jul 2008 01:40:12 +0200 + dibbler (0.7.1-1) unstable; urgency=low * New upstream release (0.7.0 was never fully released) diff -u dibbler-0.7.1/debian/control dibbler-0.7.1/debian/control --- dibbler-0.7.1/debian/control +++ dibbler-0.7.1/debian/control @@ -1,10 +1,11 @@ Source: dibbler Section: admin Priority: optional -Maintainer: Tomasz Mrugalski +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Tomasz Mrugalski Uploaders: Bartosz Fenski Build-Depends: debhelper (>= 4.0.0), dpatch, po-debconf -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 Package: dibbler-server Architecture: any diff -u dibbler-0.7.1/debian/rules dibbler-0.7.1/debian/rules --- dibbler-0.7.1/debian/rules +++ dibbler-0.7.1/debian/rules @@ -10,6 +10,8 @@ # Modified to make a template file for a multi-binary package with separated # build-arch and build-indep targets by Bill Allombert 2001 +include /usr/share/dpatch/dpatch.make + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -25,14 +27,14 @@ endif build-arch: build-arch-stamp -build-arch-stamp: +build-arch-stamp: patch-stamp $(MAKE) SILENTMAKE="" CFLAGS="$(CFLAGS)" server client relay touch build-arch-stamp build-indep: # nothing to do -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-arch-stamp poslib.log poslib/configure-poslib.log only in patch2: unchanged: --- dibbler-0.7.1.orig/debian/patches/makefile_makefileinc.dpatch +++ dibbler-0.7.1/debian/patches/makefile_makefileinc.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## makefile_makefileinc.dpatch by Devid Filoni +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad dibbler-0.7.1~/Makefile dibbler-0.7.1/Makefile +--- dibbler-0.7.1~/Makefile 2008-06-29 19:35:05.000000000 +0200 ++++ dibbler-0.7.1/Makefile 2008-07-26 02:32:11.000000000 +0200 +@@ -163,12 +163,11 @@ + libposlib: poslib-configure + @echo "[MAKE ] /poslib/poslib" + $(MAKE) -C $(PREFIX)/poslib > poslib.log +- rm -f $(POSLIB)/*.so* + + poslib-configure: + @echo "[CONFIG ] /poslib/" + cd $(PREFIX)/poslib; test -e "config.h" || \ +- ./configure --host=$(CHOST) --build=$(CBUILD) >configure-poslib.log; ++ ./configure --disable-shared --host=$(CHOST) --build=$(CBUILD) >configure-poslib.log; + + relaylibs: includes + @for dir in $(RELSUBDIRS); do \ +diff -urNad dibbler-0.7.1~/Makefile.inc dibbler-0.7.1/Makefile.inc +--- dibbler-0.7.1~/Makefile.inc 2008-06-22 18:32:04.000000000 +0200 ++++ dibbler-0.7.1/Makefile.inc 2008-07-26 02:31:34.000000000 +0200 +@@ -67,7 +67,8 @@ + #XMLLIBS = `pkg-config libxml-2.0 --libs` + + # === do not modify anything below === +-MAKEFLAGS += -s ++SILENTMAKE = -s ++MAKEFLAGS += $(SILENTMAKE) + VERSION = `$(TOPDIR)/test/xtract_version` + INST_WORKDIR = $(DESTDIR)'/var/lib/dibbler' + INST_MANDIR = $(DESTDIR)'/usr/local/man' only in patch2: unchanged: --- dibbler-0.7.1.orig/debian/patches/glibc28_FTBFS.dpatch +++ dibbler-0.7.1/debian/patches/glibc28_FTBFS.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## glibc28_FTBFS.dpatch by Devid Filoni +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad dibbler-0.7.1~/Port-linux/lowlevel-linux.c dibbler-0.7.1/Port-linux/lowlevel-linux.c +--- dibbler-0.7.1~/Port-linux/lowlevel-linux.c 2008-06-22 13:43:18.000000000 +0200 ++++ dibbler-0.7.1/Port-linux/lowlevel-linux.c 2008-07-26 02:17:00.000000000 +0200 +@@ -15,6 +15,9 @@ + * + */ + ++/* Needed for struct in6_pktinfo */ ++#define _GNU_SOURCE ++ + #include + #include + #include only in patch2: unchanged: --- dibbler-0.7.1.orig/debian/patches/00list +++ dibbler-0.7.1/debian/patches/00list @@ -0,0 +1,2 @@ +glibc28_FTBFS +makefile_makefileinc