Author: hibou
Date: Tue Aug 10 16:14:20 2010
New Revision: 984104
URL: http://svn.apache.org/viewvc?rev=984104&view=rev
Log:
merge r984103 : Now we have tar.gz and not tgz files
Modified:
ant/ivy/ivyde/branches/2.1.0/ (props changed)
ant/ivy/ivyde/branches/2.1.0/NOTICE (props changed)
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
(props changed)
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
(props changed)
ant/ivy/ivyde/branches/2.1.0/signArtifacts.sh
ant/ivy/ivyde/branches/2.1.0/verifyArtifacts.sh
Propchange: ant/ivy/ivyde/branches/2.1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 16:14:20 2010
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk:984097
+/ant/ivy/ivyde/trunk:984097,984103
Propchange: ant/ivy/ivyde/branches/2.1.0/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 16:14:20 2010
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk/NOTICE:905370-956580,984097
+/ant/ivy/ivyde/trunk/NOTICE:905370-956580,984097,984103
Propchange:
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 16:14:20 2010
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF:917155,984097
+/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF:917155,984097,984103
Propchange:
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 16:14:20 2010
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java:905370-950981,984097
+/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java:905370-950981,984097,984103
Modified: ant/ivy/ivyde/branches/2.1.0/signArtifacts.sh
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.1.0/signArtifacts.sh?rev=984104&r1=984103&r2=984104&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.1.0/signArtifacts.sh (original)
+++ ant/ivy/ivyde/branches/2.1.0/signArtifacts.sh Tue Aug 10 16:14:20 2010
@@ -20,4 +20,4 @@
read -s -p "Key passphrase: " passphrase
for i in dist/apache-ivyde-*.zip; do gpg --passphrase "$passphrase" --output
$i.asc --detach-sig --armor $i; done
-for i in dist/apache-ivyde-*.tgz; do gpg --passphrase "$passphrase" --output
$i.asc --detach-sig --armor $i; done
+for i in dist/apache-ivyde-*.tar.gz; do gpg --passphrase "$passphrase"
--output $i.asc --detach-sig --armor $i; done
Modified: ant/ivy/ivyde/branches/2.1.0/verifyArtifacts.sh
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.1.0/verifyArtifacts.sh?rev=984104&r1=984103&r2=984104&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.1.0/verifyArtifacts.sh (original)
+++ ant/ivy/ivyde/branches/2.1.0/verifyArtifacts.sh Tue Aug 10 16:14:20 2010
@@ -18,4 +18,4 @@
# under the License.
for i in dist/apache-ivyde-*.zip; do gpg --verify $i.asc; done
-for i in dist/apache-ivyde-*.tgz; do gpg --verify $i.asc; done
+for i in dist/apache-ivyde-*.tar.gz; do gpg --verify $i.asc; done
