Merge branch 'master' of https://github.com/tcurdt/jdeb

Conflicts:
	docs/maven.md
	src/main/java/org/vafer/jdeb/producers/DataProducerFile.java

docs/maven.md

@@ -113,6 +113,7 @@ type             | Type of the data source. (archive, directory, file, link, man
 missingSrc       | Fail if src file/folder is missing (ignore or fail)                             | No; defaults to `fail`
 includes         | A comma seperated list of files to include from the directory or tarball        | No; defaults to all files
 excludes         | A comma seperated list of files to exclude from the directory or tarball        | No; defaults to no exclutions
+conffile         | A boolean value to define if the files should be included in the conffiles      | No; defaults to `false`
 mapper           | The files to exclude from the directory or tarball                              | No
 paths/(path..)   | One or more string literal paths that will created in the package               | No; Yes for type `template`
 
@@ -222,6 +223,19 @@ include a directory, a tarball, and a file in your deb package and then sign it
                   <type>man-page</type>
                   <src>/a/path/to/manpage.1</src>
                 </data>
+
+                <!-- Conffiles example -->
+                <data>
+                  <src>${project.build.directory}/data</src>
+                  <type>directory</type>
+                  <includes/>
+                  <excludes>**/.svn</excludes>
+                  <conffile>true</conffile>
+                  <mapper>
+                    <type>ls</type>
+                    <src>mapping.txt</src>
+                  </mapper>
+                </data>
               </dataSet>
 
             </configuration>