From: Bdale Garbee <bdale@gag.com>
Date: Tue, 13 Sep 2011 19:51:39 +0000 (-0600)
Subject: symlink to upstream's installation of examples in /usr/share/amanda,
X-Git-Tag: debian/3.3.0-1~9
X-Git-Url: https://git.gag.com/?p=debian%2Famanda;a=commitdiff_plain;h=99f829a6b358e64ba3bb4323703bf4161741a742

symlink to upstream's installation of examples in /usr/share/amanda,
instead of putting a second copy under /usr/share/doc
---

diff --git a/debian/NEWS b/debian/NEWS
index 54725ca..a5a6b97 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -3,9 +3,8 @@ amanda (1:3.3.0-1) unstable; urgency=low
   As of version 3.3.0, Amanda now uses bsdtcp as the default auth method, 
   and the package postinst scripts install a suitable inetd entry.  
 
-  You may need to update existing amanda.conf and amanda-client.conf files
-  to reflect this change, as such configs are often hand-crafted to meet
-  site expectations.
+  You may need to update existing amanda.conf files to reflect this change, 
+  as such configs are often hand-crafted to meet site expectations.
 
   You may also need to adjust inetd or xinetd configs to include both bsd
   and bsdtcp auth methods if circumstances mandate keeping auth method bsd
diff --git a/debian/amanda-common.examples b/debian/amanda-common.examples
deleted file mode 100644
index 0bbe99e..0000000
--- a/debian/amanda-common.examples
+++ /dev/null
@@ -1 +0,0 @@
-example/*
diff --git a/debian/changelog b/debian/changelog
index 2b080d4..2ce6dae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 amanda (1:3.3.0-1) unstable; urgency=low
 
-  * new upstream version
+  * new upstream version, closes: #641453
   * consolidate inetd and xinetd config handling in amanda-common package
   * add a NEWS entry explaining the switch to bsdtcp auth as default
 
diff --git a/debian/rules b/debian/rules
index 3238716..4fc39bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,7 @@ binary-arch: build
 	sed -i "/dependency_libs/ s/'.*'/''/" `find $(r)/usr/lib/amanda/ -name '*.la'`
 	install -m 644 debian/amandahosts $(r)/etc/amandahosts
 	dh_installdocs -a
-	dh_installexamples -a
+	ln -s /usr/share/amanda/example $(r)/usr/share/doc/examples
 	cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog
 	cp example/xinetd.amandaserver $(r)/etc/xinetd.d/amanda
 	dh_installmenu -a