From: Robert S. Edmonds <edmonds@debian.org>
Date: Fri, 9 Aug 2013 02:42:16 +0000 (-0400)
Subject: debian/: fold bup-fuse and bup-web back into the bup package
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1913c66af89c9e6ac2aa7e000c25f0b9b2c50c2b;p=packages%2Fb%2Fbup.git

debian/: fold bup-fuse and bup-web back into the bup package
---

diff --git a/debian/bup-fuse.install b/debian/bup-fuse.install
deleted file mode 100644
index 4c7515f..0000000
--- a/debian/bup-fuse.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/bup/cmd/bup-fuse
diff --git a/debian/bup-web.install b/debian/bup-web.install
deleted file mode 100644
index 0909782..0000000
--- a/debian/bup-web.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/bup/cmd/bup-web
-usr/lib/bup/web/*
diff --git a/debian/control b/debian/control
index 0cec844..09216fb 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Package: bup
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python,
  git, par2, python-pylibacl, python-pyxattr
-Recommends: bup-doc, bup-fuse, bup-web
+Recommends: bup-doc, python-fuse, python-tornado
 Description: highly efficient file backup system based on git
  bup is a backup tool which stores the backups in a system based around
  the packfile format from git.
@@ -33,21 +33,3 @@ Description: highly efficient file backup system based on git (documentation)
  the packfile format from git.
  .
  This package contains the documentation.
-
-Package: bup-fuse
-Architecture: all
-Depends: ${misc:Depends}, python, bup, python-fuse
-Description: highly efficient file backup system based on git (fuse support)
- bup is a backup tool which stores the backups in a system based around
- the packfile format from git.
- .
- This package contains the bup-fuse command.
-
-Package: bup-web
-Architecture: all
-Depends: ${misc:Depends}, python, bup, python-tornado
-Description: highly efficient file backup system based on git (web support)
- bup is a backup tool which stores the backups in a system based around
- the packfile format from git.
- .
- This package contains the bup-web command.
diff --git a/debian/rules b/debian/rules
index e9a31fa..1bd239b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,6 @@ override_dh_auto_build-indep:
 override_dh_install:
 	rm -rf debian/tmp/usr/lib/bup/tornado
 	dh_install
-	rm -rf debian/bup/usr/lib/bup/web
-	rm -f debian/bup/usr/lib/bup/cmd/bup-fuse
-	rm -f debian/bup/usr/lib/bup/cmd/bup-web
 
 override_dh_auto_clean:
 	-rm config/config.cmd config/config.h config/config.log config/config.mak config/config.md config/config.sub config/config.vars