[evolvis-commits] r17232: merge bm:taramir51/patches/debpkg-versioning

mirabilos at evolvis.org mirabilos at evolvis.org
Fri May 13 18:13:54 CEST 2011


Author: mirabilos
Date: 2011-05-13 18:13:54 +0200 (Fri, 13 May 2011)
New Revision: 17232

Added:
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/pkginfo.inc.php
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/debian/rules
   trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
Log:
merge bm:taramir51/patches/debpkg-versioning

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php	2011-05-13 14:37:08 UTC (rev 17231)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/FusionForge.class.php	2011-05-13 16:13:54 UTC (rev 17232)
@@ -24,20 +24,38 @@
  */
 
 require_once $gfcommon.'include/Error.class.php';
+
+if (file_exists($gfcommon.'pkginfo.inc.php')) {
+	require $gfcommon.'pkginfo.inc.php';
+}
+
 class FusionForge extends Error {
 
 	var $software_name ;
+	var $software_type ;
 	var $software_version ;
 
 	/**
 	 *	FusionForge - FusionForge object constructor
 	 */
 	function FusionForge() {
+		global $forge_pkg_name, $forge_pkg_version;
+
 		$this->Error();
 
 		$this->software_name = 'FusionForge' ;
 		$this->software_version = '5.0.90' ;
 
+		if (isset($forge_pkg_name) && isset($forge_pkg_version)) {
+			$this->software_name = $forge_pkg_name;
+			$this->software_version = $forge_pkg_version;
+		}
+
+		$this->software_type = $this->software_name;
+		if (isset($forge_pkg_type)) {
+			$this->software_type = $forge_pkg_type;
+		}
+
 		return true;
 	}
 

Added: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/pkginfo.inc.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/pkginfo.inc.php	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/pkginfo.inc.php	2011-05-13 16:13:54 UTC (rev 17232)
@@ -0,0 +1,7 @@
+<?php
+
+$forge_pkg_name = '@PKGNAME@';
+$forge_pkg_type = '@PLUCKERNAME@';
+$forge_pkg_version = '@PKGVERSION@';
+
+?>
\ No newline at end of file

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-05-13 14:37:08 UTC (rev 17231)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-05-13 16:13:54 UTC (rev 17232)
@@ -12,8 +12,9 @@
     oslc (to start integrating)
   * Integrate XHTML 1.0 Transitional + RDFa 1.0 profile for XML
     validation of output; collect xmlns:* globally
+  * Restore EvolvisForge version and fix ForgePlucker header
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 12 May 2011 18:15:54 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 13 May 2011 16:33:33 +0200
 
 fusionforge (5.0.51-2) UNRELEASED; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/rules	2011-05-13 14:37:08 UTC (rev 17231)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/rules	2011-05-13 16:13:54 UTC (rev 17232)
@@ -10,6 +10,14 @@
 SRCPACKAGE=fusionforge
 FORGENAME=Evolvis
 
+# Identify this FusionForge version
+# keep type intact and change forge in derivates,
+# unless there are deep changes (type is used for
+# the Forge-Identification meta header)
+WHICH_TYPE=FusionForge
+WHICH_FORGE=EvolvisForge
+WHICH_VERSION:=$(shell dpkg-parsechangelog | sed -n '/^Version: /s///p')
+
 SED_REPLACE=sed -e 's/@PACKAGE@/$(PACKAGE)/g' -e 's/@SRCPACKAGE@/$(SRCPACKAGE)/g' -e 's/@OLDPACKAGE@/$(OLDPACKAGE)/g' -e 's/@FORGENAME@/$(FORGENAME)/g'
 
 default:
@@ -154,6 +162,13 @@
 install: build
 	dh $@
 
+	sed \
+	    -e 's!@PKGNAME@!${WHICH_FORGE}!g' \
+	    -e 's!@PKGVERSION@!${WHICH_VERSION}!g' \
+	    -e 's!@PLUCKERNAME@!${WHICH_TYPE}!g' \
+	    <$(CURDIR)/deb-specific/pkginfo.inc.php \
+	    >$(CURDIR)/debian/$(OLDPACKAGE)-common/usr/share/$(PACKAGE)/common/pkginfo.inc.php
+
 # Fix permissions
 	chmod 755 $(CURDIR)/debian/*/*/*/*/bin/* $(CURDIR)/debian/*/bin/* \
 	    $(CURDIR)/debian/*/usr/share/*/plugins/*/bin/*

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-05-13 14:37:08 UTC (rev 17231)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-05-13 16:13:54 UTC (rev 17232)
@@ -343,9 +343,8 @@
 		 * cf. http://home.gna.org/forgeplucker/forge-identification.html
 		 */
 		$ff = new FusionForge();
-		return sprintf('<meta name="Forge-Identification" content="%s:%s" />', 
-				$ff->software_name,
-				$ff->software_version) . "\n";
+		printf('<meta name="Forge-Identification" content="%s:%s" />\n',
+		    $ff->software_type, $ff->software_version);
 	}
 
 	function bodyHeader($params){



More information about the evolvis-commits mailing list