Changeset 1693 in MondoRescue for branches/stable/pbconf

Timestamp:

Oct 21, 2007, 3:06:22 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Remove useless copy from mindi to mondo at end of USB handling
• Fix PB macro vs tools/*2build issue
• make_usb_fs change of interface (doesn't need a parameter)
• Fix USB support in mondo to avoid multiple copies of files
• Use first partiion in mondo for USB device
• Fixes for USB CLI for both mondo/mindi
• Try to add USB support for mondoarchive with new functions
• du => deb for similarity with other distro type under pbconf
• migrate gento build files under pb
• remove now obsolete rpm spec file and gentoo build files from distributions
• Remove DOCDIR usage in mindi + various build fixes

(merge -r1680:1692 $SVN_M/branches/2.2.5)

Location:

branches/stable/pbconf

Files:

• mindi/deb (copied) (copied from branches/2.2.5/pbconf/mindi/deb )
• mindi/du (deleted)
• mindi/ebuild (copied) (copied from branches/2.2.5/pbconf/mindi/ebuild )
• mindi/rpm/mindi.spec (modified) (1 diff)
• mondo/deb/changelog (copied) (copied from branches/2.2.5/pbconf/mondo/deb/changelog )
• mondo/deb/control (modified) (1 diff)
• mondo/deb/rules (modified) (2 diffs)
• mondo/du (deleted)
• mondorescue.pb (modified) (1 diff)

branches/stable/pbconf/mindi/rpm/mindi.spec

@@ -37 +37 @@
 export CONFDIR=%{_sysconfdir}
 export MANDIR=%{_mandir}
-export DOCDIR=%{_docdir}
+#export DOCDIR=%{_docdir}
 export LIBDIR=%{_libdir}
 export CACHEDIR=%{_var}/cache/%{name}

branches/stable/pbconf/mondo/deb/control

@@ -1 @@
-Source: mondo
-Section: utils
+Source: PBPKG
+Section: PBGRP
 Priority: optional
-Maintainer: Bruno Cornec <bruno@mondorescue.org>
+Maintainer: PBPACKAGER
 Build-Depends: debhelper (>= 4.2.20), libnewt-dev, libncurses5-dev
 Standards-Version: 3.6.1
 
-Package: mondo
-Architecture: amd64 i386
-Section: utils
+Package: PBPKG
+Architecture: amd64 i386 ia64
+Section: PBGRP
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, mindi (>= 1.2.3-1), afio, buffer, gawk, cdrecord, lzop

branches/stable/pbconf/mondo/deb/rules

@@ -11 +11 @@
 
 # Define package name variable for a one-stop change.
-PACKAGE_NAME = mondo
+PACKAGE_NAME = PBPKG
 
 # These are used for cross-compiling and for saving the configure script
@@ -91 +91 @@
     mkdir -p debian/doc-temp
     mkdir -p $(CURDIR)/debian/$(PACKAGE_NAME)/var/cache/mondo
-    cp -a docs/en/mondorescue-howto debian/doc-temp/html
+    #cp -a docs/en/mondorescue-howto debian/doc-temp/html
 
     dh_install -s

branches/stable/pbconf/mondorescue.pb

@@ -14 +14 @@
 
 pkgver mindi = 1.2.5
-pkgver mindi-busybox = 1.2.2
-pkgtag mindi-busybox = 4
+pkgver mindi-busybox = 1.7.2
+pkgtag mindi-busybox = 1
 
 # Hash of additional package/package directory