revert to a single binary package

diff --git a/debian/bup.dirs b/debian/bup.dirs
deleted file mode 100644 (file)
index fcf16f2..0000000
--- a/debian/bup.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/man/man1

diff --git a/debian/bup.install b/debian/bup.install
deleted file mode 100644 (file)
index 28ddd04..0000000
--- a/debian/bup.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/bup/_hashsplit.so usr/lib/bup/bup

diff --git a/debian/bup.links b/debian/bup.links
deleted file mode 100644 (file)
index 745d3e1..0000000
--- a/debian/bup.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/bup/bup.exe usr/bin/bup

diff --git a/debian/control b/debian/control
index a453ac57c00ed324b177fba70b2b60a3ac735778..6cd32c5ef6dc9d0827f897037d90b0846a496773 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,18 +8,9 @@ Homepage: http://github.com/apenwarr/bup
 
 Package: bup
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, bup-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ python, git (>= 1:1.7.0.4-2) | git-core, python-fuse
 Recommends: par2
 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.
-
-Package: bup-common
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, git (>= 1:1.7.0.4-2) | git-core, python-fuse
-Description: highly efficient file backup system based on git - common files
- bup is a backup tool which stores the backups in a system based around
- the packfile format from git.
- .
- This package provides architecture-independent common files for bup.
- You need to install the 'bup' package to use bup.

diff --git a/debian/rules b/debian/rules
index 92eb5c067ed2eb3e7e361274e46e5ad1d2d91bf9..cbe925d7587131c8ec8761915930894c60c096fd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,3 @@
 #!/usr/bin/make -f
 %:
        dh $@
-
-override_dh_auto_install:
-       dh_auto_install --destdir=debian/bup-common
-       rm -f debian/bup-common/usr/lib/bup/bup/_hashsplit.so
-       mv debian/bup-common/usr/bin/bup debian/bup-common/usr/lib/bup/bup.exe
-       mv debian/bup-common/usr/share/man/man1/bup.1 debian/bup/usr/share/man/man1