Package: netatalk Version: 2.1.4-1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for netatalk (versioned as 2.1.4-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Cheers Luk
diff -Nru netatalk-2.1.4/debian/changelog netatalk-2.1.4/debian/changelog --- netatalk-2.1.4/debian/changelog 2010-11-28 13:26:42.000000000 +0100 +++ netatalk-2.1.4/debian/changelog 2011-06-05 19:30:34.000000000 +0200 @@ -1,3 +1,12 @@ +netatalk (2.1.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't install unneeded /default dir (Closes: #628119). + * Move to libdb-dev usage (Closes: #621413). + * Don't ship .la files (Closes: #621849). + + -- Luk Claes <l...@debian.org> Sun, 05 Jun 2011 19:30:20 +0200 + netatalk (2.1.4-1) unstable; urgency=low * New upstream release. diff -Nru netatalk-2.1.4/debian/control netatalk-2.1.4/debian/control --- netatalk-2.1.4/debian/control 2010-11-28 12:24:05.000000000 +0100 +++ netatalk-2.1.4/debian/control 2011-06-05 19:26:33.000000000 +0200 @@ -7,7 +7,7 @@ devscripts (>= 2.10.7~), debhelper (>= 6), dh-buildinfo, - libdb4.8-dev, + libdb-dev, libwrap0-dev, libpam0g-dev, libcups2-dev, diff -Nru netatalk-2.1.4/debian/patches/115_default-dir.patch netatalk-2.1.4/debian/patches/115_default-dir.patch --- netatalk-2.1.4/debian/patches/115_default-dir.patch 1970-01-01 01:00:00.000000000 +0100 +++ netatalk-2.1.4/debian/patches/115_default-dir.patch 2011-06-05 19:32:24.000000000 +0200 @@ -0,0 +1,22 @@ +--- a/config/Makefile.am ++++ b/config/Makefile.am +@@ -66,7 +66,7 @@ + done + + if USE_DEBIAN +- $(mkinstalldirs) $(DESTDIR)/default ++ $(mkinstalldirs) $(DESTDIR)/etc/default + if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f /etc/default/netatalk; then \ + echo "$(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk"; \ + $(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk; \ +--- a/config/Makefile.in ++++ b/config/Makefile.in +@@ -609,7 +609,7 @@ + fi; \ + done + +-@USE_DEBIAN_TRUE@ $(mkinstalldirs) $(DESTDIR)/default ++@USE_DEBIAN_TRUE@ $(mkinstalldirs) $(DESTDIR)/etc/default + @USE_DEBIAN_TRUE@ if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f /etc/default/netatalk; then \ + @USE_DEBIAN_TRUE@ echo "$(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk"; \ + @USE_DEBIAN_TRUE@ $(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk; \ diff -Nru netatalk-2.1.4/debian/patches/series netatalk-2.1.4/debian/patches/series --- netatalk-2.1.4/debian/patches/series 2010-06-23 19:12:41.000000000 +0200 +++ netatalk-2.1.4/debian/patches/series 2011-06-05 19:20:48.000000000 +0200 @@ -2,6 +2,7 @@ #109_avoid_broken_xfs.patch #112_fix_zeroconf_assertion.patch 114_fix_macusers_ps_parsing.patch +115_default-dir.patch 200_netatalk_conf_defaults.diff 201_etc2ps_paths.diff 202_psf_8_paths.diff diff -Nru netatalk-2.1.4/debian/rules netatalk-2.1.4/debian/rules --- netatalk-2.1.4/debian/rules 2010-11-28 13:26:08.000000000 +0100 +++ netatalk-2.1.4/debian/rules 2011-06-05 19:37:42.000000000 +0200 @@ -28,8 +28,8 @@ DEB_UPSTREAM_TARBALL_MD5 = d5c9262896338cc1402a49c0f8ca2157 db_stable = 4.2 -db_testing = 4.7 -db_current = 4.8 +db_testing = 4.8 +db_current = # Override defaults for old-style update-rc.d # * Start and stop at priority 50 (FIXME: explain reasoning) @@ -117,6 +117,7 @@ rm -r debian/netatalk/usr/include rm -r debian/netatalk/usr/share/aclocal rm -r debian/netatalk/var + rm debian/netatalk/usr/lib/netatalk/*.la # Create patch to get in sync with upstream CVS get-orig-vcs: patchfile = 000_cvs_$(shell date '+%Y%m%d').patch