It turns out that the debian/*.examples files weren't used at all.  This 
patch should clear all that up so the examples are installed and 
referenced properly.

Changelog entry:

  * Fixed dh_installexamples call so the debian/*.examples files are
    actually used
  * Patched libpam-smbpass README to refer to examples directory
    (closes: #215771)
diff -u samba-3.0.20b/debian/libsmbclient-dev.examples samba-3.0.20b/debian/libsmbclient-dev.examples
--- samba-3.0.20b/debian/libsmbclient-dev.examples
+++ samba-3.0.20b/debian/libsmbclient-dev.examples
@@ -1 +1 @@
-examples/libsmbclient/
+examples/libsmbclient/*
diff -u samba-3.0.20b/debian/rules samba-3.0.20b/debian/rules
--- samba-3.0.20b/debian/rules
+++ samba-3.0.20b/debian/rules
@@ -258,8 +258,7 @@
 	dh_testroot
 	dh_installdebconf
 	dh_installdocs -A debian/README.build
-	# dh_installexamples is not available in Debian Potato...
-	[ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -psamba-doc examples/*
+	dh_installexamples
 #	dh_installmenu
 #	dh_installemacsen
 #	dh_installpam
@@ -294,8 +293,7 @@
 	dh_testroot
 	dh_installdebconf
 	dh_installdocs -A debian/README.build
-	# dh_installexamples is not available in Debian Potato...
-	[ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.3-samba source/python/examples/*
+	dh_installexamples
 #	dh_installmenu
 	# dh_installlogrotate is not available in Debian Potato...
 	if [ -x /usr/bin/dh_installlogrotate ]; then \
diff -u samba-3.0.20b/debian/samba-doc.examples samba-3.0.20b/debian/samba-doc.examples
--- samba-3.0.20b/debian/samba-doc.examples
+++ samba-3.0.20b/debian/samba-doc.examples
@@ -2,0 +3 @@
+examples/*
only in patch2:
unchanged:
--- samba-3.0.20b.orig/debian/patches/pam-examples.patch
+++ samba-3.0.20b/debian/patches/pam-examples.patch
@@ -0,0 +1,12 @@
+diff -uNr ../samba-3.0.20b/source/pam_smbpass/README samba-3.0.20b/source/pam_smbpass/README
+--- ../samba-3.0.20b/source/pam_smbpass/README	2005-10-12 19:03:29.000000000 +0200
++++ samba-3.0.20b/source/pam_smbpass/README	2005-10-25 20:56:03.000000000 +0200
+@@ -37,7 +37,7 @@
+ 	smbconf=<file>	-	specify an alternate path to the smb.conf
+ 				file.
+ 
+-See the samples/ directory for example PAM configurations using this
++See the examples/ directory for example PAM configurations using this
+ module.
+ 
+ Thanks go to the following people:
only in patch2:
unchanged:
--- samba-3.0.20b.orig/debian/python2.3-samba.examples
+++ samba-3.0.20b/debian/python2.3-samba.examples
@@ -0,0 +1 @@
+source/python/examples/*

Reply via email to