[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

gridengine 6.2-2 unblock request



Hi,

I've just uploaded gridengine 6.2-2 with two fixes.
 * Use chmod instead of chown in gridengine-common postinst <cough/>
 * Build the man-pages to reference sge_* instead of ge_* so that the
   paths are actually what the packages use

The diffstat / debdiff is below.  Please consider unblocking.

Thanks,

Mark


 changelog                  |    8 ++++++++
 gridengine-common.postinst |   10 +++++++++-
 rules                      |    4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff -u gridengine-6.2/debian/changelog gridengine-6.2/debian/changelog
--- gridengine-6.2/debian/changelog
+++ gridengine-6.2/debian/changelog
@@ -1,3 +1,11 @@
+gridengine (6.2-2) unstable; urgency=medium
+
+  * Use chmod instead of chown in postinst.
+  * Fix man-pages to have sge_* instead of ge_* in paths and variable
+    names.  Closes: #497103.
+
+ -- Mark Hymers <mhy@debian.org>  Sat, 30 Aug 2008 23:08:59 +0100
+
 gridengine (6.2-1) unstable; urgency=low
 
   * New upstream release.
diff -u gridengine-6.2/debian/gridengine-common.postinst gridengine-6.2/debian/gridengine-common.postinst
--- gridengine-6.2/debian/gridengine-common.postinst
+++ gridengine-6.2/debian/gridengine-common.postinst
@@ -48,10 +48,18 @@
       # Copy in the default file having set SGE_CELL and use ucf to install it
       TMPFILE=$(mktemp)
       chown root:root ${TMPFILE}
-      chown 644 ${TMPFILE}
+      chmod 644 ${TMPFILE}
       sed "s@^SGE_CELL=.*@SGE_CELL=${SGE_CELL}@" /usr/share/doc/gridengine-common/examples/gridengine.default >> ${TMPFILE}
       ucf --debconf-ok ${TMPFILE} /etc/default/gridengine
       rm -f ${TMPFILE}
+    else
+      # On upgrades, only certain things need to happen
+
+      # From before 6.2-2, we need to fix the stupid chown/chmod bug on /etc/default/gridengine
+      if dpkg --compare-versions "$2" lt 6.2-2; then
+        chown root:root /etc/default/gridengine
+        chmod 644 /etc/default/gridengine
+      fi
     fi
   ;;
 
diff -u gridengine-6.2/debian/rules gridengine-6.2/debian/rules
--- gridengine-6.2/debian/rules
+++ gridengine-6.2/debian/rules
@@ -28,7 +28,7 @@
 	cd source && ${PRECMD} ./aimk -only-core -no-dump depend
 	cd source && ${PRECMD} ./aimk -only-core -no-dump
 	cd source && ${PRECMD} ./aimk -only-qmon -no-dump
-	cd source && ${PRECMD} ./aimk -man -no-dump
+	cd source && ${PRECMD} ./aimk -man -no-dump -sunman
 	touch build-stamp
 
 clean:
@@ -57,7 +57,7 @@
 
 	install -d debian/tmp/usr
 	install -d debian/tmp/usr/share
-	cd source && /usr/bin/yes | ${PRECMD} scripts/distinst -basedir ${CURDIR}/debian -vdir tmp/usr -onlybin -- man examples
+	cd source && /usr/bin/yes | ${PRECMD} scripts/distinst -basedir ${CURDIR}/debian -mansrc sge -vdir tmp/usr -onlybin -- man examples
 
 	rm -rf debian/tmp/usr/catman
 	-rmdir debian/tmp/usr/utilbin/lx*


-- 
Mark Hymers <mhy at debian dot org>


Reply to: