[maemo-commits] [maemo-commits] r10726 - in projects/haf/trunk/dosfstools: . debian debian/patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-03-22 18:03:22 +0200 (Thu, 22 Mar 2007)
New Revision: 10726

Added:
   projects/haf/trunk/dosfstools/debian/
   projects/haf/trunk/dosfstools/debian/changelog
   projects/haf/trunk/dosfstools/debian/compat
   projects/haf/trunk/dosfstools/debian/control
   projects/haf/trunk/dosfstools/debian/copyright
   projects/haf/trunk/dosfstools/debian/patches/
   projects/haf/trunk/dosfstools/debian/patches/01-add-tag-to-makefile.patch
   projects/haf/trunk/dosfstools/debian/patches/02-correct-mandir.patch
   projects/haf/trunk/dosfstools/debian/patches/03-print-hash-marks.patch
   projects/haf/trunk/dosfstools/debian/rules
Log:
added packaging


Added: projects/haf/trunk/dosfstools/debian/changelog
===================================================================
--- projects/haf/trunk/dosfstools/debian/changelog	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/changelog	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1,6 @@
+dosfstools (2.11-0osso1) unstable; urgency=low
+
+  * OSSO-packaged dosfstools (used debian scripts from 2.11-2 for guidance).
+  * Added patch to mkdosfs to print hash marks for progress indication.
+  
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 20 Nov 2006 18:07:30 +0200

Added: projects/haf/trunk/dosfstools/debian/compat
===================================================================
--- projects/haf/trunk/dosfstools/debian/compat	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/compat	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1 @@
+4

Added: projects/haf/trunk/dosfstools/debian/control
===================================================================
--- projects/haf/trunk/dosfstools/debian/control	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/control	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1,18 @@
+Source: dosfstools
+Section: otherosfs
+Priority: optional
+Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+Build-Depends: debhelper, cdbs
+Standards-Version: 3.0.1
+
+Package: dosfstools
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: mkdosfs
+Conflicts: mkdosfs
+Description: Utilities to create and check MS-DOS FAT filesystems
+ Inside of this package there are two utilities (mkdosfs alias
+ mkfs.dos, and dosfsck alias fsck.msdos) to create and to check MS-DOS
+ FAT filesystems on either hard disks or floppies under Linux. This
+ version uses the enhanced boot sector/superblock format of DOS 3.3+
+ as well as provides a default dummy boot sector code.

Added: projects/haf/trunk/dosfstools/debian/copyright
===================================================================
--- projects/haf/trunk/dosfstools/debian/copyright	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/copyright	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1,26 @@
+This is the Debian Linux prepackaged version of the mkdosfs the creator
+for MS-DOS filesystems either on harddisks or on floppies.
+
+This package was put together by Martin Schulze <joey at infodrom.north.de>,
+from sources obtained from:
+ sunsite.unc.edu:/pub/Linux/system/filesystems/dosfs/mkdosfs-ygg-0.3b.lsm
+ sunsite.unc.edu:/pub/Linux/system/filesystems/dosfs/mkdosfs-ygg-0.3b.tar.gz
+ sunsite.unc.edu:/pub/Linux/system/filesystems/dosfs/dosfsck.1.tar.z
+
+Mkdosfs is copyrighted by Dave Hudson <dave at humbug.demon.co.uk>, and was
+later maintained and improved by H. Peter Anvin <hpa at yggdrasil.com>.
+Dave has put the whole package under the GPL.
+
+Dosfsck is copyrighted by Werner Almesberger <werner.almesberger at lrc.di.epfl.ch>
+and Roman Hodek. We both together put the package under the GPL.
+
+The FAT32, LFN, and Atari format additions are copyrighted by Roman
+Hodek <Roman.Hodek at informatik.uni-erlangen.de> and are under the GPL, too.
+
+Both tools (mkdosfs and dosfsck) have been unmaintained since some
+time, so I also took them over as upstream maintainer. The merged
+package is named dosfstools-2.0, and its home site is now
+  ftp.uni-erlangen.de:/pub/Linux/LOCAL/dosfstools
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL'.

Added: projects/haf/trunk/dosfstools/debian/patches/01-add-tag-to-makefile.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/01-add-tag-to-makefile.patch	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/patches/01-add-tag-to-makefile.patch	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1,12 @@
+diff -pur dosfstools-2.11/Makefile dosfstools-2.11.new/Makefile
+--- dosfstools-2.11/Makefile	2005-03-12 16:07:01.000000000 +0200
++++ dosfstools-2.11.new/Makefile	2006-11-20 17:00:05.259942384 +0200
+@@ -10,7 +10,7 @@ DEBUGFLAGS = 
+ CFLAGS = $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
+ LDFLAGS =
+ 
+-PREFIX = 
++PREFIX = REPLACE_WITH_PREFIX
+ SBINDIR = $(PREFIX)/sbin
+ MANDIR = $(PREFIX)/usr/man/man8
+ 

