[Pkg-samba-maint] r3900 - trunk/samba/debian
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sun Sep 25 23:50:04 UTC 2011
Author: vorlon
Date: 2011-09-25 23:50:03 +0000 (Sun, 25 Sep 2011)
New Revision: 3900
Added:
trunk/samba/debian/samba.manpages
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/libsmbclient-dev.install
trunk/samba/debian/libsmbclient.install
trunk/samba/debian/libwbclient-dev.install
trunk/samba/debian/libwbclient0.install
trunk/samba/debian/rules
trunk/samba/debian/samba-common.install
trunk/samba/debian/samba-tools.install
trunk/samba/debian/samba.install
Log:
Where possible, use dh_installman and dh_install's support for target
directories instead of moving files around in debian/rules.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/changelog 2011-09-25 23:50:03 UTC (rev 3900)
@@ -5,6 +5,8 @@
debian/rules.
* Switch from dh_movefiles to dh_install and adjust for debhelper compat
level 7, in preparation for moving to dh(1).
+ * Where possible, use dh_installman and dh_install's support for target
+ directories instead of moving files around in debian/rules.
-- Steve Langasek <vorlon at debian.org> Sat, 24 Sep 2011 13:36:50 -0700
Modified: trunk/samba/debian/libsmbclient-dev.install
===================================================================
--- trunk/samba/debian/libsmbclient-dev.install 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/libsmbclient-dev.install 2011-09-25 23:50:03 UTC (rev 3900)
@@ -1,3 +1,3 @@
-usr/lib/libsmbclient.a
-usr/lib/libsmbclient.so
+usr/lib/samba/libsmbclient.a usr/lib
+usr/lib/samba/libsmbclient.so usr/lib
usr/include/libsmbclient.h
Modified: trunk/samba/debian/libsmbclient.install
===================================================================
--- trunk/samba/debian/libsmbclient.install 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/libsmbclient.install 2011-09-25 23:50:03 UTC (rev 3900)
@@ -1,2 +1,2 @@
-usr/lib/libsmbclient.so.0
+usr/lib/samba/libsmbclient.so.0 usr/lib
usr/share/man/man7/libsmbclient.7
Modified: trunk/samba/debian/libwbclient-dev.install
===================================================================
--- trunk/samba/debian/libwbclient-dev.install 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/libwbclient-dev.install 2011-09-25 23:50:03 UTC (rev 3900)
@@ -1,3 +1,3 @@
-usr/lib/libwbclient.so
+usr/lib/samba/libwbclient.so usr/lib
usr/include/wbclient.h
usr/include/wbc_async.h
Modified: trunk/samba/debian/libwbclient0.install
===================================================================
--- trunk/samba/debian/libwbclient0.install 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/libwbclient0.install 2011-09-25 23:50:03 UTC (rev 3900)
@@ -1 +1 @@
-usr/lib/libwbclient.so.0
+usr/lib/samba/libwbclient.so.0 usr/lib
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/rules 2011-09-25 23:50:03 UTC (rev 3900)
@@ -140,39 +140,16 @@
mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba3
mv $(DESTDIR)/usr/share/man/man1/testparm.1 $(DESTDIR)/usr/share/man/man1/testparm.samba3.1
- # Starting with Samba 3.0.6 libsmbclient.so is installed in
- # /usr/lib/samba. We don't want it there since it is not in the
- # default library path. Here we move it to /usr/lib/.
- mv $(DESTDIR)/usr/lib/samba/libsmbclient* $(DESTDIR)/usr/lib/
-
- # same problem with libwbclient.
- mv $(DESTDIR)/usr/lib/samba/libwbclient* $(DESTDIR)/usr/lib/
-
# Install other stuff not installed by "make install"
install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
- install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
install -m 0644 nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
install -m 0644 nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
- # Install torture stuff
- install -m 0755 source3/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
- install -m 0755 source3/bin/msgtest $(DESTDIR)/usr/bin/msgtest
- install -m 0755 source3/bin/masktest $(DESTDIR)/usr/bin/masktest
- install -m 0755 source3/bin/locktest $(DESTDIR)/usr/bin/locktest
- install -m 0755 source3/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
- install -m 0755 source3/bin/nsstest $(DESTDIR)/usr/bin/nsstest
- install -m 0755 source3/bin/vfstest $(DESTDIR)/usr/bin/vfstest
- install -m 0755 source3/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
- install -m 0755 source3/bin/replacetort $(DESTDIR)/usr/bin/replacetort
- install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
mkdir -p $(DESTDIR)/usr/share/pam-configs
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
- 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
- # correct place by dh_movefiles.
- cp debian/gdbcommands $(DESTDIR)/etc/samba/
+ # correct place by dh_install
install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
mkdir -p $(DESTDIR)/etc/network/if-up.d
install -o root -g root debian/samba.if-up $(DESTDIR)/etc/network/if-up.d/samba
@@ -187,6 +164,7 @@
dh_testdir
dh_testroot
dh_installdebconf
+ dh_installman
dh_installdocs -A debian/README.build
# Ignore COPYING. Otherwise, an extra copy of the GPL licence
# in smbldap-tools example is included in samba-doc
@@ -208,6 +186,7 @@
dh_testdir
dh_testroot
dh_installdebconf
+ dh_installman
dh_installdocs -A debian/README.build
dh_installexamples
dh_installlogrotate
Modified: trunk/samba/debian/samba-common.install
===================================================================
--- trunk/samba/debian/samba-common.install 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/samba-common.install 2011-09-25 23:50:03 UTC (rev 3900)
@@ -1,7 +1,8 @@
etc/samba/
+debian/gdbcommands etc/samba
etc/dhcp3/
usr/share/samba/lowcase.dat
-usr/share/samba/panic-action
-usr/share/samba/smb.conf*
+debian/panic-action usr/share/samba
+debian/smb.conf* usr/share/samba
usr/share/samba/upcase.dat
usr/share/samba/valid.dat
Modified: trunk/samba/debian/samba-tools.install
===================================================================
--- trunk/samba/debian/samba-tools.install 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/samba-tools.install 2011-09-25 23:50:03 UTC (rev 3900)
@@ -1,10 +1,10 @@
-usr/bin/smbtorture
-usr/bin/msgtest
-usr/bin/masktest
-usr/bin/locktest
-usr/bin/locktest2
-usr/bin/nsstest
-usr/bin/vfstest
-usr/bin/pdbtest
-usr/bin/replacetort
-usr/bin/smbconftort
+source3/bin/smbtorture usr/bin
+source3/bin/msgtest usr/bin
+source3/bin/masktest usr/bin
+source3/bin/locktest usr/bin
+source3/bin/locktest2 usr/bin
+source3/bin/nsstest usr/bin
+source3/bin/vfstest usr/bin
+source3/bin/pdbtest usr/bin
+source3/bin/replacetort usr/bin
+source3/bin/smbconftort usr/bin
Modified: trunk/samba/debian/samba.install
===================================================================
--- trunk/samba/debian/samba.install 2011-09-25 22:58:57 UTC (rev 3899)
+++ trunk/samba/debian/samba.install 2011-09-25 23:50:03 UTC (rev 3900)
@@ -13,6 +13,5 @@
usr/share/man/man8/nmbd.8
usr/share/man/man8/pdbedit.8
usr/share/man/man8/smbd.8
-usr/share/man/man8/mksmbpasswd.8
usr/share/man/man8/eventlogadm.8
etc/network/if-up.d/samba
Added: trunk/samba/debian/samba.manpages
===================================================================
--- trunk/samba/debian/samba.manpages (rev 0)
+++ trunk/samba/debian/samba.manpages 2011-09-25 23:50:03 UTC (rev 3900)
@@ -0,0 +1 @@
+debian/mksmbpasswd.8
More information about the Pkg-samba-maint
mailing list