[Git][java-team/dd-plist][master] 7 commits: Remove the IntelliJ files from the upstream tarball
Emmanuel Bourg
gitlab at salsa.debian.org
Thu May 17 14:23:38 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / dd-plist
Commits:
70fb130b by Emmanuel Bourg at 2018-05-17T14:56:54+02:00
Remove the IntelliJ files from the upstream tarball
- - - - -
249a5257 by Emmanuel Bourg at 2018-05-17T14:57:19+02:00
Removed the deprecated get-orig-source target in debian/rules
- - - - -
c03abe00 by Emmanuel Bourg at 2018-05-17T15:08:06+02:00
Added more upstream contributors to debian/copyright
- - - - -
a629ab4c by Emmanuel Bourg at 2018-05-17T15:16:37+02:00
New upstream version 1.20
- - - - -
d19aa145 by Emmanuel Bourg at 2018-05-17T15:16:37+02:00
Update upstream source from tag 'upstream/1.20'
Update to upstream version '1.20'
with Debian dir 1aa95e5dce40aa57fec37e4117dd5b116e18a83c
- - - - -
1c56ba5d by Emmanuel Bourg at 2018-05-17T15:21:18+02:00
Clean the test files
- - - - -
ef1e32f6 by Emmanuel Bourg at 2018-05-17T15:21:35+02:00
Upload to unstable
- - - - -
15 changed files:
- − .idea/.name
- − .idea/compiler.xml
- − .idea/copyright/profiles_settings.xml
- − .idea/encodings.xml
- − .idea/misc.xml
- − .idea/modules.xml
- − .idea/scopes/scope_settings.xml
- − .idea/vcs.xml
- − .travis.yml
- − dd-plist.iml
- debian/changelog
- + debian/clean
- debian/copyright
- debian/rules
- debian/watch
Changes:
=====================================
.idea/.name deleted
=====================================
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-dd-plist
\ No newline at end of file
=====================================
.idea/compiler.xml deleted
=====================================
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
- <resourceExtensions />
- <wildcardResourcePatterns>
- <entry name="!?*.java" />
- <entry name="!?*.form" />
- <entry name="!?*.class" />
- <entry name="!?*.groovy" />
- <entry name="!?*.scala" />
- <entry name="!?*.flex" />
- <entry name="!?*.kt" />
- <entry name="!?*.clj" />
- </wildcardResourcePatterns>
- <annotationProcessing>
- <profile default="true" name="Default" enabled="false">
- <processorPath useClasspath="true" />
- </profile>
- <profile default="false" name="Maven default annotation processors profile" enabled="true">
- <sourceOutputDir name="target/generated-sources/annotations" />
- <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
- <outputRelativeToContentRoot value="true" />
- <processorPath useClasspath="true" />
- <module name="dd-plist" />
- </profile>
- </annotationProcessing>
- <bytecodeTargetLevel>
- <module name="dd-plist" target="1.6" />
- </bytecodeTargetLevel>
- </component>
-</project>
\ No newline at end of file
=====================================
.idea/copyright/profiles_settings.xml deleted
=====================================
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
- <settings default="" />
-</component>
\ No newline at end of file
=====================================
.idea/encodings.xml deleted
=====================================
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
- <file url="file://$PROJECT_DIR$" charset="UTF-8" />
- <file url="PROJECT" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
=====================================
.idea/misc.xml deleted
=====================================
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ClientPropertiesManager">
- <properties class="javax.swing.AbstractButton">
- <property name="hideActionText" class="java.lang.Boolean" />
- </properties>
- <properties class="javax.swing.JComponent">
- <property name="html.disable" class="java.lang.Boolean" />
- </properties>
- <properties class="javax.swing.JEditorPane">
- <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
- <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
- <property name="charset" class="java.lang.String" />
- </properties>
- <properties class="javax.swing.JList">
- <property name="List.isFileList" class="java.lang.Boolean" />
- </properties>
- <properties class="javax.swing.JPasswordField">
- <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
- </properties>
- <properties class="javax.swing.JSlider">
- <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
- <property name="JSlider.isFilled" class="java.lang.Boolean" />
- </properties>
- <properties class="javax.swing.JTable">
- <property name="Table.isFileList" class="java.lang.Boolean" />
- <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
- <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
- </properties>
- <properties class="javax.swing.JToolBar">
- <property name="JToolBar.isRollover" class="java.lang.Boolean" />
- </properties>
- <properties class="javax.swing.JTree">
- <property name="JTree.lineStyle" class="java.lang.String" />
- </properties>
- <properties class="javax.swing.text.JTextComponent">
- <property name="caretAspectRatio" class="java.lang.Double" />
- <property name="caretWidth" class="java.lang.Integer" />
- </properties>
- </component>
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
- <OptionsSetting value="true" id="Add" />
- <OptionsSetting value="true" id="Remove" />
- <OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
- <OptionsSetting value="true" id="Status" />
- <OptionsSetting value="true" id="Edit" />
- <ConfirmationsSetting value="0" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/classes" />
- </component>
-</project>
\ No newline at end of file
=====================================
.idea/modules.xml deleted
=====================================
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/dd-plist.iml" filepath="$PROJECT_DIR$/dd-plist.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
=====================================
.idea/scopes/scope_settings.xml deleted
=====================================
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
- <state>
- <option name="SKIP_IMPORT_STATEMENTS" value="false" />
- </state>
-</component>
\ No newline at end of file
=====================================
.idea/vcs.xml deleted
=====================================
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
=====================================
.travis.yml deleted
=====================================
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: java
-jdk:
- - oraclejdk8
-install: true
-script: mvn test
\ No newline at end of file
=====================================
dd-plist.iml deleted
=====================================
--- a/dd-plist.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
- </component>
-</module>
\ No newline at end of file
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-dd-plist (1.20-1) UNRELEASED; urgency=medium
+dd-plist (1.20-1) unstable; urgency=medium
* Initial release. (Closes: #898910)
- -- Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com> Mon, 14 May 2018 15:26:42 +0800
+ -- Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com> Thu, 17 May 2018 15:21:25 +0200
=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,8 @@
+test-files/out-test1-ascii-gnustep.plist
+test-files/out-test1-ascii.plist
+test-files/out-testBinary.plist
+test-files/out-testIssue18.plist
+test-files/out-testIssue22-xml.plist
+test-files/out-testIssue22.plist
+test-files/out-testIssue7.plist
+test-files/out-testXml.plist
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,15 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Source: https://github.com/3breadt/dd-plist
+Files-Excluded: .idea
+ .travis.yml
+ *.iml
Files: *
Copyright: 2011-2017, Daniel Dreibrodt
+ 2011, Keith Randall
+ 2015, Sergio R. Lumley
+ 2016, David Solin
+ 2016, Mohamed Ezzat
License: MIT
Files: debian/*
@@ -26,4 +33,4 @@ License: MIT
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
\ No newline at end of file
+ SOFTWARE.
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,3 @@
%:
dh $@ --buildsystem=maven
-
-get-orig-source:
- uscan --download-current-version --force-download --repack --compression xz
\ No newline at end of file
=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=4
-https://github.com/3breadt/dd-plist/tags /3breadt/dd-plist/archive/dd-plist at ANY_VERSION@@ARCHIVE_EXT@
\ No newline at end of file
+opts="repack,compression=xz" \
+https://github.com/3breadt/dd-plist/tags /3breadt/dd-plist/archive/dd-plist at ANY_VERSION@@ARCHIVE_EXT@
View it on GitLab: https://salsa.debian.org/java-team/dd-plist/compare/380c7128f008477810c2b90fe78fb9a5f1be580b...ef1e32f6a2dfba845c4e3952bcf5075263c19dfd
---
View it on GitLab: https://salsa.debian.org/java-team/dd-plist/compare/380c7128f008477810c2b90fe78fb9a5f1be580b...ef1e32f6a2dfba845c4e3952bcf5075263c19dfd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180517/3a392913/attachment.html>
More information about the pkg-java-commits
mailing list