commit b5dd6bf3497dc1cedb8f7e30658ad009aea5ac38
parent 846c8eb554047188b01591d9404325e1bf413e39
Author: Geoff Johnstone <qwerty@acm.org>
Date: Fri, 2 Apr 2010 00:51:09 +0100
Merge branch 'debian'
* debian:
Determine snapshot date from commit date, simplify
Update year in debian/copyright
Add rules for creating Debian package automatically
Add debian/copyright
Add man page
Use PACKAGE_NAME for tar archive name
Fix Debian dependecies, make rules executable
Add rule to remake autoconf results (ie Makefile)
Add option to make a snapshot tar archive
Remove Changelog from docs
Revert usmb.docs rename
Add Homepage; rename usmb.docs.
Initial commit of Debian packaging.
Conflicts:
README
Diffstat:
10 files changed, 213 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -18,9 +18,11 @@
CC = @CC@
-prefix = @prefix@
+prefix = ${DESTDIR}@prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
+mandir = @mandir@
+man1dir = $(mandir)/man1
CFLAGS = @CFLAGS@ -I@srcdir@ -I@builddir@ -Werror
LDFLAGS = @LDFLAGS@
@@ -34,9 +36,10 @@ SOURCES = conffile.c options.c password.c usmb.c usmb_dir.c usmb_file.c \
OBJECTS = $(SOURCES:.c=.o)
PROGRAM = @PACKAGE_NAME@
+MANPAGE = @PACKAGE_NAME@.1
-all: $(PROGRAM)
+all: $(PROGRAM) $(MANPAGE)
$(PROGRAM): $(OBJECTS)
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -44,6 +47,7 @@ $(PROGRAM): $(OBJECTS)
clean:
$(RM) $(PROGRAM) $(OBJECTS)
+ $(RM) $(MANPAGE) $(MANPAGE).xml
distclean: clean
@@ -59,30 +63,49 @@ install-strip: STRIPFLAGS = -s
install install-strip: $(PROGRAM)
@MKDIR_P@ $(bindir)
@INSTALL@ -m 755 $(STRIPFLAGS) $(PROGRAM) $(bindir)/
+ @MKDIR_P@ $(man1dir)
+ @INSTALL@ -m 644 $(MANPAGE) $(man1dir)/
uninstall:
$(RM) $(bindir)/$(PROGRAM)
rmdir -p $(bindir)
+ $(RM) $(man1dir)/$(MANPAGE)
+ rmdir -p $(man1dir)
@echo Please delete ~/.usmb.conf manually.
+%.1: %.1.txt
+ a2x -f manpage $<
+
+# In case package name changed
+$(MANPAGE).txt: usmb.1.txt
+ ln -s usmb.1.txt $(MANPAGE).txt
dist: tar
-tar: VERSION=$(shell grep 'USMB_VERSION[^_]' version.h | sed 's/.*0x//')
+PACKAGE = @PACKAGE_NAME@
+ifeq ($(SNAPSHOT),)
+ VERSION = $(shell grep 'USMB_VERSION[^_]' version.h | sed 's/.*0x//')
+ ARCHIVE = $(VERSION)
+else
+ ARCHIVE = $(shell git show $(SNAPSHOT) '--pretty=format:%h' | head -n1 )
+ VERSION = $(shell date -ud "$(shell git show $(SNAPSHOT) '--pretty=format:%cD' | head -n1 )" "+%Y%m%d%H%M%S")~$(ARCHIVE)
+endif
+
tar: STAGING=/tmp/usmb-$(VERSION)
tar:
mkdir $(STAGING)
- git archive $(VERSION) | tar -C $(STAGING) -x -f -
+ git archive $(ARCHIVE) | tar -C $(STAGING) -x -f -
git log > $(STAGING)/Changelog
(cd $(STAGING) && \
autoreconf && \
rm -rf autom4te.cache)
(cd $(STAGING)/.. && \
- tar jcf $(PWD)/usmb-$(VERSION).tar.bz2 usmb-$(VERSION) && \
- tar zcf $(PWD)/usmb-$(VERSION).tar.gz usmb-$(VERSION))
+ tar jcf $(PWD)/$(PACKAGE)-$(VERSION).tar.bz2 $(PACKAGE)-$(VERSION) && \
+ tar zcf $(PWD)/$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION))
rm -rf $(STAGING)
+include debian/Makefile.pkgdeb
config.rng.h: @srcdir@/config.rng
@SED@ -e 's/"/\\"/g' -e 's/\(.*\)/ "\1" \\/' \
@@ -93,6 +116,9 @@ config.rng.h: @srcdir@/config.rng
%.o: @srcdir@/%.c
$(CC) $(CFLAGS) -c -o $@ $<
+%: %.in
+ ./config.status
+
.PHONY: all debug dist install install-strip uninstall clean distclean tar
diff --git a/README b/README
@@ -14,7 +14,7 @@ Nigel Smith (Email me at <firstname>.<surname>.name) contributed the
port to Samba 3.2.
Michal Suchanek (Email hramrach at centrum dot cz) contributed the
-initial implementation of ~-expansion in mountpoints.
+Debian packaging and the initial implementation of ~-expansion.
Introduction
diff --git a/debian/Makefile.pkgdeb b/debian/Makefile.pkgdeb
@@ -0,0 +1,43 @@
+deb_package = $(shell dpkg-parsechangelog | grep ^Source: | sed -e s,'^Source: ',,)
+deb_version = $(shell dpkg-parsechangelog | grep ^Version: | sed -e s,'^Version: ',, -e 's,-.*,,')
+revision = $(shell dpkg-parsechangelog | grep ^Version: | sed -e -e 's,.*-,,')
+architecture = $(shell dpkg --print-architecture)
+tar_dir = $(PACKAGE)-$(VERSION)
+tar_gz = $(tar_dir).tar.gz
+pkg_deb_dir = pkgdeb
+unpack_dir = $(pkg_deb_dir)/$(tar_dir)
+orig_tar_gz = $(pkg_deb_dir)/$(PACKAGE)_$(VERSION).orig.tar.gz
+pkg_deb_src = $(pkg_deb_dir)/$(PACKAGE)_$(VERSION)-$(revision)_source.changes
+pkg_deb_bin = $(pkg_deb_dir)/$(PACKAGE)_$(VERSION)-$(revision)_$(architecture).changes
+
+#deb_pkg_key = -kCB8C5858
+deb_pkg_key = -us -uc
+
+debclean:
+ rm -rf $(pkg_deb_dir)
+
+deb: debsrc debbin
+
+debbin: $(unpack_dir)
+ cd $(unpack_dir) && dpkg-buildpackage -b $(deb_pkg_key)
+
+debsrc: $(unpack_dir)
+ cd $(unpack_dir) && dpkg-buildpackage -S $(deb_pkg_key)
+
+$(unpack_dir): $(orig_tar_gz)
+ tar -zxf $(orig_tar_gz) -C $(pkg_deb_dir)
+ [ $(VERSION) = $(deb_version) ] || \
+ ( cd $(unpack_dir) && debchange -m -v $(VERSION)-1 New upstream release $(VERSION). )
+ # Remove requirements for preparing the release tarball
+ # from the Debian control file
+ sed -i -e '/^ autoconf/d' -e '/^ devscripts/d' $(unpack_dir)/debian/control
+
+$(tar_gz): tar
+
+$(orig_tar_gz): $(tar_gz) debclean
+ mkdir $(pkg_deb_dir)
+ [ $(PACKAGE) = $(deb_package) ]
+ ln -s ../$(tar_gz) $(orig_tar_gz)
+
+
+
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,5 @@
+usmb (20090411-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #572703)
+
+ -- Michal Suchanek <hramrach@centrum.cz> Wed, 10 Mar 2010 11:59:09 +0100
diff --git a/debian/compat b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
@@ -0,0 +1,30 @@
+Source: usmb
+Section: otherosfs
+Priority: optional
+Build-Depends:
+ debhelper,
+ asciidoc, xmlto,
+ autoconf (>= 2.63),
+ devscripts,
+ libfuse-dev (>= 2.6),
+ libglib2.0-dev,
+ libsmbclient-dev (>= 3),
+ libxml2-dev,
+ pkg-config
+Standards-Version: 3.8.4
+Maintainer: Michal Suchanek <hramrach@centrum.cz>
+Homepage: http://repo.or.cz/w/usmb.git
+
+Package: usmb
+Recommends: fuse-utils
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: samba (CIFS) FUSE module
+ usmb mounts samba (CIFS, Windows, NetBIOS) shares just like smbfs does,
+ but uses FUSE to allow users other than root to mount shares.
+ .
+ Previously smbfs allowed the same by making mount.cifs setuid root but
+ this was recently disabled in the smbfs package due to security
+ concerns.
diff --git a/debian/copyright b/debian/copyright
@@ -0,0 +1,25 @@
+Authors:
+ Geoff Johnstone <qwerty@acm.org>
+Download: http://ametros.net/code.html#usmb
+
+Files: *
+Copyright:
+ (C) 2006-2010 Geoff Johnstone <qwerty@acm.org>
+ Debian packaging (C) 2010 Michal Suchanek <hramrach@centrum.cz>
+License: GPL-3
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 3 as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+ dh $@
diff --git a/debian/usmb.docs b/debian/usmb.docs
@@ -0,0 +1,2 @@
+README
+usmb.conf
diff --git a/usmb.1.txt b/usmb.1.txt
@@ -0,0 +1,71 @@
+USMB(1)
+=======
+Geoff Johnstone
+
+
+NAME
+----
+
+usmb - mount SMB/CIFS shares via FUSE
+
+SYNOPSIS
+--------
+
+*usmb* [OPTION...]
+
+DESCRIPTION
+-----------
+
+usmb allows mounting Samba (CIFS) shares through FUSE.
+
+
+Unlike some other Samba FUSE implementation usmb can mount shares from any
+server, including serrvers and shares not visible in "Network neighbourhood"
+(not advertised on the local lan.
+
+The share, user name and other details are specified in a configuration file.
+
+The source archive includes an example configuration file 'usmb.conf' and a
+more complete documentation of the program in 'README' file. If you have
+installed packaged version of the program these files should be available in
+'/usr/share/doc/usmb'.
+
+OPTIONS
+-------
+
+*-c 'configuration file'*::
+*--config='configuration file'*::
+ Specify configuration file to use.
+ Defaults to '~/.usmb.conf'.
+
+*-d*::
+*--debug*::
+ Debug mode.
+
+*-f*::
+*--nofork*::
+ Do not fork, stay in foreground.
+
+*-h*::
+*--help*::
+ Show options.
+
+FILES
+-----
+*'~/.usmb.conf'*::
+ The default location of usmb configuration file.
+
+SEE ALSO
+--------
+'README' 'usmb.conf' *fusermount*(1)
+
+
+AUTHORS
+-------
+ usmb was written by Geoff Johnstone
+ This minimal manpage was written by Michal Suchanek <hramrach@centrum.cz>
+
+COPYING
+-------
+Free use of this software is granted under the terms of the GNU General Public
+License (GPL).
