From 550d6e401f10357df339ff94408371c526d6ef3f Mon Sep 17 00:00:00 2001
From: alron <alron@bloodmagic.com>
Date: Wed, 23 Feb 2011 19:14:46 -0800
Subject: [PATCH] Moved assembly file into more maven consistent location.

---
 pom.xml                                        | 2 +-
 assembly.xml => src/main/assembly/assembly.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename assembly.xml => src/main/assembly/assembly.xml (93%)

diff --git a/pom.xml b/pom.xml
index 8069006a..69c589d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
     				<descriptors>
-        				<descriptor>assembly.xml</descriptor>
+        				<descriptor>src/main/assembly/package.xml</descriptor>
     				</descriptors>
 				</configuration>
 				<executions>
diff --git a/assembly.xml b/src/main/assembly/assembly.xml
similarity index 93%
rename from assembly.xml
rename to src/main/assembly/assembly.xml
index c7d25f5a..6beca938 100644
--- a/assembly.xml
+++ b/src/main/assembly/assembly.xml
@@ -1,5 +1,5 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>build</id>
+  <id>bin</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
     <format>tar.bz2</format>
@@ -13,7 +13,7 @@
         <include>README*</include>
         <include>LICENSE*</include>
         <include>NOTICE*</include>
-        <include>LICENSE*</include>
+        <include>CHANGELOG*</include>
       </includes>
     </fileSet>
     <fileSet>