Added: projects/haf/trunk/dosfstools/debian/patches/02-correct-mandir.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/02-correct-mandir.patch	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/patches/02-correct-mandir.patch	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1,12 @@
+diff -pur dosfstools-2.11/Makefile dosfstools-2.11.new/Makefile
+--- dosfstools-2.11/Makefile	2005-03-12 16:07:01.000000000 +0200
++++ dosfstools-2.11.new/Makefile	2006-11-20 17:43:39.644495520 +0200
+@@ -12,7 +12,7 @@ LDFLAGS =
+ 
+ PREFIX = 
+ SBINDIR = $(PREFIX)/sbin
+-MANDIR = $(PREFIX)/usr/man/man8
++MANDIR = $(PREFIX)/usr/share/man/man8
+ 
+ .PHONY: clean distclean install depend
+ .EXPORT_ALL_VARIABLES:

Added: projects/haf/trunk/dosfstools/debian/patches/03-print-hash-marks.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/03-print-hash-marks.patch	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/patches/03-print-hash-marks.patch	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1,46 @@
+diff -pur dosfstools-2.11/mkdosfs/mkdosfs.c dosfstools-2.11.new/mkdosfs/mkdosfs.c
+--- dosfstools-2.11/mkdosfs/mkdosfs.c	2005-03-12 18:12:16.000000000 +0200
++++ dosfstools-2.11.new/mkdosfs/mkdosfs.c	2006-11-20 17:52:19.995390160 +0200
+@@ -1336,12 +1336,22 @@ write_tables (void)
+ 	       CF_LE_L(bs.fat32.fat32_length) : CF_LE_W(bs.fat_length);
+ 
+   seekto( 0, "start of device" );
++  {
++    /* tell the number of printed hash marks */
++    char buf[20];
++    snprintf(buf, 19, "%d\n", reserved_sectors + nr_fats + 3); 
++    buf[19] = '\0';
++    write(STDERR_FILENO, buf, strlen(buf));
++  }
+   /* clear all reserved sectors */
+-  for( x = 0; x < reserved_sectors; ++x )
++  for( x = 0; x < reserved_sectors; ++x ) {
+     writebuf( blank_sector, sector_size, "reserved sector" );
++    write(STDERR_FILENO, "#", 1);
++  }
+   /* seek back to sector 0 and write the boot sector */
+   seekto( 0, "boot sector" );
+   writebuf( (char *) &bs, sizeof (struct msdos_boot_sector), "boot sector" );
++  write(STDERR_FILENO, "#", 1);
+   /* on FAT32, write the info sector and backup boot sector */
+   if (size_fat == 32)
+     {
+@@ -1354,13 +1364,17 @@ write_tables (void)
+ 		    "backup boot sector" );
+ 	}
+     }
++  write(STDERR_FILENO, "#", 1);
+   /* seek to start of FATS and write them all */
+   seekto( reserved_sectors*sector_size, "first FAT" );
+-  for (x = 1; x <= nr_fats; x++)
++  for (x = 1; x <= nr_fats; x++) {
+     writebuf( fat, fat_length * sector_size, "FAT" );
++    write(STDERR_FILENO, "#", 1);
++  }
+   /* Write the root directory directly after the last FAT. This is the root
+    * dir area on FAT12/16, and the first cluster on FAT32. */
+   writebuf( (char *) root_dir, size_root_dir, "root directory" );
++  write(STDERR_FILENO, "#", 1);
+ 
+   if (blank_sector) free( blank_sector );
+   if (info_sector) free( info_sector );

Added: projects/haf/trunk/dosfstools/debian/rules
===================================================================
--- projects/haf/trunk/dosfstools/debian/rules	2007-03-22 16:02:08 UTC (rev 10725)
+++ projects/haf/trunk/dosfstools/debian/rules	2007-03-22 16:03:22 UTC (rev 10726)
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+# Copyright © 2006 Nokia Corporation. All rights reserved.
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_TAR_SRCDIR := dosfstools-2.11
+include /usr/share/cdbs/1/rules/tarball.mk
+
+# Use soft-float and thumb mode if it is enabled.
+ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -mthumb
+endif
+
+configure/dosfstools::
+	cd $(DEB_BUILDDIR); sed -ri "s#REPLACE_WITH_PREFIX#$(DEB_DESTDIR)#" Makefile
+
+build/dosfstools::
+	cd $(DEB_BUILDDIR); $(MAKE) install
+
+clean::
+	rm -f *.cdbs-config_list


Property changes on: projects/haf/trunk/dosfstools/debian/rules
___________________________________________________________________
Name: svn:executable
   + *