[Pdns-dev] Please consider renaming debian-pdns to debian
Marc Haber
mh+pdns-dev at zugschlus.de
Wed Dec 7 12:49:58 CET 2011
Hi,
currently, netherlabs' Debian packaging is in a directory debian-pdns.
This was done to avoid interference with Debian's packaging of pdns
for historical reasons.
Having the netherlabs' Debian packaging in debian-pds causes a couple
of issues when one tries to build Debian packages using this
packaging. Debian's stock tools expect the packaging in debian/ while
netherlabs' tools expect the packaging in debian-pdns/. In my
experiments, the only way to make things work is to copy debian-pdns
to debian and to apply all subsequent changes to both directories
since I have never bothered to find out which tool reads from which
directory.
The interference with Debian's packaging does not apply any more:
Debian's pdns packages use the new "3.0 (quilt)" source format which
moves aside any debian/ directory shipped by upstream before
unpackging the debian/ directory from Debian. I have verified that the
resulting Debian source package is the same for both the "real"
upstream tarball and an upstream tarball which has its debian-pdns
renamed to Debian.
It should therefore be harmless to rename the debian-pdns directory to
debian in netherlabs' svn, avoiding issues with building the package
using stock Debian tools.
The resulting patch (generated by stupidly renaming all occurrences of
debian-pdns to debian) is reasonably small. Most probably the patch to
Makefile.in is superflous, as it is a generated file. The patch is to
be applied before renaming the directory.
Greetings
Marc
diff -urN pdns-3.1-pre.20111206.2310/debian-pdns/rules pdns-3.1-pre.20111206.2310.patches/debian-pdns/rules
--- pdns-3.1-pre.20111206.2310/debian-pdns/rules 2011-12-06 16:58:48.000000000 +0100
+++ pdns-3.1-pre.20111206.2310.patches/debian-pdns/rules 2011-12-07 12:47:26.904724642 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
-tmpdir := $(shell pwd)/debian-pdns/tmp
-be_tmpdir := $(shell pwd)/debian-pdns/tmp-backend
+tmpdir := $(shell pwd)/debian/tmp
+be_tmpdir := $(shell pwd)/debian/tmp-backend
backends := opendbx ldap mysql pipe gmysql gpgsql gsqlite gsqlite3
debs := opendbx ldap mysql pipe pgsql sqlite sqlite3
@@ -21,23 +21,23 @@
"$(tmpdir)"/usr/share/doc/pdns-doc
install -p -m 644 -o root -g root ChangeLog \
"$(tmpdir)"/usr/share/doc/pdns-doc/changelog
- install -p -m 644 -o root -g root debian-pdns/changelog \
+ install -p -m 644 -o root -g root debian/changelog \
"$(tmpdir)"/usr/share/doc/pdns-doc/changelog.Debian
gzip -9 "$(tmpdir)"/usr/share/doc/pdns-doc/*
- install -p -m 644 -o root -g root debian-pdns/copyright \
+ install -p -m 644 -o root -g root debian/copyright \
"$(tmpdir)"/usr/share/doc/pdns-doc/
install -d -m 755 -o root -g root "$(tmpdir)"/usr/share/doc-base
- install -p -m 644 -o root -g root debian-pdns/doc-base \
+ install -p -m 644 -o root -g root debian/doc-base \
"$(tmpdir)"/usr/share/doc-base/pdns
install -d -m 755 -o root -g root "$(tmpdir)"/DEBIAN
- install -p -m 755 -o root -g root debian-pdns/pdns-doc.prerm \
+ install -p -m 755 -o root -g root debian/pdns-doc.prerm \
"$(tmpdir)"/DEBIAN/prerm
- install -p -m 755 -o root -g root debian-pdns/pdns-doc.postinst \
+ install -p -m 755 -o root -g root debian/pdns-doc.postinst \
"$(tmpdir)"/DEBIAN/postinst
- dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -ppdns-doc -P"$(tmpdir)"
+ dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog -isp -ppdns-doc -P"$(tmpdir)"
dpkg --build "$(tmpdir)" ..
@@ -74,7 +74,7 @@
binary-main-prepare:
- rm -f debian-pdns/substvars
+ rm -f debian/substvars
rm -rf "$(tmpdir)" "$(tmpdir)"-*
install -d -m 755 -o root -g root "$(tmpdir)"
make DESTDIR="$(tmpdir)" install
@@ -98,33 +98,33 @@
"$(tmpdir)"/usr/share/doc/pdns
install -p -m 644 -o root -g root ChangeLog \
"$(tmpdir)"/usr/share/doc/pdns/changelog
- install -p -m 644 -o root -g root debian-pdns/changelog \
+ install -p -m 644 -o root -g root debian/changelog \
"$(tmpdir)"/usr/share/doc/pdns/changelog.Debian
gzip -9 "$(tmpdir)"/usr/share/doc/pdns/c*
- install -p -m 644 -o root -g root debian-pdns/copyright \
+ install -p -m 644 -o root -g root debian/copyright \
"$(tmpdir)"/usr/share/doc/pdns/
install -d -m 755 -o root -g root "$(tmpdir)"/DEBIAN
- install -p -m 755 -o root -g root debian-pdns/pdns.prerm \
+ install -p -m 755 -o root -g root debian/pdns.prerm \
"$(tmpdir)"/DEBIAN/prerm
- install -p -m 755 -o root -g root debian-pdns/pdns.postrm \
+ install -p -m 755 -o root -g root debian/pdns.postrm \
"$(tmpdir)"/DEBIAN/postrm
- install -p -m 755 -o root -g root debian-pdns/pdns.postinst \
+ install -p -m 755 -o root -g root debian/pdns.postinst \
"$(tmpdir)"/DEBIAN/postinst
- install -p -m 644 -o root -g root debian-pdns/pdns.conffiles \
+ install -p -m 644 -o root -g root debian/pdns.conffiles \
"$(tmpdir)"/DEBIAN/conffiles
binary-main: stamp-build binary-main-prepare
- dpkg-shlibdeps -Tdebian-pdns/substvars "$(tmpdir)"/usr/bin/zone2sql \
+ dpkg-shlibdeps -Tdebian/substvars "$(tmpdir)"/usr/bin/zone2sql \
"$(tmpdir)"/usr/sbin/pdns_server \
"$(tmpdir)"/usr/bin/pdns_control
- dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -ppdns -P"$(tmpdir)"
+ dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog -isp -ppdns -P"$(tmpdir)"
dpkg --build "$(tmpdir)" ..
binary-static: stamp-build-static binary-main-prepare
- dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -ppdns-static -P"$(tmpdir)"
+ dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog -isp -ppdns-static -P"$(tmpdir)"
dpkg --build "$(tmpdir)" ..
@@ -137,7 +137,7 @@
chmod 644 "$(tmpdir)"/usr/lib/powerdns/*
set -e ; for be in $(debs) ; do \
- rm -f debian-pdns/substvars ; \
+ rm -f debian/substvars ; \
rm -rf "$(be_tmpdir)" ; \
pkg=pdns-backend-$$be ; \
\
@@ -150,8 +150,8 @@
ln -s pdns "$(be_tmpdir)"/usr/share/doc/$$pkg ; \
\
install -d -m 755 -o root -g root "$(be_tmpdir)"/DEBIAN ; \
- dpkg-shlibdeps -Tdebian-pdns/substvars "$(be_tmpdir)"/usr/lib/powerdns/*.so ; \
- dpkg-gencontrol -fdebian-pdns/files -cdebian-pdns/control -ldebian-pdns/changelog -isp -p$$pkg -P"$(be_tmpdir)" ; \
+ dpkg-shlibdeps -Tdebian/substvars "$(be_tmpdir)"/usr/lib/powerdns/*.so ; \
+ dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog -isp -p$$pkg -P"$(be_tmpdir)" ; \
dpkg --build "$(be_tmpdir)" .. ; \
done
@@ -163,7 +163,7 @@
clean:
-make distclean
-make -C pdns/docs clean
- rm -f debian-pdns/files debian-pdns/substvars stamp-build stamp-build-static
+ rm -f debian/files debian/substvars stamp-build stamp-build-static
rm -rf "$(tmpdir)" "$(be_tmpdir)"
.PHONY: clean build binary binary-arch binary-indep
diff -urN pdns-3.1-pre.20111206.2310/Makefile.am pdns-3.1-pre.20111206.2310.patches/Makefile.am
--- pdns-3.1-pre.20111206.2310/Makefile.am 2011-12-06 16:58:49.000000000 +0100
+++ pdns-3.1-pre.20111206.2310.patches/Makefile.am 2011-12-07 12:47:33.920752358 +0100
@@ -1,5 +1,5 @@
SUBDIRS=modules codedocs @programdescend@
-EXTRA_DIST=TODO README HACKING INSTALL ChangeLog debian-pdns/* pdns.spec \
+EXTRA_DIST=TODO README HACKING INSTALL ChangeLog debian/* pdns.spec \
codedocs/Makefile codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
bootstrap
diff -urN pdns-3.1-pre.20111206.2310/Makefile.in pdns-3.1-pre.20111206.2310.patches/Makefile.in
--- pdns-3.1-pre.20111206.2310/Makefile.in 2011-12-06 17:01:16.000000000 +0100
+++ pdns-3.1-pre.20111206.2310.patches/Makefile.in 2011-12-07 12:47:07.312647235 +0100
@@ -282,7 +282,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = modules codedocs @programdescend@
-EXTRA_DIST = TODO README HACKING INSTALL ChangeLog debian-pdns/* pdns.spec \
+EXTRA_DIST = TODO README HACKING INSTALL ChangeLog debian/* pdns.spec \
codedocs/Makefile codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
bootstrap
--
-----------------------------------------------------------------------------
Marc Haber | "I don't trust Computers. They | Mailadresse im Header
Mannheim, Germany | lose things." Winona Ryder | Fon: *49 621 31958061
Nordisch by Nature | How to make an American Quilt | Fax: *49 621 31958062
More information about the Pdns-dev
mailing list