The following commit has been merged in the master branch:
commit 9a76cc594c2116dedfdc7ed61f213eb37c285ca2
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 12:11:56 2013 +0200
add .pc to .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..4ecbc3e
The following commit has been merged in the master branch:
commit e7f0fbbbc19cb29684d25877d5d0455085895f85
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 12:39:49 2013 +0200
call ant clean in clean target
diff --git a/debian/rules b/debian/rules
index b774566..e6090f4 100755
The following commit has been merged in the master branch:
commit 1cb23f4d8b933b533cc731c2fb4919b063dae5dd
Merge: 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b
b7ff9e7493c0a51e6ba590beec934602845b3df4
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 11:59:21 2013 +0200
Merge tag 'upstream
The following commit has been merged in the master branch:
commit c4a178ae84614283aad235e3c60e54c4d7b79645
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 12:44:39 2013 +0200
remove svn stuff from debian/rules
diff --git a/debian/rules b/debian/rules
index e6090f4..69fa67d 100755
The following commit has been merged in the master branch:
commit 9fccaced8ceec04a39bf14cfdfe81337081b83a6
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 12:15:59 2013 +0200
adapt changelog for 1.0
diff --git a/debian/changelog b/debian/changelog
index 3a18f15..018cfe7 100644
The following commit has been merged in the master branch:
commit 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 11:54:03 2013 +0200
fix watch file / get-orig-source target
diff --git a/debian/rules b/debian/rules
index 04c075b..b774566 100755
The following commit has been merged in the pristine-tar branch:
commit f44e599bfcf89a4818d087cde1607717e789a42d
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 11:59:21 2013 +0200
pristine-tar data for jmapviewer_1.0.orig.tar.gz
diff --git a/jmapviewer_1.0.orig.tar.gz.delta b
The following commit has been merged in the master branch:
commit 7b297cc23555a4efa4a98855ae391d550e768b83
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 16:05:28 2013 +0200
update version in changelog after reimport
diff --git a/debian/changelog b/debian/changelog
index 018cfe7
The following commit has been merged in the master branch:
commit ba49fdd4bf125506dc4fc5fea32a2168e68320a6
Merge: c4a178ae84614283aad235e3c60e54c4d7b79645
1aafe6022274e6cd5711d109b49e1d83c8fe7ec5
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 16:00:53 2013 +0200
Merge tag 'upstream
The following commit has been merged in the master branch:
commit 1aafe6022274e6cd5711d109b49e1d83c8fe7ec5
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 16:00:53 2013 +0200
Imported Upstream version 1.0+dfsg1
diff --git a/src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
b
The following commit has been merged in the master branch:
commit c34e3cbdee33c427f91dd1afa1e7ac920c153a64
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 16:12:56 2013 +0200
add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000
The annotated tag, upstream/1.0+dfsg1 has been created
at 1f8502776ee606180f05cf991c3740a89fe86a3b (tag)
tagging 1aafe6022274e6cd5711d109b49e1d83c8fe7ec5 (commit)
replaces upstream/1.0
tagged by Felix Natter
on Thu Oct 3 16:00:53 2013 +0200
- Shortlog
The following commit has been merged in the master branch:
commit feb2bcda9e7ea66ce8b1c5c39c4738f644d4a917
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 16:54:58 2013 +0200
move no-upstream-changelog override to binary lintian-overrides file
diff --git a/debian/source/lintian
The following commit has been merged in the master branch:
commit 93650c2d07327ad68ce677b6aee1ecbd845c048b
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 16:52:53 2013 +0200
override two lintian binary warnings
diff --git a/debian/jmapviewer.lintian-overrides
b/debian
The following commit has been merged in the master branch:
commit bb812a323f17c8b70ad0a069222b1fb4f36abce0
Author: Felix Natter fnat...@gmx.net
Date: Thu Oct 3 17:12:13 2013 +0200
add patch description to 02-remove-svn-prop-from-create_run_jar.patch
diff --git a/debian/patches/02-remove
The following commit has been merged in the master branch:
commit 613fff0333fc9fd4605397f8def0451d65c436d7
Author: Felix Natter fnat...@gmx.net
Date: Sat Oct 12 09:51:03 2013 +0200
update debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 9754e9d..eb0e86a 100644
The following commit has been merged in the master branch:
commit 7e7497287cad90556ed668837d017b5ed44b980b
Author: Felix Natter fnat...@gmx.net
Date: Sat Oct 12 09:54:35 2013 +0200
put 'unstable' in changelog
diff --git a/debian/changelog b/debian/changelog
index 69e7e0f..b753ec9 100644
The following commit has been merged in the master branch:
commit 64ae0c60ed2818a71f28f63c0b16d07985634a53
Author: Felix Natter fnat...@gmx.net
Date: Sat Oct 12 09:46:54 2013 +0200
import 1.02, remove patches that have been applied upstream
diff --git a/debian/changelog b/debian/changelog
The following commit has been merged in the pristine-tar branch:
commit 91826df5da4354025012ffa99d584bdce48489f3
Author: Felix Natter fnat...@gmx.net
Date: Sat Oct 12 09:29:33 2013 +0200
pristine-tar data for jmapviewer_1.02+dfsg1.orig.tar.gz
diff --git a/jmapviewer_1.02+dfsg1
The annotated tag, upstream/1.02+dfsg1 has been created
at 4d6e2989a6cab322a917de847d771ebdb99c0bf0 (tag)
tagging 3bff28956bff8b7a981aea3d6a73520c758eb968 (commit)
replaces upstream/1.0+dfsg1
tagged by Felix Natter
on Sat Oct 12 09:29:33 2013 +0200
- Shortlog
20 matches
Mail list logo
