Updated debian packaging for 'debian-unstable'.

Updated debian packaging for 'captive-install' package.

diff --git a/Makefile.am b/Makefile.am
index d9e27b7..4ae2fa4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,13 +42,17 @@ EXTRA_DIST+= \
                .gdbinit \
                ChangeLog \
                $(REACTOS_SOURCES) \
+               debian/captive-lufs.files \
+               debian/captive-install.conffiles \
+               debian/captive-install.files \
+               debian/captive-install.postinst \
+               debian/captive-install.prerm \
                debian/captive.conffiles \
                debian/captive.docs \
                debian/captive.files \
                debian/changelog \
                debian/control \
                debian/copyright \
-               debian/lufs.files \
                debian/rules \
                cvs2cl-usermap
 

diff --git a/debian/install.conffiles b/debian/captive-install.conffiles
similarity index 100%
rename from debian/install.conffiles
rename to debian/captive-install.conffiles

diff --git a/debian/install.files b/debian/captive-install.files
similarity index 100%
rename from debian/install.files
rename to debian/captive-install.files

diff --git a/debian/install.postinst b/debian/captive-install.postinst
similarity index 100%
rename from debian/install.postinst
rename to debian/captive-install.postinst

diff --git a/debian/install.prerm b/debian/captive-install.prerm
similarity index 100%
rename from debian/install.prerm
rename to debian/captive-install.prerm

diff --git a/debian/captive-lufs.files b/debian/captive-lufs.files
new file mode 100644 (file)
index 0000000..31b73b4
--- /dev/null
+++ b/debian/captive-lufs.files
@@ -0,0 +1,3 @@
+/usr/lib/liblufs-captivefs*.so
+/sbin/mount.captive
+/sbin/mount.captive-*

diff --git a/debian/captive.docs b/debian/captive.docs
index 5502ed8..a016fd6 100644 (file)
--- a/debian/captive.docs
+++ b/debian/captive.docs
@@ -1,3 +1,4 @@
 NEWS
 README
 TODO
+AUTHORS

diff --git a/debian/captive.files b/debian/captive.files
index 722fbb2..b7b4590 100644 (file)
--- a/debian/captive.files
+++ b/debian/captive.files
@@ -1,8 +1,6 @@
 /etc/gnome-vfs-2.0/modules/captive.conf
 /usr/bin/captive-cmdline
-/usr/lib/gnome-vfs-2.0/modules/libcaptive-gnomevfs-0.9cvs.so
-/usr/lib/gnome-vfs-2.0/modules/libcaptive-gnomevfs.so
-/usr/lib/libcaptive-0.9cvs.so
+/usr/lib/gnome-vfs-2.0/modules/libcaptive-gnomevfs*.so
+/usr/lib/libcaptive*.so
 /usr/sbin/captive-sandbox-server
 /usr/share/locale/*/LC_MESSAGES/captive.mo
-/var/lib/captive

diff --git a/debian/control b/debian/control
index a85259a..4975a87 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,17 +12,19 @@ Build-Depends: debhelper (>> 3.0.0),
  libreadline4-dev,
  libbonobo2-dev,
  lufs,
- gcc (>= 3.0) | gcc-3.0
+ ntfsprogs-dev,
+ libgnomeui-dev,
+ gcc (>= 3.0) | gcc-3.0,
 Standards-Version: 3.5.2
 
 Package: captive
 Architecture: i386
 Depends: liborbit2,
- libssl,
- libgnomevfs2,
+ libssl0.9.7,
+ libgnomevfs2-0,
  libxml2,
- libpopt,
- libglib2.0,
+ libpopt0,
+ libglib2.0-0,
  libreadline4
 Recommends: captive-lufs (= ${Source-Version})
 Description: NTFS filesystem using Microsoft Windows drivers
@@ -39,7 +41,8 @@ Description: NTFS filesystem using Microsoft Windows drivers
 Package: captive-lufs
 Architecture: i386
 Depends: captive (= ${Source-Version}),
- lufs
+ lufs,
+ libpopt0
 Description: LUFS module for Microsoft Windows platform filesystem access.
  LUFS is a hybrid userspace filesystem framework.
  .
@@ -50,9 +53,11 @@ Package: captive-install
 Architecture: i386
 Depends: captive-lufs (= ${Source-Version}),
  ntfsprogs,
- libreadline4
-Build-Depends: ntfsprogs-dev,
- libreadline4-dev
+ libreadline4,
+ libgnomeui-0,
+ libpopt0,
+ ntfsprogs-gnomevfs,
+ gnome-vfs-httpcaptive
 Description: Instant installer for Microsoft Windows platform filesystem access.
  Package provides easy enough unattended installation of Microsoft Windows
  platform filesystem access. Installer finds available NTFS partitions and

diff --git a/debian/lufs.files b/debian/lufs.files
deleted file mode 100644 (file)
index 5f42a84..0000000
--- a/debian/lufs.files
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/lib/liblufs-captivefs-0.9cvs.so
-/usr/lib/liblufs-captivefs.so
-/sbin/mount.captive
-/sbin/mount.captive-*

diff --git a/debian/rules b/debian/rules
index ad2edc8..0b3d2b6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,9 @@ install: build
        dh_clean -k
        $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-strip
        dh_movefiles
+       #FIXME: dh_movefiles(1) ignores any directories
+       #       and dh_installdirs(1) creates them in debian/tmp/
+       mkdir -p $(CURDIR)/debian/captive/var/lib/captive
 
 # Build architecture-dependent files here.
 binary-arch: build install