The following commit has been merged in the master branch:
commit 5c545c87a717eb284ae9f86b13644e1dfddc7255
Author: Felix Natter
Date: Tue Feb 19 10:51:06 2013 +0100
change version number in changelog
diff --git a/debian/changelog b/debian/changelog
index eeaf33e..0e95d79 100644
--- a
The following commit has been merged in the master branch:
commit b2169e99416a2dffc37afe58973d9375494ec65f
Author: Felix Natter
Date: Tue Feb 19 10:45:04 2013 +0100
Imported Upstream version 1.2.20+dfsg1
diff --git
a/freeplane_framework/launcher_build/org/freeplane/launcher
The following commit has been merged in the master branch:
commit 918b4ae30a0d15e0105c03fce5a8eb8bdf4e529c
Merge: 0ba4b1a4eba1f56251aa9e14b3f196f422b0614b
b2169e99416a2dffc37afe58973d9375494ec65f
Author: Felix Natter
Date: Tue Feb 19 10:45:12 2013 +0100
Merge tag 'upstream/1.2.20+
The following commit has been merged in the master branch:
commit 4b7594af3ed82415d4558a4e41e1b4af931f326a
Author: Felix Natter
Date: Sat Jan 19 13:39:36 2013 +0100
Update dependencies
diff --git a/debian/control b/debian/control
index db3f0fc..869f836 100644
--- a/debian/control
+++ b
The following commit has been merged in the master branch:
commit d056ed22ccfeaff5e6775c9091d5f5930aebaa04
Author: Felix Natter
Date: Sat Jan 19 18:56:31 2013 +0100
Fix jsyntaxpane.jar location
diff --git a/debian/patches/90_fix_jsyntaxpane_location.patch
b/debian/patches
The following commit has been merged in the master branch:
commit cd95bc1640b7f56bda88f1ab45959af5502fc069
Author: Felix Natter
Date: Sat Jan 19 13:24:33 2013 +0100
Update changelog for 1.2.20
diff --git a/debian/changelog b/debian/changelog
index ec3c642..eeaf33e 100644
--- a/debian
The following commit has been merged in the master branch:
commit 6d625739453cede221a8aac22a722637220ed71c
Merge: 76e7a2af82fd18ea29e189f92d3c101fff40b8dd
a81507e178f557c3682cdb5c0bb58c12ce635223
Author: Felix Natter
Date: Fri Jan 18 13:37:25 2013 +0100
Merge tag 'upstream/1
The following commit has been merged in the master branch:
--
freeplane packaging
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
The following commit has been merged in the master branch:
commit ed185b39a3945ef8545ab4b0c20d43cf21488d1e
Author: Felix Natter
Date: Wed Apr 3 20:17:21 2013 +0200
make debian/changelog more elaborate
diff --git a/debian/changelog b/debian/changelog
index 1d55ea0..21140c0 100644
--- a
The following commit has been merged in the master branch:
commit 1c6b7720844fb01108b1b4d60b4b5b00e383b720
Author: Felix Natter
Date: Sun Mar 31 14:28:52 2013 +0200
debian/copyright: Small fix for "cme check dpkg-copyright"
diff --git a/debian/copyright b/debian/copyright
ind
The following commit has been merged in the pristine-tar branch:
commit 15fb394e09ce4fa19703cccd28b2f528e9de68c5
Author: Felix Natter
Date: Sat Mar 2 13:32:54 2013 +0100
pristine-tar data for simplyhtml_0.16.07.orig.tar.gz
diff --git a/simplyhtml_0.16.07.orig.tar.gz.delta
b
The following commit has been merged in the master branch:
commit f117466d2a7356ddb2a02b90dcad298de47e93d5
Author: Felix Natter
Date: Sat Mar 2 13:43:01 2013 +0100
fix email address in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 6a67a0b..1d55ea0 100644
--- a
The following commit has been merged in the master branch:
commit fabba8e6acf56102ff96f71795b98c11628ff587
Author: Felix Natter
Date: Sat Mar 2 13:39:26 2013 +0100
update changelog for 0.16.07
diff --git a/debian/changelog b/debian/changelog
index 7f9e1fb..6a67a0b 100644
--- a/debian
The following commit has been merged in the master branch:
commit 36b02580b7d6b0b207a813c51f3ab7702deacfe9
Author: Felix Natter
Date: Sat Mar 2 13:38:03 2013 +0100
update debian/* for 0.16.07
diff --git a/debian/install b/debian/install
index 54c4fd9..f4a8ffb 100644
--- a/debian/install
The following commit has been merged in the master branch:
commit e04547343af42ba28533c7dc999c3b8dbe078f81
Merge: 93fada5c5146cf070b13c9a7898fd5bc6abdfb3e
dfb87eeefdfd3421f277fe975459a85bca72d853
Author: Felix Natter
Date: Sat Mar 2 13:32:54 2013 +0100
Merge tag 'upstream/0.
The following commit has been merged in the master branch:
commit dfb87eeefdfd3421f277fe975459a85bca72d853
Author: Felix Natter
Date: Sat Mar 2 13:32:53 2013 +0100
Imported Upstream version 0.16.07
diff --git a/src/build.xml b/src/build.xml
index 2f08058..a8ec43a 100644
--- a/src
The annotated tag, upstream/0.16.07 has been created
at 3a89c864079c7ae04ef5faf4b54f0c10bbb45790 (tag)
tagging dfb87eeefdfd3421f277fe975459a85bca72d853 (commit)
replaces upstream/0.16.05
tagged by Felix Natter
on Sat Mar 2 13:32:54 2013 +0100
- Shortlog
The following commit has been merged in the master branch:
commit 93fada5c5146cf070b13c9a7898fd5bc6abdfb3e
Author: Felix Natter
Date: Sun Feb 24 12:33:27 2013 +0100
include classpath in SimplyHTML.jar instead of in simplyhtml.sh (fixes
lintian "missing-classpath" warning)
di
The following commit has been merged in the master branch:
commit 1bf897761abbeed9bf838db4b6958c5b2e1d322b
Author: Felix Natter
Date: Sun Feb 24 12:24:26 2013 +0100
fix typo in debian/control
diff --git a/debian/control b/debian/control
index 11f8278..eb85363 100644
--- a/debian/control
The following commit has been merged in the master branch:
commit 2642d23ad02f19422fa15bec2157b8fbc5899abf
Author: Felix Natter
Date: Thu Feb 21 15:27:50 2013 +0100
fix lintian "codeless jar" warning by creating SimplyHTMLHelp-XX.jar
without a manifest
diff --git a/debi
The following commit has been merged in the master branch:
commit 0c5ca644c93bdc0f7e62e6e2e35817a234221a7f
Author: Felix Natter
Date: Thu Feb 21 15:11:29 2013 +0100
extend simplyhtml-doc description to satisfy lintian
diff --git a/debian/control b/debian/control
index f6f7f8b..11f8278
The following commit has been merged in the master branch:
commit 9b9ba131f52efa2c59ea548b3b0cb344d0219d94
Author: Felix Natter
Date: Thu Feb 21 14:30:01 2013 +0100
add patch descriptions
diff --git a/debian/patches/10_build_xml.patch
b/debian/patches/10_build_xml.patch
index d116ca1
The following commit has been merged in the master branch:
commit d16e60b0f26bc0bf40ef047f3a03ec0e2de8a22b
Author: Felix Natter
Date: Thu Feb 21 14:16:03 2013 +0100
update debian/copyright to copyright-format/1.0
diff --git a/debian/copyright b/debian/copyright
index 6d430e4..fe0a837
The following commit has been merged in the master branch:
commit e6f1f5a54d2ea761ba38e4c50f183fda91090109
Author: Felix Natter
Date: Tue Feb 19 12:44:35 2013 +0100
update copyright
diff --git a/debian/copyright b/debian/copyright
index dd8415f..6d430e4 100644
--- a/debian/copyright
+++ b
The following commit has been merged in the master branch:
commit 84ab039cb2a2651a2ca0c65f94cceb617eedd958
Author: Felix Natter
Date: Wed Jan 30 22:05:55 2013 +0100
Avoid this release being flagged as NMU
diff --git a/debian/README.source b/debian/README.source
index bbb21a6..e77c76b
The following commit has been merged in the master branch:
commit 88ea8f5e239c0c63a5b8fc9fd2586874a7f92168
Author: Felix Natter
Date: Tue Feb 19 12:44:07 2013 +0100
bump standards version to 3.9.4 (no changes)
diff --git a/debian/control b/debian/control
index 38905ee..f6f7f8b 100644
The following commit has been merged in the master branch:
commit d98428e33e3e5a09e6db0e6b1febd94aec1f1e82
Author: Felix Natter
Date: Fri Jan 25 20:43:12 2013 +0100
Vcs-Svn -> Vcs-Git
diff --git a/debian/control b/debian/control
index 256c992..05ea954 100644
--- a/debian/control
++
The following commit has been merged in the master branch:
commit 98dd490ba5d9914c636c12a3b6fc2500522236f8
Author: Felix Natter
Date: Wed Feb 20 18:09:20 2013 +0100
set standards version to 3.9.4 (no changes)
diff --git a/debian/control b/debian/control
index 2ab042e..a9da877 100644
--- a
The following commit has been merged in the master branch:
commit 69e22371c9108097af0517dd6551a2625649e5a3
Author: Felix Natter
Date: Wed Feb 20 17:54:55 2013 +0100
document hack for including META-INF/**
diff --git a/debian/rules b/debian/rules
index c485bc9..e92cea0 100755
--- a/debian
The following commit has been merged in the master branch:
commit 5c1b4916a068f0c1423dd48b507486253aa19a47
Author: Felix Natter
Date: Wed Feb 20 17:42:37 2013 +0100
add a dummy debian/watch file stating that there are no upstream releases
diff --git a/debian/watch b/debian/watch
new file
The following commit has been merged in the master branch:
commit 030211da866ad62fc25c80c667549d0395213d82
Author: Felix Natter
Date: Sat Feb 9 20:21:14 2013 +0100
include META-INF/** in jar (needed for umlet and freeplane)
diff --git a/debian/rules b/debian/rules
index b665c9f..c485bc9
The branch, pristine-tar has been created
at a23b3c8d36658d90b8004525759546ac9cd8bdbf (commit)
- Shortlog
commit a23b3c8d36658d90b8004525759546ac9cd8bdbf
Author: Felix Natter
Date: Mon Jan 21 20:30:58 2013 +0100
The branch, upstream has been created
at cc8733fd3572cae5d12d7d189c1b7ee879520b47 (commit)
- Shortlog
---
--
simplyhtml packaging
___
The following commit has been merged in the master branch:
commit c469769fb5f476f71252284129c5abb72f1df076
Author: Felix Natter
Date: Mon Jan 21 20:48:27 2013 +0100
Update README.source
diff --git a/debian/README.source b/debian/README.source
index 33aa631..bbb21a6 100644
--- a/debian
The following commit has been merged in the master branch:
commit eeb734822f5a60e811b91148a1b49f60694ea197
Merge: aeb8ec87e15f33057c4946f681dc05c274b0a818
cc8733fd3572cae5d12d7d189c1b7ee879520b47
Author: Felix Natter
Date: Mon Jan 21 20:30:58 2013 +0100
Merge tag 'upstream/0.
The following commit has been merged in the master branch:
commit 536db0019692c48569a3c55df384c088fd509c47
Author: Felix Natter
Date: Mon Jan 21 21:30:55 2013 +0100
add changelog entry for 0.16.05-2
diff --git a/debian/changelog b/debian/changelog
index fde099d..526b9f2 100644
--- a
The following commit has been merged in the master branch:
commit 38578772f391dbaef2ebde2398d4641bb3fd7f10
Author: Felix Natter
Date: Mon Jan 21 21:23:23 2013 +0100
require Java 5
diff --git a/debian/ant.properties b/debian/ant.properties
index 6a20228..7385c7f 100644
--- a/debian
The following commit has been merged in the master branch:
commit 300ffa131d8070764911e6bdbd59d1c75fe28e80
Author: Felix Natter
Date: Mon Jan 21 20:36:47 2013 +0100
add .pc to .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..4ecbc3e
--- /dev/null
+++ b
The following commit has been merged in the master branch:
--
simplyhtml packaging
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
The annotated tag, upstream/0.16.05 has been created
at e1fb8128bc487c624c82d736b067223827f88045 (tag)
tagging cc8733fd3572cae5d12d7d189c1b7ee879520b47 (commit)
tagged by Felix Natter
on Mon Jan 21 20:30:58 2013 +0100
- Shortlog
Author: fnatter-guest
Date: 2013-01-21 19:14:47 + (Mon, 21 Jan 2013)
New Revision: 16387
Added:
trunk/simplyhtml/README_MOVED_TO_GIT
Log:
added a notice that this package has been moved to git
Added: trunk/simplyhtml/README_MOVED_TO_GIT
=
Author: fnatter-guest
Date: 2012-12-02 18:35:07 + (Sun, 02 Dec 2012)
New Revision: 16370
Added:
trunk/freeplane/README_MOVED_TO_GIT
Log:
add a notice that this package has been moved to git
Added: trunk/freeplane/README_MOVED_TO_GIT
=
601 - 642 of 642 matches
Mail list logo