marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wik...@apache.org
Subject [1/3] git commit: MARMOTTA-431: changed package name to just 'marmotta' (replaces the other)
Date Tue, 25 Feb 2014 15:54:11 GMT
Repository: marmotta
Updated Branches:
  refs/heads/develop f7cc0bc01 -> ef113cd2d


MARMOTTA-431: changed package name to just 'marmotta' (replaces the other)


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7496b4f0
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7496b4f0
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7496b4f0

Branch: refs/heads/develop
Commit: 7496b4f0c4a4642e707477c90be75beddf4e8b60
Parents: 4b04fff
Author: Sergio Fernández <wikier@apache.org>
Authored: Tue Feb 25 15:11:25 2014 +0100
Committer: Sergio Fernández <wikier@apache.org>
Committed: Tue Feb 25 15:11:25 2014 +0100

----------------------------------------------------------------------
 launchers/marmotta-webapp/pom.xml                 | 3 ++-
 launchers/marmotta-webapp/src/deb/control/control | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/7496b4f0/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index f747fde..748e486 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -145,7 +145,8 @@
                             <goal>jdeb</goal>
                         </goals>
                         <configuration>
-                            <deb>${project.build.directory}/${project.artifactId}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
+                            <deb>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.deb</deb>
+                            <changesOut>${project.build.directory}/${project.build.finalName}_${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}~${maven.build.timestamp}_all.changes</changesOut>
                             <controlDir>${basedir}/src/deb/control</controlDir>
                             <dataSet>
                                 <data>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/7496b4f0/launchers/marmotta-webapp/src/deb/control/control
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/deb/control/control b/launchers/marmotta-webapp/src/deb/control/control
index 103e14c..dc9a500 100644
--- a/launchers/marmotta-webapp/src/deb/control/control
+++ b/launchers/marmotta-webapp/src/deb/control/control
@@ -6,6 +6,7 @@ Architecture: all
 Distribution: ldstack-nightly
 Maintainer: Sergio Fernández <wikier@apache.org>
 Depends: tomcat7 (>=7.0.30-1)
+Replaces: marmotta-webapp
 Description: Apache Marmotta is an Open Platform for Linked Data
  The goal of Apache Marmotta is to provide an open implementation of a Linked 
  Data Platform that can be used, extended and deployed easily by organizations 


Mime
View raw message