The following commit has been merged in the master branch:
commit 4cb76844030657036f79d55c2b52aa3e5f1b4186
Author: David Paleino da...@debian.org
Date: Thu Mar 8 08:18:44 2012 +0100
Updated debian/copyright
diff --git a/debian/changelog b/debian/changelog
index 76207d4..a862115 100644
The following commit has been merged in the master branch:
commit 4c2539b8383cfdfc5782eca9b929ce43015f8d75
Author: David Paleino da...@debian.org
Date: Thu Mar 8 08:10:50 2012 +0100
Drop junit4 workaround: now Debian has 4.10
diff --git a/debian/changelog b/debian/changelog
index f994577
The following commit has been merged in the master branch:
commit b69bad0f973b8968ebcd5dde509c059a234d98d1
Author: David Paleino da...@debian.org
Date: Thu Mar 8 08:23:46 2012 +0100
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index a862115..3abb463 100644
--- a/debian
The annotated tag, debian/0.40.1+ds1-4 has been created
at 0385a181f18d82fb1f3e8fd3d273c9526c005c14 (tag)
tagging b69bad0f973b8968ebcd5dde509c059a234d98d1 (commit)
replaces debian/0.40.1+ds1-3
tagged by David Paleino
on Thu Mar 8 08:34:14 2012 +0100
- Shortlog
The following commit has been merged in the master branch:
commit c057010a767a6819c79b8c6700cacf9213b24652
Author: David Paleino da...@debian.org
Date: Fri Feb 10 21:19:41 2012 +0100
Switch dependency from libpg-java to libpostgresql-jdbc-java (Closes:
#659399)
diff --git a/debian
The following commit has been merged in the master branch:
commit 0df24b189a74def28541c8e689e3f2a889d5a3b6
Merge: 28e7af80a5429406a99c41bef752482a5a3d71ac
3b2ab36dd047594ab51ceea12d88ebfc23809638
Author: David Paleino da...@debian.org
Date: Thu Feb 2 11:07:00 2012 +0100
Merge tag 'upstream
The following commit has been merged in the master branch:
commit 1591465c3d2afa41b304df885b2d5f6adcb57dd8
Author: David Paleino da...@debian.org
Date: Thu Feb 2 11:07:52 2012 +0100
New tested snapshot
diff --git a/debian/changelog b/debian/changelog
index a40ef8b..51b138b 100644
The following commit has been merged in the master branch:
commit 3d26fa57c23548e80d866c63b99446366522008e
Author: David Paleino da...@debian.org
Date: Thu Feb 2 11:56:44 2012 +0100
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 51b138b..3db2f29 100644
--- a/debian
The following commit has been merged in the pristine-tar branch:
commit 808e90a2d2cf86e24aa209db3d1c28741a32e4f2
Author: David Paleino da...@debian.org
Date: Thu Feb 2 11:06:56 2012 +0100
pristine-tar data for josm_0.0.svn4878+dfsg1.orig.tar.gz
diff --git a/josm_0.0.svn4878+dfsg1
The following commit has been merged in the master branch:
commit 284873b21cc863b1c68bde9f8ce62aec663c0e69
Author: David Paleino da...@debian.org
Date: Thu Feb 2 11:11:27 2012 +0100
Patches refreshed
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 0e9a3e0
The annotated tag, debian/0.0.svn4667+dfsg1-3 has been created
at 5ddd07f5b73012c137c9981709dfcf15f2f30c9d (tag)
tagging 28e7af80a5429406a99c41bef752482a5a3d71ac (commit)
replaces debian/0.0.svn4667+dfsg1-2
tagged by David Paleino
on Tue Jan 31 11:29:53 2012 +0100
The annotated tag, debian/0.0.svn4878+dfsg1-1 has been created
at 0a849b6582eee62fb5c73a7173eb59c0e9e4ec3a (tag)
tagging 3d26fa57c23548e80d866c63b99446366522008e (commit)
replaces debian/0.0.svn4667+dfsg1-3
tagged by David Paleino
on Thu Feb 2 11:56:52 2012 +0100
The following commit has been merged in the master branch:
commit 2ff366484cb80d73c697b7960947838c1ce59eac
Merge: 198feba0a8513e42111dcb74b56d64d36ab8ccc3
b84f1b92430604f4c2e0469fd8473dea6679622c
Author: David Paleino da...@debian.org
Date: Thu Feb 2 11:57:24 2012 +0100
Merge tag 'upstream
The following commit has been merged in the master branch:
commit 6683763aa6a3e8153d01f56ba5e555821dcc9715
Author: David Paleino da...@debian.org
Date: Thu Feb 2 11:57:43 2012 +0100
New upstream snapshot
diff --git a/debian/changelog b/debian/changelog
index f73056c..c2b9080 100644
The annotated tag, debian/0.0.svn27676+ds1-1 has been created
at 50ac886b1281c4986f81f998e504f27f2d44aad0 (tag)
tagging e640f1a39a7ddc9b2e4124cffda8cc4c90488547 (commit)
replaces debian/0.0.svn27285+ds1-1
tagged by David Paleino
on Thu Feb 2 12:02:09 2012 +0100
The annotated tag, upstream/0.0.svn27676+ds1 has been created
at 9329668ecf1d251b960611c12baf3b2b6c8939b5 (tag)
tagging b84f1b92430604f4c2e0469fd8473dea6679622c (commit)
replaces upstream/0.0.svn27285+ds1
tagged by David Paleino
on Thu Feb 2 11:57:24 2012 +0100
The annotated tag, debian/0.0.2014-ga147fb1-1 has been deleted
was dc18df39a7fe19c252c2357a721b6bc8050e09a1
---
tag debian/0.0.2014-ga147fb1-1
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11
The following commit has been merged in the master branch:
commit 4bd352baa7715f39ce782e8917a78030881f98da
Author: David Paleino da...@debian.org
Date: Tue Jan 31 16:29:09 2012 +0100
Fix again the patch
diff --git a/debian/patches/01-fix_ld--as-needed.patch
b/debian/patches/01-fix_ld
The annotated tag, debian/0.0_2014-ga147fb1-1 has been created
at 86c080ed05a62b3726167ebe75a72b45f92f7c77 (tag)
tagging 65633d4de750b0686129ade4858ba40a5c625a32 (commit)
replaces upstream/0.0_2014-ga147fb1
tagged by David Paleino
on Tue Jan 31 16:52:51 2012
The annotated tag, debian/0.0_20111213-g7f3500a-1 has been created
at e0cb726c0e3ea10e2095de127a036d3124450646 (tag)
tagging 0eb115ef068b7d657383399163375a688022d72b (commit)
replaces debian/0.0_2014-ga147fb1-1
tagged by David Paleino
on Tue Jan 31 16:52:25 2012
The following commit has been merged in the master branch:
commit ab1d8a80143e699c8488ca45b9a717df5bfddb4e
Author: David Paleino da...@debian.org
Date: Thu Dec 29 19:01:10 2011 +0100
New upstream version
diff --git a/debian/changelog b/debian/changelog
index 2fee2a7..78de916 100644
The following commit has been merged in the pristine-tar branch:
commit c6b84fa4b157bbc569e0b0f868bbc2fb68af8e0c
Author: David Paleino da...@debian.org
Date: Thu Dec 29 19:00:30 2011 +0100
pristine-tar data for osmosis_0.40.1+ds1.orig.tar.gz
diff --git a/osmosis_0.40.1+ds1
The following commit has been merged in the master branch:
commit ce588360facb4fa605f52b6d6e10a58501a484a3
Merge: 02355795d73d5c0298298714ae9a7eb8560dc4b2
b7fba42dd2856b8891c4fc4fbb4a8dc637c8c156
Author: David Paleino da...@debian.org
Date: Thu Dec 29 19:00:31 2011 +0100
Merge commit
The annotated tag, upstream/0.40.1+ds1 has been created
at 075f8dbe2d9575be22fd42e965c4858d50de9313 (tag)
tagging b7fba42dd2856b8891c4fc4fbb4a8dc637c8c156 (commit)
replaces upstream/0.40+ds1
tagged by David Paleino
on Thu Dec 29 19:00:30 2011 +0100
- Shortlog
The following commit has been merged in the master branch:
commit c9e8aba7bdf004c579348c8f8d3d0db5edc150ff
Author: David Paleino da...@debian.org
Date: Thu Dec 29 21:37:34 2011 +0100
More files to clean
diff --git a/debian/clean b/debian/clean
index 18ccd18..ef7988d 100644
--- a/debian
The following commit has been merged in the master branch:
commit 43a89f9abaf4bd3742c3fd127b232140f0a8b923
Author: David Paleino da...@debian.org
Date: Fri Dec 30 00:25:22 2011 +0100
Add dependencies to libxerces2-java
diff --git a/debian/changelog b/debian/changelog
index faffc42..89f2297
The following commit has been merged in the master branch:
commit 5bf3caa7e5f46f958283982b50793edb64e235da
Author: David Paleino da...@debian.org
Date: Fri Dec 30 00:40:33 2011 +0100
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 89f2297..41c5fe9 100644
The following commit has been merged in the master branch:
commit e35ccd0e99c59405458a8b1ef9cee0485fafb5f2
Author: David Paleino da...@debian.org
Date: Mon Dec 26 18:48:02 2011 +0100
debian/patches/10-i18n-build.xml removed -- i18n directory isn't being
packaged anymore
diff --git
The following commit has been merged in the master branch:
commit cdaa445a53916354d6bd7a6e530657371e5112ee
Author: David Paleino da...@debian.org
Date: Mon Dec 26 18:52:03 2011 +0100
Bump JOSM requirement to 4666-7
diff --git a/debian/changelog b/debian/changelog
index ad46bff..62b4e6f
The following commit has been merged in the master branch:
commit 198feba0a8513e42111dcb74b56d64d36ab8ccc3
Author: David Paleino da...@debian.org
Date: Mon Dec 26 18:57:40 2011 +0100
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 38a1317..f73056c 100644
The following commit has been merged in the master branch:
commit 19694855f8c2c59a47ebe06a062ee6afcfb38b26
Author: David Paleino da...@debian.org
Date: Mon Dec 26 18:43:30 2011 +0100
Don't download i18n data anymore when creating new orig.tar.gz
diff --git a/debian/changelog b/debian
The following commit has been merged in the master branch:
commit 10f35abf757bb967faaca3f20fd16d7a60306ddb
Author: David Paleino da...@debian.org
Date: Mon Dec 26 18:47:32 2011 +0100
New upstream snapshot
diff --git a/debian/changelog b/debian/changelog
index 41cfa7e..a142e0c 100644
The annotated tag, debian/0.0.svn27285+ds1-1 has been created
at 6f5bdafdbcb32bc149c13f16d001a6a8121eaa43 (tag)
tagging 198feba0a8513e42111dcb74b56d64d36ab8ccc3 (commit)
replaces debian/0.0.svn26626+ds1-2
tagged by David Paleino
on Mon Dec 26 19:03:44 2011 +0100
The annotated tag, upstream/0.0.svn27285+ds1 has been created
at 7db87b6a3ca0f28e65a19347aad078d01d4b1a8f (tag)
tagging b525f93598a3ac55e2cfe01f81a78e5125427765 (commit)
replaces upstream/0.0.svn26626+ds1
tagged by David Paleino
on Mon Dec 26 18:46:11 2011 +0100
The following commit has been merged in the pristine-tar branch:
commit b23ff1cfb0758be3c0a9dd4d58cbae6e0871ed5f
Author: David Paleino da...@debian.org
Date: Mon Dec 26 18:46:11 2011 +0100
pristine-tar data for josm-plugins_0.0.svn27285+ds1.orig.tar.gz
diff --git a/josm-plugins_0.0
The following commit has been merged in the master branch:
commit 3a964eac7ce5d212f0198a324f6e48bcdee91774
Merge: db4288ec67e282044a2102d925f3ab30fe479ed0
36667e35f942f0e4d9ff97f1db56d45fce6f6827
Author: David Paleino da...@debian.org
Date: Mon Dec 26 19:05:25 2011 +0100
Merge commit
The following commit has been merged in the master branch:
commit 51570dff8b43cc8be67654493fbbcd07f0038166
Author: David Paleino da...@debian.org
Date: Mon Dec 26 19:07:11 2011 +0100
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index bf88536..d426384 100644
The following commit has been merged in the pristine-tar branch:
commit 53a342db784fd65c6639c2a5641bca37c0d44b8c
Author: David Paleino da...@debian.org
Date: Mon Dec 26 19:05:24 2011 +0100
pristine-tar data for josm_0.0.svn4667+dfsg1.orig.tar.gz
diff --git a/josm_0.0.svn4667+dfsg1
The annotated tag, debian/0.0.svn4667+dfsg1-1 has been created
at 5628e81133fdf4f1a068c447471d107186de6ca0 (tag)
tagging 51570dff8b43cc8be67654493fbbcd07f0038166 (commit)
replaces debian/0.0.svn4666+dfsg1-1
tagged by David Paleino
on Mon Dec 26 19:07:19 2011 +0100
The following commit has been merged in the master branch:
commit 564e3891325f746e46d2ce00bdc00090e5b90d82
Author: David Paleino da...@debian.org
Date: Mon Dec 19 21:06:32 2011 +0100
Back to dfsg1
diff --git a/debian/rules b/debian/rules
index d007bfc..2e15a61 100755
--- a/debian/rules
The following commit has been merged in the master branch:
commit 9edf22a6219c0f0fec0382497bfef40913a86422
Author: David Paleino da...@debian.org
Date: Mon Dec 19 21:30:19 2011 +0100
Patches refreshed
diff --git a/debian/changelog b/debian/changelog
index 0e53f98..7144d30 100644
The annotated tag, debian/0.0.svn4666+dfsg1-1 has been created
at 3c3acc3e7ad25a306520b51471390ff4304b475d (tag)
tagging 88d4d0d522dcf815f81d6e4dc63a3f7749f3632c (commit)
replaces debian/0.0.svn4550+dfsg2-1
tagged by David Paleino
on Mon Dec 19 22:19:39 2011 +0100
The following commit has been merged in the master branch:
commit 9a22d4c2a0c90bbbd87ae0eaebb2965cc10fab98
Author: David Paleino da...@debian.org
Date: Sun Dec 11 20:09:24 2011 +0100
Fix dependency on OpenJDK 7 (Closes: #651731)
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the master branch:
commit 439c2a06519de4fee5f59db80010116ad339aac9
Author: David Paleino da...@debian.org
Date: Thu Dec 1 18:05:01 2011 +0100
Fix debian/watch and debian/rules' get-orig-source to point to github
diff --git a/debian/changelog b/debian
The following commit has been merged in the master branch:
commit 0b57ac3af8d59e8ce025c7c99c8d7fc63f2f8ddc
Author: David Paleino da...@debian.org
Date: Thu Dec 1 18:13:56 2011 +0100
New upstream version
diff --git a/debian/changelog b/debian/changelog
index 85317cd..684946a 100644
The following commit has been merged in the debian branch:
commit 3aa57d8b1b99f69691e569f8e611cc5646cb7bfa
Author: David Paleino da...@debian.org
Date: Mon Nov 14 11:01:50 2011 +0100
Added myself to Uploaders
diff --git a/debian/changelog b/debian/changelog
index b161b74..f4baa69 100644
The following commit has been merged in the debian branch:
commit f5262eec1ebbd135d20fe96a514466b0532073c8
Author: David Paleino da...@debian.org
Date: Mon Nov 14 11:02:59 2011 +0100
Added debian/watch file
diff --git a/debian/changelog b/debian/changelog
index f4baa69..6b52192 100644
The annotated tag, debian/0.0.2014-ga147fb1-1 has been created
at dc18df39a7fe19c252c2357a721b6bc8050e09a1 (tag)
tagging 65633d4de750b0686129ade4858ba40a5c625a32 (commit)
replaces upstream/0.0_2014-ga147fb1
tagged by David Paleino
on Mon Nov 14 21:11:48 2011
The following commit has been merged in the master branch:
commit 69edbd8f86656d12ebb4a8fe6775a7e5033917ab
Merge: fafcb2383e58be66f7676eb877df5f483d7a73cb
6a50d6e192bf2d610576ca39afb1b9a21842ec1c
Author: David Paleino da...@debian.org
Date: Sat Nov 5 16:54:59 2011 +0100
Merge commit
The following commit has been merged in the master branch:
commit fe3bdefa8adb5176f452d660dbd25755dbf4ef87
Author: David Paleino da...@debian.org
Date: Sat Nov 5 17:46:13 2011 +0100
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index b9af70a..e40f636 100644
--- a/debian
The following commit has been merged in the master branch:
commit 7730cbd3c487b747596fb37ab0ff9241174fbdf6
Author: David Paleino da...@debian.org
Date: Sat Nov 5 16:56:14 2011 +0100
New upstream version (Closes: #647634)
diff --git a/debian/changelog b/debian/changelog
index 2229a14
The following commit has been merged in the master branch:
commit 9014613eb716c374a29b1b5b91e31dc4f532b7d0
Author: David Paleino da...@debian.org
Date: Sat Nov 5 17:08:45 2011 +0100
Patches refreshed
diff --git a/debian/changelog b/debian/changelog
index af84939..b9af70a 100644
The following commit has been merged in the master branch:
commit de5e00f576973675f3812c8cca09d55e9a5222cc
Author: David Paleino da...@debian.org
Date: Sat Nov 5 18:23:35 2011 +0100
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index ca4f17a..8cb930e 100644
--- a/debian
The following commit has been merged in the master branch:
commit 4bc28d0aa29be35530d26fe1ffc56905d70881a2
Merge: 2f6e7c02fdccfe6667898d024f19977e59ac2742
21280d625c56794fb95d0fe4be92c82ba9493981
Author: David Paleino da...@debian.org
Date: Sat Nov 5 18:22:55 2011 +0100
Merge commit
The following commit has been merged in the master branch:
commit 2f6e7c02fdccfe6667898d024f19977e59ac2742
Author: David Paleino da...@debian.org
Date: Sat Nov 5 18:09:04 2011 +0100
Fix get-orig-source target to grab translations (Closes: #647721)
diff --git a/debian/changelog b/debian
The annotated tag, debian/0.39+ds1-6 has been created
at bf4a262baf0adf976fcc9965576adcb0cc95a908 (tag)
tagging a3352dc73b8ccf8b68de715f4e00bccc480ebece (commit)
replaces debian/0.39+ds1-5
tagged by David Paleino
on Wed Nov 2 22:02:12 2011 +0100
- Shortlog
The following commit has been merged in the master branch:
commit 7335b213f3d7a65cc7609ffd13294bb4f827055c
Author: David Paleino da...@debian.org
Date: Tue Oct 25 23:48:09 2011 +0200
Added debian/watch file
diff --git a/debian/changelog b/debian/changelog
index e67a516..4238870 100644
The annotated tag, debian/0.3-6 has been created
at cb83982791228451de850a7514c06a9bea4df68e (tag)
tagging 743d96f8a192033ce4fc1d73d005f60141b344e8 (commit)
replaces debian/0.3-5
tagged by David Paleino
on Tue Oct 25 23:24:49 2011 +0200
- Shortlog
The following commit has been merged in the master branch:
commit c4f42a00ae3e42d0cebb8b29eb700aa26791dffa
Author: David Paleino da...@debian.org
Date: Tue Oct 25 23:23:58 2011 +0200
Port code to Mapnik2 (Closes: #646452)
diff --git a/debian/changelog b/debian/changelog
index 93bbc42
The annotated tag, debian/2.3.2-2 has been created
at 13f88ba6c25c66656e7bda623c38fd1a94e68772 (tag)
tagging c0f620a97066e4f65312c16d3769c163a9a498f5 (commit)
replaces debian/2.3.2-1
tagged by David Paleino
on Fri Oct 14 00:05:14 2011 +0200
- Shortlog
The following commit has been merged in the master branch:
commit 57e34ce24dfbc8f273a887ac2f597a2e31d55d25
Author: David Paleino da...@debian.org
Date: Tue Oct 11 09:24:49 2011 +0200
Fix startup via josm exit, thanks to Alberto Fernández (Closes: #578624)
diff --git a/debian/changelog b
The following commit has been merged in the master branch:
commit cc16df65c698ed29e710f8fe9b80343366003ed6
Author: David Paleino da...@debian.org
Date: Tue Oct 11 09:31:12 2011 +0200
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 3c093ee..51517c1 100644
The annotated tag, debian/0.0.svn4487+dfsg2-2 has been created
at ba6be0662d0d42ed6155bf8aca0d51d95fb2d870 (tag)
tagging cc16df65c698ed29e710f8fe9b80343366003ed6 (commit)
replaces debian/0.0.svn4487+dfsg2-1
tagged by David Paleino
on Tue Oct 11 09:41:31 2011 +0200
The following commit has been merged in the master branch:
commit 93572362c20781a12984b7b9b0595e31c75cdcc0
Author: David Paleino da...@debian.org
Date: Tue Oct 11 22:10:57 2011 +0200
Fix paths for new server
diff --git a/bin/update-wiki b/bin/update-wiki
index e33a4da..52cab69 100755
The following commit has been merged in the master branch:
commit 710605f36a7899d0ad119d140f4113c100b2e7a5
Author: David Paleino da...@debian.org
Date: Tue Oct 11 23:18:04 2011 +0200
Cleanup generated files
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000
The following commit has been merged in the pristine-tar branch:
commit c47036cd49fc270c66f138842af080217ef067a6
Author: David Paleino da...@debian.org
Date: Tue Oct 11 23:07:41 2011 +0200
pristine-tar data for imposm_2.3.2.orig.tar.gz
diff --git a/imposm_2.3.2.orig.tar.gz.delta b
The following commit has been merged in the master branch:
commit 632966dbc8e0f9b76a05b428ee7bfef72a30c647
Author: David Paleino da...@debian.org
Date: Tue Oct 11 23:33:43 2011 +0200
It really is arch-dependent
diff --git a/debian/control b/debian/control
index f6dff24..564b576 100644
The following commit has been merged in the master branch:
commit b7d2851177dbe6869901c52be6c6852d006a41c6
Author: David Paleino da...@debian.org
Date: Tue Oct 11 23:35:26 2011 +0200
More missing B-D
diff --git a/debian/control b/debian/control
index 564b576..9b9d3b2 100644
--- a/debian
The following commit has been merged in the master branch:
commit 29f817a4cd6ab99ff6fc0266a4a9659db3a6379a
Author: David Paleino da...@debian.org
Date: Tue Oct 11 23:40:43 2011 +0200
Fix dependency relation
diff --git a/debian/control b/debian/control
index f740ab8..ec00ab0 100644
The following commit has been merged in the master branch:
commit 421fe79add859de2e4d6d9331b165dacfb4801b0
Author: David Paleino da...@debian.org
Date: Tue Oct 11 23:42:53 2011 +0200
Install SQL snippet to an appropriate place
diff --git a/debian/patches/00-fix_sql_path.patch
b/debian
The following commit has been merged in the master branch:
commit 1063592adccf5ab6df557ecae694d8e209d14714
Author: David Paleino da...@debian.org
Date: Tue Oct 11 23:46:46 2011 +0200
Really fix dependency
diff --git a/debian/control b/debian/control
index ec00ab0..ed6f5fb 100644
The following commit has been merged in the master branch:
commit cf67cb253b8046a03505c1d1c25175a3fb6206cb
Author: David Paleino da...@debian.org
Date: Sun Oct 9 13:15:12 2011 +0200
Fix dependency name
diff --git a/debian/control b/debian/control
index ab04760..1d132e7 100644
--- a/debian
The following commit has been merged in the master branch:
commit b130ba2e311eabd84f88fe6e8b337929c53019bc
Merge: cf67cb253b8046a03505c1d1c25175a3fb6206cb
2133caeb1400a821d3f6adcc26686b54d3056ff6
Author: David Paleino da...@debian.org
Date: Sun Oct 9 13:31:23 2011 +0200
Merge branch
The following commit has been merged in the master branch:
commit 394b0c1234ef54a004e6dbaf2f5dbc2576b16d7b
Author: David Paleino da...@debian.org
Date: Sun Oct 9 15:51:18 2011 +0200
Fix javascript compression
diff --git a/debian/rules b/debian/rules
index b03c1df..e050dfe 100755
The following commit has been merged in the master branch:
commit 098806fdce28984677d36cce508e4f6c34b34234
Author: David Paleino da...@debian.org
Date: Sun Oct 9 20:10:34 2011 +0200
Really fix log4j
diff --git a/debian/patches/01-fix_launcher.patch
b/debian/patches/01-fix_launcher.patch
The following commit has been merged in the master branch:
commit c2b1edc83983cad9ff5f5adc141b5ed321927bb1
Author: David Paleino da...@debian.org
Date: Sun Oct 9 20:11:43 2011 +0200
Osmosis configuration file is now set to /etc/osmosis/osmosis.conf (Closes:
#644841)
diff --git a/debian
The annotated tag, debian/0.39+ds1-5 has been created
at b2e02f75dbbdf5aeb7b35fe7b26f02f85f1f197e (tag)
tagging 21f19da2fecd5a3175cd3f6791e14ecf68269265 (commit)
replaces debian/0.39+ds1-4
tagged by David Paleino
on Sun Oct 9 20:24:00 2011 +0200
- Shortlog
The following commit has been merged in the master branch:
commit 3dce5905eb355b28fce946bacbd6e817b5beed39
Author: David Paleino da...@debian.org
Date: Sat Oct 8 22:49:00 2011 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index e94819b..cda872f 100644
The following commit has been merged in the pristine-tar branch:
commit 7737e5da50a468e7a82ccdd5882f248155cddde4
Author: David Paleino da...@debian.org
Date: Sat Oct 8 22:48:15 2011 +0200
pristine-tar data for josm_0.0.svn4487+dfsg2.orig.tar.gz
diff --git a/josm_0.0.svn4487+dfsg2
The following commit has been merged in the master branch:
commit 644a7e674ebe7203e306fd16873365b129501bac
Merge: 98b11e7ddf773350ad56ad92434c981d69977f53
4c3bd77da7abb87d57b7ea27a6a7ac454b96ca15
Author: David Paleino da...@debian.org
Date: Sat Oct 8 22:48:20 2011 +0200
Merge commit
The following commit has been merged in the master branch:
commit f6b29136bf65f90286caec9c31d11a529f1f59c1
Author: David Paleino da...@debian.org
Date: Sat Oct 8 23:23:57 2011 +0200
100-fix_SlippyMapBBoxChooser.patch added: class with missing methods and
accessing protected members
diff
The following commit has been merged in the master branch:
commit 77d2693025093c4f9e977160709ec136e4ce9a70
Author: David Paleino da...@debian.org
Date: Sat Oct 8 23:24:16 2011 +0200
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 7d09caa..94712ce 100644
--- a/debian
The annotated tag, debian/0.0.svn4487+dfsg2-1 has been created
at d60a112db3165d073eb204b534c3e73eb902aa3d (tag)
tagging 77d2693025093c4f9e977160709ec136e4ce9a70 (commit)
replaces debian/0.0.svn4399+dfsg2-2
tagged by David Paleino
on Sat Oct 8 23:35:16 2011 +0200
The following commit has been merged in the master branch:
commit b2a188322ecaa04314f40a2a2e2db234f2b8cb61
Author: David Paleino da...@debian.org
Date: Sat Oct 8 23:47:34 2011 +0200
Bump JOSM requirement to 4487.
diff --git a/debian/changelog b/debian/changelog
index 958661e..41aeec5
The following commit has been merged in the master branch:
commit fd200642b96d15882a9c7999006508c3113a2b07
Author: David Paleino da...@debian.org
Date: Sat Oct 8 23:47:54 2011 +0200
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 41aeec5..c485fc5 100644
--- a/debian
The following commit has been merged in the master branch:
commit 7287926667bb806e06d2fcc55df6c96e3deb172b
Author: David Paleino da...@debian.org
Date: Sat Oct 1 21:32:30 2011 +0200
00-fix_build_system.patch updated: don't hardcode version number in jar
filenames.
diff --git a/debian
The following commit has been merged in the master branch:
commit 1c06b0841e89488cd8f21b226916d150c73c1515
Author: David Paleino da...@debian.org
Date: Sat Oct 1 22:04:53 2011 +0200
Don't create symlinks anymore
diff --git a/debian/rules b/debian/rules
index 31fc18b..c452242 100755
The following commit has been merged in the master branch:
commit d70b4c033b43f0b08df410b72278271da9a7f171
Author: David Paleino da...@debian.org
Date: Sat Oct 1 21:39:41 2011 +0200
Remove version number from dependency requirement
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the master branch:
commit c44b6ed026b18f80f4869edadb64ba6c1cc648a5
Author: David Paleino da...@debian.org
Date: Sat Oct 1 22:22:05 2011 +0200
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 41faf28..e37a3d2 100644
--- a/debian
The annotated tag, debian/0.39+ds1-4 has been created
at 1460d6c4a59d0108a5b93164f2868b39ab06aed9 (tag)
tagging c44b6ed026b18f80f4869edadb64ba6c1cc648a5 (commit)
replaces debian/0.39+ds1-3
tagged by David Paleino
on Sat Oct 1 22:35:42 2011 +0200
- Shortlog
The following commit has been merged in the pristine-tar branch:
commit 2c9266d34514da09bfaada1f91ecb0170f2cbd73
Author: David Paleino da...@debian.org
Date: Fri Sep 30 22:00:02 2011 +0200
pristine-tar data for libosm-gary68-perl_0.0~svn26727.orig.tar.gz
diff --git a/libosm-gary68-perl_0.0
The annotated tag, upstream/0.0_svn26727 has been updated
to 5108f6e9f00c1fe1d4a0a14e2abd09a185d04d76 (tag)
from 809dfc491719f91a73ac4c3a4d6b5291ff792384 (which is now obsolete)
tagging a316ef389d46d291ccc58bc9c5e21a2f91a53def (commit)
tagged by David Paleino
on Fri
The following commit has been merged in the master branch:
commit 121221036b361e27aa01f9dc3d309781018ebd29
Author: David Paleino da...@debian.org
Date: Fri Sep 30 22:16:36 2011 +0200
Add Build.PL
diff --git a/debian/patches/00-add_BuildPL.patch
b/debian/patches/00-add_BuildPL.patch
new
The following commit has been merged in the master branch:
commit 0c40b649c75b8ce7c0c130f84de78d4e2b0a2d8a
Author: David Paleino da...@debian.org
Date: Fri Sep 30 22:29:05 2011 +0200
Uploading to NEW
diff --git a/debian/changelog b/debian/changelog
index ac04d7e..087a2fe 100644
The following commit has been merged in the master branch:
commit 93abd37e334c9b50e0a7a03dd2eb29849585d7d0
Author: David Paleino da...@debian.org
Date: Thu Sep 29 11:44:04 2011 +0200
Fix plexus config file not to load duplicate jars, by hardcoding osmosis'
version number in it.
diff --git
The following commit has been merged in the master branch:
commit 4c1dec05e95188e9fe29cdc54e37b62b549f5434
Author: David Paleino da...@debian.org
Date: Thu Sep 29 11:44:22 2011 +0200
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 91bb6ab..149f70f 100644
CLASSPATH setting from debian/josm.sh as Class-Path is already
+set in josm.jar.
-- David Paleino da...@debian.org Wed, 28 Sep 2011 11:31:57 +0200
diff --git a/debian/josm.sh b/debian/josm.sh
index 14c9117..fa5b18f 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -16,7 +16,6 @@ else
100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low
upload.
* Drop CLASSPATH setting from debian/josm.sh as Class-Path is already
set in josm.jar.
+ * Add support for openjdk-7.
-- David Paleino da...@debian.org
The following commit has been merged in the master branch:
commit 4b2e933d75d4db97c3f0f7f4184e440d3a02aa8d
Author: David Paleino da...@debian.org
Date: Wed Sep 28 11:32:47 2011 +0200
Add missing dependency on commons-codec, fixing exceptions during upload.
diff --git a/debian/changelog b
The following commit has been merged in the master branch:
commit 98b11e7ddf773350ad56ad92434c981d69977f53
Author: David Paleino da...@debian.org
Date: Wed Sep 28 11:46:01 2011 +0200
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index f35c457..e94819b 100644
201 - 300 of 401 matches
Mail list logo
