perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5952 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . packaging
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r5952 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . packaging
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5952 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . packaging
- Date: Thu, 16 Aug 2012 08:46:15 +0100 (BST)
Author: nordunet.behrmann
Date: 2012-08-16 08:46:15 +0100 (Thu, 16 Aug 2012)
New Revision: 5952
Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
Log:
Fixed Debian packaging
- webAdminConfig.xml was missing from the WAR file
- removed sudo from Debian packaging (packaging must not require root)
Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh
2012-08-16 07:06:12 UTC (rev 5951)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh
2012-08-16 07:46:15 UTC (rev 5952)
@@ -1,16 +1,14 @@
-
-#!/bin/sh
+#!/bin/bash
#author: Slawomir Trzaszczka
<>
#update: Piotr Pikusa
<>
. package.conf
-
do_clean_up() {
echo " CLEAN UP"
cd $CURR_DIR
- sudo rm -rf temp
- sudo rm -rf target
+ rm -rf temp
+ rm -rf target
echo
}
@@ -75,7 +73,7 @@
echo " CREATE DEB"
cd temp/deb
- sudo dpkg-buildpackage -d
+ fakeroot dpkg-buildpackage -d
echo
echo
}
@@ -89,7 +87,7 @@
file=$(find temp -regex ".+\.deb$")
mkdir target
cp $file target
- sudo rm -rf temp
+ rm -rf temp
echo
echo
}
Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/package.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-08-16 07:06:12
UTC (rev 5951)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-08-16 07:46:15
UTC (rev 5952)
@@ -80,6 +80,7 @@
todir="${basedir}/conf/tmp" />
<move
file="${basedir}/conf/tmp/${configurationFile}"
tofile="${basedir}/conf/tmp/configuration.xml" />
+ <copy
file="${basedir}/conf/webAdminConfig.xml" todir="${basedir}/conf/tmp"/>
</tasks>
</configuration>
<goals>
- [pS-dev] [GEANT/SA2/ps-java-services] r5952 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . packaging, svn-noreply, 08/16/2012
Archive powered by MHonArc 2.6.16.