[Pkg-samba-maint] r3895 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-09-24 22:07:12 +0000 (Sat, 24 Sep 2011)
New Revision: 3895

Added:
   trunk/samba/debian/smbclient.links
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
   trunk/samba/debian/smbclient.files
Log:
Use dh_links instead of manually creating directories and symlinks from
debian/rules.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-09-24 20:47:16 UTC (rev 3894)
+++ trunk/samba/debian/changelog	2011-09-24 22:07:12 UTC (rev 3895)
@@ -1,6 +1,8 @@
 samba (2:3.5.11~dfsg-2) UNRELEASED; urgency=low
 
   * Don't export DEB_HOST_ARCH_OS in debian/rules, this is only used locally.
+  * Use dh_links instead of manually creating directories and symlinks from
+    debian/rules.
 
  -- Steve Langasek <vorlon at debian.org>  Sat, 24 Sep 2011 13:36:50 -0700
 

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-09-24 20:47:16 UTC (rev 3894)
+++ trunk/samba/debian/rules	2011-09-24 22:07:12 UTC (rev 3895)
@@ -126,7 +126,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	mkdir -p $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
+	mkdir -p $(DESTDIR)/usr/share/samba \
 	         $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d
 
 	$(MAKE) -C source3 install DESTDIR=$(DESTDIR)
@@ -169,11 +169,6 @@
 	install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate
 	install -m 0644 debian/winbind.pam-config $(DESTDIR)/usr/share/pam-configs/winbind
 
-	# For CUPS to support printing to samba printers, it's necessary
-	#	to make the following symlink (according to
-	#	Erich Schubert <debian at vitavonni.de> in #109509):
-	ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
-
 	cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
 	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action
 	# Install samba-common's conffiles - they'll get moved later to their

Modified: trunk/samba/debian/smbclient.files
===================================================================
--- trunk/samba/debian/smbclient.files	2011-09-24 20:47:16 UTC (rev 3894)
+++ trunk/samba/debian/smbclient.files	2011-09-24 22:07:12 UTC (rev 3895)
@@ -17,4 +17,3 @@
 usr/share/man/man1/smbcacls.1
 usr/share/man/man1/smbcquotas.1
 usr/share/man/man1/smbtree.1
-usr/lib/cups/backend/smb

Added: trunk/samba/debian/smbclient.links
===================================================================
--- trunk/samba/debian/smbclient.links	                        (rev 0)
+++ trunk/samba/debian/smbclient.links	2011-09-24 22:07:12 UTC (rev 3895)
@@ -0,0 +1,4 @@
+# For CUPS to support printing to samba printers, it's necessary to make the
+# following symlink (according to Erich Schubert <debian at vitavonni.de>
+# in #109509)
+usr/bin/smbspool usr/lib/cups/backend/smb