diff -u archfs-0.5.4/debian/changelog archfs-0.5.4/debian/changelog
--- archfs-0.5.4/debian/changelog
+++ archfs-0.5.4/debian/changelog
@@ -1,9 +1,24 @@
+archfs (0.5.4-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #592718), remaining changes:
+    - layout/support.c: O_CREAT forces a third argument, so provide one;
+      fixes FTBFS
+
+ -- Lorenzo De Liso <blackzldl@gmail.com>  Fri, 11 Jun 2010 17:28:51 +0200
+
 archfs (0.5.4-2) unstable; urgency=low
 
   * Honour TMPDIR. Closes: #552229.
 
  -- Jon Dowland <jmtd@debian.org>  Fri, 04 Jun 2010 23:44:55 +0100
 
+archfs (0.5.4-1ubuntu1) lucid; urgency=low
+
+  * layout/support.c: O_CREAT forces a third argument, so provide one;
+    fixes FTBFS
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Sat, 02 Jan 2010 22:58:24 -0500
+
 archfs (0.5.4-1) unstable; urgency=low
 
   * Initial release Closes: #471536.
diff -u archfs-0.5.4/debian/control archfs-0.5.4/debian/control
--- archfs-0.5.4/debian/control
+++ archfs-0.5.4/debian/control
@@ -1,7 +1,8 @@
 Source: archfs
 Section: utils
 Priority: optional
-Maintainer: Jon Dowland <jmtd@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jon Dowland <jmtd@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libfuse-dev, libz-dev, pkg-config
 Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/archfs/
only in patch2:
unchanged:
--- archfs-0.5.4.orig/layout/support.c
+++ archfs-0.5.4/layout/support.c
@@ -71,7 +71,7 @@
                 gstrdel(extension);
             	if (gmstrcpy(&mirror, tmp_file, "/", entry->d_name, 0) == -1)
             		continue;
-            	if ((descriptor = open(mirror, O_WRONLY | O_CREAT)) == -1)
+		if ((descriptor = open(mirror, O_WRONLY | O_CREAT, S_IRWXU)) == -1)
             		continue;
             	if (close(descriptor) == -1)
             		continue;