summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-06-14 10:04:55 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-06-14 10:04:55 +0000
commitc897cd155f53b9d8711580593c35674a0639e6d9 (patch)
tree9b6780655ee9071cd7e9cdcc4ef8e4461c067085
parent84af730b6c34464c5eb20c685888c0060d4f881a (diff)
rapid-tunneling: README.html: build-dep on asciidoc
Build README.html at build-time with asciidoc, and include it in the package. git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@9424 283159da-0705-0410-b60c-f2062b4bb6ad
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
-rw-r--r--debian/rapid-tunneling-server.docs1
-rw-r--r--debian/rapid-tunneling.docs1
-rwxr-xr-xdebian/rules1
6 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b4e6d25..7ff7431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-1.10:
+1.11:
+ * rtadm: generate tarballs under tar/
+ * rtadm: A script to put tarballs on a remote web server.
+ * Makefile: Some files were left out of the tarball.
+ * Makefile: Build (asciidoc) README.html in the default make target.
+
+1.10: 6-Oct-2010
* Get rid of the dedicated sshd_support service. Use system sshd.
* rapid-tunneling can override support host, user and sshd port.
* rapid-tunneling does not place files directly in the home directory.
diff --git a/debian/changelog b/debian/changelog
index 1ddf87e..e41cf2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ rapid-tunneling (1.11) unstable; urgency=low
* Include upstream ChangeLog.
* Include example rt_handle_uploaded_key.
+ * Include README.html: build-dep on asciidoc.
-- Tzafrir Cohen <tzafrir.cohen@xorcom.com> Tue, 14 Jun 2011 11:37:32 +0300
diff --git a/debian/control b/debian/control
index 213d6ce..07d4548 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: extra
Maintainer: Alex Landau <alex.landau@xorcom.com>
Uploaders: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
-Build-Depends: cdbs, debhelper (>= 7)
+Build-Depends: cdbs, debhelper (>= 7), asciidoc
Standards-Version: 3.8.0
Homepage: http://www.xorcom.com/
diff --git a/debian/rapid-tunneling-server.docs b/debian/rapid-tunneling-server.docs
new file mode 100644
index 0000000..daa30a3
--- /dev/null
+++ b/debian/rapid-tunneling-server.docs
@@ -0,0 +1 @@
+README.html
diff --git a/debian/rapid-tunneling.docs b/debian/rapid-tunneling.docs
new file mode 100644
index 0000000..daa30a3
--- /dev/null
+++ b/debian/rapid-tunneling.docs
@@ -0,0 +1 @@
+README.html
diff --git a/debian/rules b/debian/rules
index 6c7e78c..7404737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
DEB_DH_INSTALLCHANGELOGS_ARGS = ChangeLog
-DEB_MAKE_BUILD_TARGET = dummy
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) WWWHOME=/usr/share/rapid-tunneling/www
install/rapid-tunneling-gui::