[SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (73a70c5cb4e29e2bbacc2896f6d4bb18dd618e70)

Eric Sandall scm at mail.sourcemage.org
Wed Dec 6 16:56:34 EST 2006


GIT changes to stable-rc-0.6 grimoire by Eric Sandall <sandalle at moby.(none)>:

 disk/qtparted/BUILD                                |    2 --
 disk/qtparted/DEPENDS                              |    1 +
 disk/qtparted/DETAILS                              |    4 ++--
 disk/qtparted/HISTORY                              |    7 +++++++
 disk/qtparted/PRE_BUILD                            |    5 +++++
 disk/qtparted/qtparted-0.4.5-PED_SECTOR_SIZE.patch |   13 +++++++++++++
 disk/qtparted/qtparted-0.4.5.tar.bz2.sig           |binary
 http/middleman/DEPENDS                             |   20 ++++++++++++++++----
 http/middleman/HISTORY                             |    3 +++
 utils/console-tools/DETAILS                        |    2 +-
 utils/console-tools/HISTORY                        |    5 +++++
 utils/console-tools/INSTALL                        |    2 +-
 utils/console-tools/PRE_BUILD                      |    4 +++-
 utils/fcron/DEPENDS                                |   14 +++++++++++---
 utils/fcron/HISTORY                                |    4 ++++
 15 files changed, 72 insertions(+), 14 deletions(-)

New commits:
commit 73a70c5cb4e29e2bbacc2896f6d4bb18dd618e70
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Eric Sandall <sandalle at moby.(none)>

    qt-parted: mention that the update actually fixes a bug

commit 4f86fad2b1866e84725c335807ec3f7921fb58ef
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Eric Sandall <sandalle at moby.(none)>

    qtparted: updated to 0.4.5

commit b5bd7565d8c3b88c9aab727ffcc03966d2be8b5f
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Eric Sandall <sandalle at moby.(none)>

    fcron: depends which (bug #13294)

commit b1462928c659952f4209999573e2c7462e869387
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Eric Sandall <sandalle at moby.(none)>

    middleman: Added depends g++ (bug #13272)

commit 63136e4c22509a81b4c321ffdd8e168e5c812249
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Eric Sandall <sandalle at moby.(none)>

    console-tools: fix #13264

diff --git a/disk/qtparted/BUILD b/disk/qtparted/BUILD
index 41d0728..ce47da8 100755
--- a/disk/qtparted/BUILD
+++ b/disk/qtparted/BUILD
@@ -1,4 +1,2 @@
-# don't assume a specific automake version
-sedit  's/-${am__api_version}//'  configure &&
 OPTS="$OPTS --enable-static=no" &&
 default_build
diff --git a/disk/qtparted/DEPENDS b/disk/qtparted/DEPENDS
index a0bcda1..693f7e6 100755
--- a/disk/qtparted/DEPENDS
+++ b/disk/qtparted/DEPENDS
@@ -1,6 +1,7 @@
 depends  automake  &&
 depends  parted    &&
 depends  qt-x11    &&
+depends  unsermake &&
 
 optional_depends  "ntfsprogs" "" "--disable-ntfs" "for NTFS support"              &&
 optional_depends  "xfsprogs" "" "--disable-xfs" "for XFS support"                 &&
diff --git a/disk/qtparted/DETAILS b/disk/qtparted/DETAILS
index 64f80c5..3fc949f 100755
--- a/disk/qtparted/DETAILS
+++ b/disk/qtparted/DETAILS
@@ -1,9 +1,9 @@
            SPELL=qtparted
-         VERSION=0.4.4
+         VERSION=0.4.5
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-          MD5[0]=e0c65ce4a56e3cd1f38bb03642da4ffb
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
         WEB_SITE=http://qtparted.sourceforge.net
       LICENSE[0]=GPL
          ENTERED=20031001
diff --git a/disk/qtparted/HISTORY b/disk/qtparted/HISTORY
index d853e1a..d2da2ad 100644
--- a/disk/qtparted/HISTORY
+++ b/disk/qtparted/HISTORY
@@ -1,3 +1,10 @@
+2006-12-01 Flavien Bridault <vlaaad at sourcemage.org>
+	* DETAILS: Updated to 0.4.5 (fix bug #10426)
+	* qtparted-0.4.5-PED_SECTOR_SIZE.patch: added to fix compiling
+	* PRE_BUILD: apply patch, fix unsermake path
+	* BUILD: removed automake version hack
+	* DEPENDS: added unsermake
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/disk/qtparted/PRE_BUILD b/disk/qtparted/PRE_BUILD
new file mode 100755
index 0000000..43a56f4
--- /dev/null
+++ b/disk/qtparted/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+sedit 's!/usr/share/unsermake/unsermake!/usr/bin/unsermake!' Makefile.in  &&
+sedit 's!/usr/share/unsermake/unsermake!/usr/bin/unsermake!' src/Makefile.in  &&
+patch -p1 < $SCRIPT_DIRECTORY/qtparted-0.4.5-PED_SECTOR_SIZE.patch
diff --git a/disk/qtparted/qtparted-0.4.5-PED_SECTOR_SIZE.patch b/disk/qtparted/qtparted-0.4.5-PED_SECTOR_SIZE.patch
new file mode 100644
index 0000000..d85c701
--- /dev/null
+++ b/disk/qtparted/qtparted-0.4.5-PED_SECTOR_SIZE.patch
@@ -0,0 +1,13 @@
+--- qtparted-0.4.5/src/qp_libparted.h	2006-06-02 17:49:42.000000000 +0100
++++ qtparted-0.4.5/src/qp_libparted.h	2006-06-02 17:51:18.000000000 +0100
+@@ -35,6 +35,10 @@
+ #include "qtparted.h"
+ #include "qp_devlist.h"
+ 
++#ifndef PED_SECTOR_SIZE
++#define PED_SECTOR_SIZE PED_SECTOR_SIZE_DEFAULT
++#endif
++
+ class QP_PartWidget;
+ class QP_ListViewItem;
+ class QP_LibParted;
\ No newline at end of file
diff --git a/disk/qtparted/qtparted-0.4.5.tar.bz2.sig b/disk/qtparted/qtparted-0.4.5.tar.bz2.sig
new file mode 100644
index 0000000..0a163af
Binary files /dev/null and b/disk/qtparted/qtparted-0.4.5.tar.bz2.sig differ
diff --git a/http/middleman/DEPENDS b/http/middleman/DEPENDS
index 7e08af8..cbbe089 100755
--- a/http/middleman/DEPENDS
+++ b/http/middleman/DEPENDS
@@ -1,5 +1,17 @@
-depends pcre &&
+depends  g++   &&
+depends  pcre  &&
 
-optional_depends zlib      '--enable-zlib' '--disable-zlib' 'for GZip and Deflate encoding' &&
-optional_depends openssl   '--enable-ssl'  '--disable-ssl'  'for SSL support' &&
-optional_depends linux-pam '--enable-pam'  '--disable-pam'  'for PAM support'
\ No newline at end of file
+optional_depends  zlib                             \
+                  '--enable-zlib'                  \
+                  '--disable-zlib'                 \
+                  'for GZip and Deflate encoding'  &&
+
+optional_depends  openssl            \
+                  '--enable-ssl'     \
+                  '--disable-ssl'    \
+                  'for SSL support'  &&
+
+optional_depends  linux-pam          \
+                  '--enable-pam'     \
+                  '--disable-pam'    \
+                  'for PAM support'
diff --git a/http/middleman/HISTORY b/http/middleman/HISTORY
index 30a81ff..c57a5e5 100644
--- a/http/middleman/HISTORY
+++ b/http/middleman/HISTORY
@@ -1,3 +1,6 @@
+2006-12-01 Juuso Alasuutari <iuso at sourcemage.org>
+	* DEPENDS: Added depends g++ (bug #13272), reformatted code.
+
 2006-11-27 Juuso Alasuutari <iuso at sourcemage.org>
 	* PRE_BUILD: Made file executable (fixes bug #12515).
 
diff --git a/utils/console-tools/DETAILS b/utils/console-tools/DETAILS
index 2579f06..1cdfd77 100755
--- a/utils/console-tools/DETAILS
+++ b/utils/console-tools/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=ftp://metalab.unc.edu/pub/Linux/system/keyboards/$SOURCE
         WEB_SITE=http://lct.sourceforge.net
          ENTERED=20010922
-      PATCHLEVEL=3
+      PATCHLEVEL=4
         KEYWORDS="utils"
            SHORT="console-tools allows you to configure and manipulate Linux consoles."
 cat << EOF
diff --git a/utils/console-tools/HISTORY b/utils/console-tools/HISTORY
index f9bcede..dd5ea40 100755
--- a/utils/console-tools/HISTORY
+++ b/utils/console-tools/HISTORY
@@ -1,3 +1,8 @@
+2006-12-01 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* PRE_BUILD: source is_depends_enabled and fix #13264
+	* INSTALL: don't install the 4 man templates
+	* DETAILS: ++PATCHLEVEL
+
 2006-11-08 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* PRE_BUILD: properly install all the manpages #10112 - build some first
 	  re-enabled the whole doc subdir, agressively disabled some of it when 
diff --git a/utils/console-tools/INSTALL b/utils/console-tools/INSTALL
index c0a9b60..1613602 100755
--- a/utils/console-tools/INSTALL
+++ b/utils/console-tools/INSTALL
@@ -5,6 +5,6 @@ mv  $INSTALL_ROOT/usr/bin/loadkeys  $INS
 # Install man pages.
 for  (( COUNT=1 ; COUNT < 9 ; COUNT++ ));  do
   mkdir -p $INSTALL_ROOT/usr/share/man/man$COUNT
-  cp  doc/man/*.$COUNT*  $INSTALL_ROOT/usr/share/man/man$COUNT  2> /dev/null
+  cp  doc/man/*.$COUNT  $INSTALL_ROOT/usr/share/man/man$COUNT  2> /dev/null
   true
 done
diff --git a/utils/console-tools/PRE_BUILD b/utils/console-tools/PRE_BUILD
index db580d1..f8474f0 100755
--- a/utils/console-tools/PRE_BUILD
+++ b/utils/console-tools/PRE_BUILD
@@ -1,3 +1,4 @@
+source $GRIMOIRE/is_depends_enabled.function &&
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 patch  -p0  <  $SCRIPT_DIRECTORY/double-fclose-fix.patch  &&
@@ -5,7 +6,8 @@ patch  -p1  <  $SCRIPT_DIRECTORY/gcc-3.4
 cp  $SCRIPT_DIRECTORY/config.sub  .                       &&
 if ! is_depends_enabled linuxdoc-tools; then
   find -iname "*.sgml" -exec rm {} \; &&
-  sed -i -e 's/kbd.FAQ.html//' -e 's/lct.html//' doc/Makefile*
+  sed -i -e 's/kbd.FAQ.html//' -e 's/kbd.FAQ.txt//' \
+         -e 's/lct.html//' -e 's/lct.txt//' doc/Makefile*
 fi &&
 sedit "s/examples//"  Makefile.am                         &&
 sedit "s/examples//"  Makefile.in
diff --git a/utils/fcron/DEPENDS b/utils/fcron/DEPENDS
index 5241a92..b4907ce 100755
--- a/utils/fcron/DEPENDS
+++ b/utils/fcron/DEPENDS
@@ -1,4 +1,12 @@
-depends  perl  &&
-optional_depends  "openjade"  ""  "" "to build documentation"  &&
-optional_depends  "MAIL-TRANSPORT-AGENT"  ""  "--without-sendmail"  "for the e-mailing of reports"
+depends  perl   &&
+depends  which  &&
 
+optional_depends  openjade                  \
+                  ""                        \
+                  ""                        \
+                  "to build documentation"  &&
+
+optional_depends  MAIL-TRANSPORT-AGENT  \
+                  ""                    \
+                  "--without-sendmail"  \
+                  "for the e-mailing of reports"
diff --git a/utils/fcron/HISTORY b/utils/fcron/HISTORY
index 38cd26b..01d1e8a 100644
--- a/utils/fcron/HISTORY
+++ b/utils/fcron/HISTORY
@@ -1,3 +1,7 @@
+2006-12-05 Juuso Alasuutari <iuso at sourcemage.org>
+	* DEPENDS: Added depends which (bug #13294), better code
+	  formatting.
+
 2006-09-01 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* INSTALL: fix permission for fcron.conf
 



More information about the SM-Commit mailing list