The following commit has been merged in the master branch:
commit 5f7382854e7e5db4ebf402e1e6543ed0cc3150b2
Author: Mehdi Dogguy me...@debian.org
Date: Wed Feb 24 15:37:05 2010 +0100
Do not force custom mode (Pass NO_CUSTOM=y to make)
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the master branch:
commit 4af81ff03920eec9ae560c65d8297a5f29ec2b93
Merge: 5f7382854e7e5db4ebf402e1e6543ed0cc3150b2
3a7654924a63fddb0cbbfaba484c62a31a47ded6
Author: Mehdi Dogguy me...@debian.org
Date: Wed Feb 24 15:56:22 2010 +0100
Merge commit
The following commit has been merged in the master branch:
commit ead95cdbc86a545d81ac8b55bb6985703be57ff5
Author: Mehdi Dogguy me...@debian.org
Date: Wed Feb 24 15:57:31 2010 +0100
New upstream release (Closes: #564816)
diff --git a/debian/changelog b/debian/changelog
index
The annotated tag, upstream/1.12.4 has been created
at a93e7c40e5005c54cc501ff764069b49bb85325c (tag)
tagging 3a7654924a63fddb0cbbfaba484c62a31a47ded6 (commit)
replaces upstream/1.12.1
tagged by Mehdi Dogguy
on Wed Feb 24 15:56:22 2010 +0100
- Shortlog
The following commit has been merged in the master branch:
commit d4d23b7273310d626cf919befa2b124b4df77437
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 20:51:48 2010 +0100
Update watch file
diff --git a/debian/changelog b/debian/changelog
index a4bc524..e24ee5b 100644
---
The following commit has been merged in the master branch:
commit e8e5bca801d4cd2f4d33c78c0a7d918d60c8769d
Merge: d4d23b7273310d626cf919befa2b124b4df77437
4a5a9c637e3d16769ad6e7779bd0fb20e57be644
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 20:52:00 2010 +0100
Merge commit
The following commit has been merged in the master branch:
commit c4c4cbd2b0cb8c51e3dfd0c8debbacfe0a88d753
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 20:53:26 2010 +0100
New upstream
diff --git a/debian/changelog b/debian/changelog
index e24ee5b..ab3d71d 100644
---
The following commit has been merged in the master branch:
commit 016518c17e7b329b549e60c64dd5237f746240d2
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 21:44:23 2010 +0100
Simplify debian/rules
diff --git a/debian/libtext-ocaml-dev.install.in
The following commit has been merged in the master branch:
commit 79da4fa985dce25d3694c3048773397397575f2f
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 21:36:36 2010 +0100
Bump Standards-Version to 3.8.4 (no changes)
diff --git a/debian/control b/debian/control
index
The following commit has been merged in the master branch:
commit f78b22ae4a6b147e0372dccdf277d2e5fae45ddc
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 21:42:50 2010 +0100
New build-dependencies
diff --git a/debian/control b/debian/control
index d01feb2..309b1b5 100644
---
The following commit has been merged in the master branch:
commit 555409f742a20c6a1c364dbfd509e94bdfdb5129
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 21:36:39 2010 +0100
Update changelog
diff --git a/debian/changelog b/debian/changelog
index ab3d71d..42990d3 100644
---
The following commit has been merged in the pristine-tar branch:
commit 537bd9f80fd33d2a3cb3743a8abf7d13f69c6151
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 20:52:00 2010 +0100
pristine-tar data for ocaml-text_0.3.orig.tar.gz
diff --git a/ocaml-text_0.3.orig.tar.gz.delta
The annotated tag, upstream/0.3 has been created
at fd8ce74e390c989a10eb48ae3df240d720604ea3 (tag)
tagging 4a5a9c637e3d16769ad6e7779bd0fb20e57be644 (commit)
replaces upstream/0.2
tagged by Stephane Glondu
on Wed Feb 24 20:52:00 2010 +0100
- Shortlog
The following commit has been merged in the master branch:
commit 547103dfdbb046a73c26cbc36068616264092fef
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 23:12:26 2010 +0100
Fix debian/watch
diff --git a/debian/changelog b/debian/changelog
index 5f045a5..bff60b6 100644
---
The following commit has been merged in the master branch:
commit 2969a8be368c86547a4248d7384f60906393c6cd
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 23:13:20 2010 +0100
Fix debian/watch
diff --git a/debian/changelog b/debian/changelog
index bf6f2e8..4878bb3 100644
---
The following commit has been merged in the master branch:
commit d28ba9f862f9370eafb26c23c3670e21b4ba909d
Author: Stephane Glondu st...@glondu.net
Date: Wed Feb 24 23:14:22 2010 +0100
Fix debian/watch
diff --git a/debian/changelog b/debian/changelog
index f101081..65eeb60 100644
---
The annotated tag, debian/2.27.57-4 has been created
at b45e14f501571f87b185052fd18e8cc361664968 (tag)
tagging dd306705f6b36b62a0ff619504dbe063a3894281 (commit)
replaces debian/unison2.27.57-2.27.57-1
tagged by Sylvain Le Gall
on Thu Feb 25 01:03:36 2010 +
-
The following commit has been merged in the master branch:
commit 86ffd240a34035c5a15ce2016095f0306d125ebf
Author: Sylvain Le Gall gil...@debian.org
Date: Tue Feb 16 23:54:42 2010 +0100
Finalize merge with 2.27.57 branch
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the master branch:
commit d4b06803d86461a07798f3cba336b67e6d4e22ce
Author: Sylvain Le Gall gil...@debian.org
Date: Wed Feb 17 01:00:23 2010 +0100
unison binaries are custom executables, so we can remove Depends on any
ocaml-base* packages (Closes:
The following commit has been merged in the master branch:
commit 139f9f9579ad1e4e8e5a36e1ad780953e9ecdc9a
Author: Sylvain Le Gall gil...@debian.org
Date: Tue Feb 23 00:42:19 2010 +
Use the full path to access icon in .desktop (Closes: #541700)
diff --git a/debian/changelog
The following commit has been merged in the master branch:
commit 6b4ed7630014e9aa0a2ca2b62be63be5b7b58125
Author: Sylvain Le Gall gil...@debian.org
Date: Tue Feb 23 01:11:17 2010 +
Patch from unison trunk to remove 'Connected ...' message even when -silent
is set (Closes: #497729)
The following commit has been merged in the master branch:
commit 0a99f80a839cba889f48e358305ff809900936f5
Author: Sylvain Le Gall gil...@debian.org
Date: Thu Feb 25 00:49:48 2010 +0100
Auto generate conflicts with unisonX.Y.Z or unison (X.Y.Z)
diff --git a/debian/changelog
The following commit has been merged in the master branch:
commit 3c18f196f4184e9bdae3e957e023bb10d10cd7a5
Author: Sylvain Le Gall gil...@debian.org
Date: Thu Feb 25 01:46:40 2010 +0100
Enhance templating for unison and unison-gtk common files
diff --git a/debian/changelog
The following commit has been merged in the master branch:
commit dd306705f6b36b62a0ff619504dbe063a3894281
Author: Sylvain Le Gall gil...@debian.org
Date: Thu Feb 25 01:01:17 2010 +
Prepare release
diff --git a/debian/changelog b/debian/changelog
index 00eeff5..79761b6 100644
---
24 matches
Mail list logo
