Apply patch from <http://bugs.debian.org/513305#67>.
authorMarc Dequènes (Duck) <duck@duckcorp.org>
Fri, 25 Jun 2010 13:54:50 +0000 (15:54 +0200)
committerMalte S. Stretz <mss@apache.org>
Wed, 11 Aug 2010 20:12:30 +0000 (22:12 +0200)
debian/changelog
debian/compat
debian/control
debian/copyright
debian/install [new file with mode: 0644]
debian/nscd.conf
debian/preinst [new file with mode: 0644]
debian/rules

index 32e6ec0..f01351b 100644 (file)
@@ -1,3 +1,16 @@
+unscd (0.45-0+dc1) unstable; urgency=low
+
+  * NMU by DuckCorp.
+  * New upstream release.
+  * Switched to compat level 7 and DH.
+  * Increased Standards-Version to 3.8.4 (no changes needed).
+  * Added preinst script to avoid init resource clash if nscd was
+    installed but not purged.
+  * Updated default config file to what is really supported by unscd
+    (even if the nscd config will work).
+
+ -- Marc Dequènes (Duck) <Duck@DuckCorp.org>  Fri, 25 Jun 2010 14:53:26 +0200
+
 unscd (0.36-1) unstable; urgency=low
 
   * Initial packaging for Debian
index b8626c4..7f8f011 100644 (file)
@@ -1 +1 @@
-4
+7
index b431ac9..e0140f5 100644 (file)
@@ -1,15 +1,15 @@
 Source: unscd
 Section: admin
 Priority: extra
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5), groff-base
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50), groff-base
 Maintainer: Don Armstrong <don@debian.org>
 
 Package: unscd
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: nscd
 Replaces: nscd
 Provides: nscd
index a7615c7..b07c9c0 100644 (file)
@@ -1,7 +1,8 @@
 Authors: Denys Vlasenko <vda.linux@googlemail.com>
 Webpage: http://busybox.net/~vda/unscd/
 Download: http://busybox.net/~vda/unscd/
-Debianized: Don Armstrong <don@debian.org> Tuesday, January 27, 2009 16:58:55 PST
+Debianized: Don Armstrong <don@debian.org> Tuesday, January 27, 2009 16:58:55 PST,
+ Marc Dequènes (Duck) <Duck@DuckCorp.org>  Fri, 25 Jun 2010 14:25:32 +0200
 
 Copyright: Copyright (C) 2007 Denys Vlasenko. Licensed under the GPL version 2. 
 
diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..971ab11
--- /dev/null
@@ -0,0 +1,2 @@
+nscd usr/sbin/
+debian/nscd.conf etc/
index f2007a2..d1dca7c 100644 (file)
 #      check-files             <service> <yes|no>
 #      persistent              <service> <yes|no>
 #      shared                  <service> <yes|no>
-#      max-db-size             <service> <number bytes>
 #      auto-propagate          <service> <yes|no>
 #
-# Currently supported cache names (services): passwd, group, hosts, services
+# Currently supported cache names (services): passwd, group, hosts
 #
 
 
@@ -49,7 +48,6 @@
        check-files             passwd          yes
        persistent              passwd          yes
        shared                  passwd          yes
-       max-db-size             passwd          33554432
        auto-propagate          passwd          yes
 
        enable-cache            group           yes
@@ -59,7 +57,6 @@
        check-files             group           yes
        persistent              group           yes
        shared                  group           yes
-       max-db-size             group           33554432
        auto-propagate          group           yes
 
 # hosts caching is broken with gethostby* calls, hence is now disabled
        check-files             hosts           yes
        persistent              hosts           yes
        shared                  hosts           yes
-       max-db-size             hosts           33554432
-
-       enable-cache            services        yes
-       positive-time-to-live   services        28800
-       negative-time-to-live   services        20
-       suggested-size          services        211
-       check-files             services        yes
-       persistent              services        yes
-       shared                  services        yes
-       max-db-size             services        33554432
diff --git a/debian/preinst b/debian/preinst
new file mode 100644 (file)
index 0000000..3ae677e
--- /dev/null
@@ -0,0 +1,18 @@
+#! /bin/sh
+# preinst script for unscd
+
+set -e
+
+case "$1" in
+    install)
+       # necessary in case nscd is not purged
+       # (useful to keep the config file, mostly compatible)
+       if [ ! -e /etc/init.d/.legacy-bootordering && -e /etc/init.d/nscd ]; then
+               insserv -r /etc/init.d/nscd
+       fi
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
index 56478ee..39d2744 100755 (executable)
@@ -1,67 +1,14 @@
 #!/usr/bin/make -f
 
-#DH_VERBOSE = 1
+VERSION = $(shell dpkg-parsechangelog | sed -r '/^Version:/ !d; s/^.*: ([^-]+).*$$/\1/')
 
+%:
+       dh $@
 
-PREFIX=$(shell pwd)/debian/unscd/
-
-CFLAGS = -Wall -g
-
-INSTALL=install
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-
-       gcc $(CFLAGS) -o nscd nscd-*.c
-
-       touch $@
+override_dh_auto_configure:
+       ln -s nscd-$(VERSION).c nscd.c
+       dh_auto_configure
 
 clean:
-       dh_testdir
-       dh_testroot
-
-       rm -f build-stamp
-
-       rm -f nscd
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-       $(INSTALL) -d $(PREFIX)/usr/sbin/
-       $(INSTALL) -t $(PREFIX)/usr/sbin/ nscd
-       $(INSTALL) -d $(PREFIX)/etc/
-       $(INSTALL) -t $(PREFIX)/etc/ debian/nscd.conf
-
-binary-indep:
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs README
-       dh_installman
-       dh_installinit
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       rm -f nscd.c
 
-binary: binary-arch
-.PHONY: build clean binary-arch binary-indep binary install