The following commit has been merged in the master branch:
commit 79b142c2c525c30d66760d0759716c92b13f
Author: Ralf Treinen
Date: Sun Jul 3 12:59:31 2011 +0200
configure with explicit --sysconfdir in order to fix inclusion of
the system-wide japanese font onfiguration file.
diff --
The following commit has been merged in the master branch:
commit 86f7bbe95085f31439ee672a489f8b0e5fd66e2e
Author: Ralf Treinen
Date: Sun Jul 3 15:12:41 2011 +0200
drop explicit build target in configure
reactivate patch camlimages
diff --git a/debian/patches/series b/debian/patches/se
The following commit has been merged in the master branch:
commit d76fb99f337422cb1baf9509abbcae8afaa66cbc
Author: Stephane Glondu
Date: Sun Jul 3 15:57:33 2011 +0200
Fix compilation on bytecode architectures
diff --git a/debian/changelog b/debian/changelog
index c9912ad..f3a9a7b 100644
--
The annotated tag, debian/1%4.0.1-2 has been created
at 08efc99d9630a9b48a6c18ae06daf1008a722075 (tag)
tagging d76fb99f337422cb1baf9509abbcae8afaa66cbc (commit)
replaces debian/1%4.0.1-1
tagged by Stephane Glondu
on Sun Jul 3 16:14:49 2011 +0200
- Shortlog --
The following commit has been merged in the experimental/master branch:
commit acf38fbfc022b7c39ca87e4f723d447691a9cdce
Merge: 4221ef9e6d0d8a692fab34eef61e4665971f622b
895a96c8a4d617d9cdd496caef7e098ce3593f4f
Author: Stephane Glondu
Date: Sun Jul 3 22:14:00 2011 +0200
Merge branch 'master'
The following commit has been merged in the experimental/master branch:
commit 98998bf0e2708aebc928af1e3d843543a230517f
Merge: acf38fbfc022b7c39ca87e4f723d447691a9cdce
d6cc89385c4d8de5aa1e71d2544b2a40f9449ea4
Author: Stephane Glondu
Date: Sun Jul 3 22:17:18 2011 +0200
Merge commit 'upstrea
The following commit has been merged in the experimental/master branch:
commit 79c0f262a2a6372e45398d9386411d0744383ce7
Author: Stephane Glondu
Date: Sun Jul 3 22:17:56 2011 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 357c1e5..6999571 100644
--- a/debi
The following commit has been merged in the experimental/master branch:
commit 9aaa8de68a858df9a96661ad27d43bf884f9cd72
Author: Eric Cooper
Date: Sun Mar 6 21:00:52 2011 -0500
cgi directory is no longer shipped by upstream
diff --git a/debian/README.Debian b/debian/README.Debian
index cdaf
The following commit has been merged in the experimental/master branch:
commit 920195200d5e2ebb7683d2b8bcd21075659b2c85
Author: Eric Cooper
Date: Mon Mar 28 22:33:47 2011 -0400
netcgi1 is no longer shipped by upstream
diff --git a/debian/README.Debian b/debian/README.Debian
index 51675eb..
The following commit has been merged in the experimental/master branch:
commit 8d0d92efe45f88b5e0a08b9385913d184bd4d0a1
Author: Eric Cooper
Date: Sat Mar 5 14:21:21 2011 -0500
Update patches for new upstream version
diff --git a/debian/patches/0001-Camlp4-workarounds.patch
b/debian/patche
The following commit has been merged in the experimental/master branch:
commit 750585ab067ebaa56753fc7bf7cabe580a7c454c
Author: Eric Cooper
Date: Mon Mar 28 22:56:44 2011 -0400
nethttpd-for-netcgi1 is no longer shipped by upstream
diff --git a/debian/README.Debian b/debian/README.Debian
in
The following commit has been merged in the experimental/master branch:
commit 3867200a628ff41165d3f1e36742128d70bf8d22
Author: Eric Cooper
Date: Tue Mar 8 15:48:34 2011 -0500
Don't ship *.so.owner files created by findlib
diff --git a/debian/libocamlnet-ocaml.install.in
b/debian/libocaml
The following commit has been merged in the experimental/master branch:
commit e5dbe1e7ebf652a272534ce584d0257a9ecc3ed8
Author: Eric Cooper
Date: Tue Mar 8 16:36:26 2011 -0500
Unapply patches after build
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..845ca06
--- /
The following commit has been merged in the experimental/master branch:
commit 4f8417ba260b69b3350608b891ebd8def4494e49
Author: Eric Cooper
Date: Sun Mar 6 18:16:47 2011 -0500
changelog entry for version 3.2.1-1
diff --git a/debian/changelog b/debian/changelog
index 6999571..ef3c5c8 100644
The following commit has been merged in the pristine-tar branch:
commit e177acae33c21cc0f43e3b0daccfbc8b250b4b12
Author: Stephane Glondu
Date: Sun Jul 3 22:05:12 2011 +0200
pristine-tar data for ocamlnet_3.0.0.orig.tar.gz
diff --git a/ocamlnet_3.0.0.orig.tar.gz.delta b/ocamlnet_3.0.0.orig.
The following commit has been merged in the pristine-tar branch:
commit 81f13cb4c5edd12543e124d4d0deb842b1d38985
Author: Stephane Glondu
Date: Sun Jul 3 22:05:33 2011 +0200
pristine-tar data for ocamlnet_3.0.1.orig.tar.gz
diff --git a/ocamlnet_3.0.1.orig.tar.gz.delta b/ocamlnet_3.0.1.orig.
The following commit has been merged in the pristine-tar branch:
commit 2badf921c6323441e669dbd26bcc79193718542c
Author: Stephane Glondu
Date: Sun Jul 3 22:05:57 2011 +0200
pristine-tar data for ocamlnet_3.0.2.orig.tar.gz
diff --git a/ocamlnet_3.0.2.orig.tar.gz.delta b/ocamlnet_3.0.2.orig.
The following commit has been merged in the pristine-tar branch:
commit fd7ff6ddb58547858f7438c1d40c8bef46179f5f
Author: Stephane Glondu
Date: Sun Jul 3 22:06:12 2011 +0200
pristine-tar data for ocamlnet_3.0.3.orig.tar.gz
diff --git a/ocamlnet_3.0.3.orig.tar.gz.delta b/ocamlnet_3.0.3.orig.
The following commit has been merged in the pristine-tar branch:
commit 48769f1e4d6b46c99892dee3a38b4f7c40d88266
Author: Stephane Glondu
Date: Sun Jul 3 22:06:29 2011 +0200
pristine-tar data for ocamlnet_3.1.orig.tar.gz
diff --git a/ocamlnet_3.1.orig.tar.gz.delta b/ocamlnet_3.1.orig.tar.gz
The following commit has been merged in the pristine-tar branch:
commit 32616ef7a52467adb500da112a764a9ea5b88dda
Author: Stephane Glondu
Date: Sun Jul 3 22:06:56 2011 +0200
pristine-tar data for ocamlnet_3.2.orig.tar.gz
diff --git a/ocamlnet_3.2.orig.tar.gz.delta b/ocamlnet_3.2.orig.tar.gz
The following commit has been merged in the pristine-tar branch:
commit 299a4dffeb7c4fa76d016817af7b05520036c932
Author: Stephane Glondu
Date: Sun Jul 3 22:07:21 2011 +0200
pristine-tar data for ocamlnet_3.2.1.orig.tar.gz
diff --git a/ocamlnet_3.2.1.orig.tar.gz.delta b/ocamlnet_3.2.1.orig.
The annotated tag, upstream/3.0.0 has been created
at 6c2d9cab879437ad5460295a874a49ed86383889 (tag)
tagging ee57f91edaa298c23768ae384e3748b71f3207f3 (commit)
replaces upstream/3.0.0test2
tagged by Stephane Glondu
on Sun Jul 3 22:05:13 2011 +0200
- Shortlog -
The annotated tag, upstream/3.0.1 has been created
at b370b3b7d3244a9168ad824754bc81500286d5b9 (tag)
tagging d57bf31ad972b19c5f77294d70574ad4a70c1fdc (commit)
replaces upstream/3.0.0
tagged by Stephane Glondu
on Sun Jul 3 22:05:33 2011 +0200
- Shortlog --
The annotated tag, upstream/3.0.2 has been created
at 096bc2048fd8413ed5bdc4aac168f5bf09af544b (tag)
tagging b1dbbdd7131cd52136de40ad90bd9ff9af66bcfe (commit)
replaces upstream/3.0.1
tagged by Stephane Glondu
on Sun Jul 3 22:05:57 2011 +0200
- Shortlog --
The annotated tag, upstream/3.0.3 has been created
at b7c032b0cfd57e9ce536edf3cecc1e2a04eb4fcf (tag)
tagging 3aa01bbf8536ae5f2c13c5c1ec1231390f2e08f0 (commit)
replaces upstream/3.0.2
tagged by Stephane Glondu
on Sun Jul 3 22:06:13 2011 +0200
- Shortlog --
The annotated tag, upstream/3.1 has been created
at d433fa1955b6f73d9bef02fac90ecd39ed8f4221 (tag)
tagging 3a840b0516e4f8e839ac04aa62656123302c9b91 (commit)
replaces upstream/3.0.3
tagged by Stephane Glondu
on Sun Jul 3 22:06:29 2011 +0200
- Shortlog
The annotated tag, upstream/3.2 has been created
at b5108f0b6048981897ea5d88a9c06eebb49c88d6 (tag)
tagging 9bf4507585e25e51fa5c20f718a5f7c89bbcf3db (commit)
replaces upstream/3.1
tagged by Stephane Glondu
on Sun Jul 3 22:06:56 2011 +0200
- Shortlog --
The annotated tag, upstream/3.2.1 has been created
at edf4510ce82c097661638833aac3fc03d1ad24e6 (tag)
tagging d6cc89385c4d8de5aa1e71d2544b2a40f9449ea4 (commit)
replaces upstream/3.2
tagged by Stephane Glondu
on Sun Jul 3 22:07:21 2011 +0200
- Shortlog
The following commit has been merged in the experimental/master branch:
commit 15d11df3e4372cfecd92894480ebccc2eab5167c
Author: Stephane Glondu
Date: Sun Jul 3 22:43:24 2011 +0200
Add debian/clean to remove upstream leftovers
diff --git a/debian/clean b/debian/clean
new file mode 100644
in
The following commit has been merged in the experimental/master branch:
commit 7abd499b1190791c1c01e2a14537b9de7309842c
Author: Stephane Glondu
Date: Sun Jul 3 22:45:20 2011 +0200
Update the override, following recent changes in Lintian
diff --git a/debian/libapache2-mod-ocamlnet.lintian-o
The following commit has been merged in the experimental/master branch:
commit fbb9d4c286c5e9a9be3cdeb048aa364cafdf5359
Author: Stephane Glondu
Date: Sun Jul 3 22:58:05 2011 +0200
Remove ancient versioned dependencies
diff --git a/debian/control b/debian/control
index c93cba0..1ea50d9 1006
The following commit has been merged in the experimental/master branch:
commit 3194f8b1974f1c9aa1596988972cfba36eaae6d0
Author: Stephane Glondu
Date: Sun Jul 3 22:58:19 2011 +0200
Bump Standards-Version to 3.9.2
diff --git a/debian/control b/debian/control
index 1ea50d9..1ba92f1 100644
---
The following commit has been merged in the experimental/master branch:
commit 308caede7174bb8d4ec1aec93c08359cfcd7c7af
Author: Stephane Glondu
Date: Sun Jul 3 23:09:52 2011 +0200
Add abort-on-upstream-changes to local-options
diff --git a/debian/source/local-options b/debian/source/local-
The following commit has been merged in the experimental/master branch:
commit 521fb4ac2e1aaf9a0ed66d5ccb463950d1910c65
Author: Stephane Glondu
Date: Sun Jul 3 23:16:46 2011 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index ef3c5c8..99a0504 100644
--- a/debian/c
34 matches
Mail list logo
