Changeset 731 in MondoRescue

Timestamp:

Jul 31, 2006, 12:19:19 AM (18 years ago)

Author:

Bruno Cornec

Message:

• gentoo version is really 1.6 (not 2006)
• mondo-doc debian package improvements

Location:

branches/stable

Files:

• mondo-doc/distributions/debian/control (modified) (1 diff)
• mondo-doc/distributions/debian/mondo-doc.doc-base (modified) (1 diff)
• mondo-doc/distributions/debian/rules (modified) (2 diffs)
• tools/DISTROS (modified) (1 diff)
• tools/svn2build (modified) (1 diff)

branches/stable/mondo-doc/distributions/debian/control

@@ -1 @@
-Source: mondo
+Source: mondo-doc
 Section: utils
 Priority: optional
-Maintainer: Bruno Cornec <bruno@mondorescue>
+Maintainer: Bruno Cornec <bruno@mondorescue.org>
 Build-Depends: debhelper (>= 4.2.20)
 Standards-Version: 3.6.1

branches/stable/mondo-doc/distributions/debian/mondo-doc.doc-base

@@ -1 @@
-Document: mondo
+Document: mondo-doc
 Title: Mondo Rescue and Mindi Linux HOWTO
 Author: Hugo Rabson, Mikael Hultgren, Stan Benoit ("Troff"), Randy Delfs,

branches/stable/mondo-doc/distributions/debian/rules

@@ -24 +24 @@
 # Build architecture independent
 build-indep: build-indep-stamp
-    # Nothing to do, the only indep item is the manual which is available as html in original source
+    $(MAKE) -f Makefile.man VERSION=VVV
+    $(MAKE) -f Makefile.howto VERSION=VVV
     touch build-indep-stamp
 
@@ -54 +55 @@
     dh_testroot
     dh_clean -k -i
-    dh_installdirs -i
-    dh_install -i
+    $(MAKE) -f Makefile.man install INSTALLDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/doc/$(PACKAGE_NAME)
+    $(MAKE) -f Makefile.howto install INSTALLDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/doc/$(PACKAGE_NAME)
 
 # Must not depend on anything. This is to be called by

branches/stable/tools/DISTROS

@@ -11 +11 @@
 suse_10.1
 sles_9
-gentoo_2006
+gentoo_1.6
 slackware_10.2
 debian_3.1

branches/stable/tools/svn2build

@@ -82 +82 @@
             rm -f $TMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
-            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
+            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
         elif [ "$dtype" = "deb" ]; then
             # To be developped
             #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
             cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
+            m4 $TMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
             $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
             if [ $? -ne 0 ]; then