severity 586149 serious
retitle 586149 Conflict between hdf5-tools and libhdf5-mpi-dev prevents several
packages from building
block 661301 by 586149
thanks
Hi again,
Because this causes other packages to FTBFS, it really needs to be an RC
bug.
-Adam
On Sun, 2012-02-26 at 00:12 -0500, Adam C P
Hi,
There's a better way to do this by just having different shared library
file names and sonames for each of the shared library packages. Then
the -dev packages can conflict, while one can install multiple packages
using the different shared libraries simultaneously, not one-at-a-time
as update
The following commit has been merged in the master branch:
commit 4d855ec85dd4c26bbdb022e2c10460ad1b0b6263
Author: M. Hamish Bowman
Date: Sun Feb 26 13:18:44 2012 +1300
simplify name
diff --git a/debian/changelog b/debian/changelog
index d8624e6..5ca54c2 100644
--- a/debian/changelog
+++ b
The following commit has been merged in the master branch:
commit 1dbb5e46059c99cfd25026f3906e29cbb6761820
Author: M. Hamish Bowman
Date: Sun Feb 26 13:10:21 2012 +1300
fix more forgotten .in files
diff --git a/debian/grass-core.dirs.in b/debian/grass-core.dirs.in
index 69fbd3b..b639d94 10
The following commit has been merged in the master branch:
commit 2e25299f8605be1f1bbf3776084b8de327b286f9
Author: M. Hamish Bowman
Date: Sun Feb 26 12:45:42 2012 +1300
re-add autoconf2.13 (even if not used by debian/rules right now, that
version of it is mandatory), re-comment out optipng
The following commit has been merged in the master branch:
commit f1c44867f2f7cd572e082b0d63a9d3aedd04cc75
Author: M. Hamish Bowman
Date: Sun Feb 26 12:58:07 2012 +1300
simplify using 'sed -i', minor whitespace for readability
diff --git a/debian/fixpaths.sh b/debian/fixpaths.sh
index b794
The following commit has been merged in the master branch:
commit cff1b5d4543cfb70d063c35299267368c1b4e6d0
Author: M. Hamish Bowman
Date: Sun Feb 26 13:02:34 2012 +1300
+ideas
diff --git a/debian/TODO b/debian/TODO
index 457b007..4e534e6 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -17,6
Package: mapserver
Tags: l10n patch
Severity: wishlist
Hello,
Please, Could you update the Brazilian Portuguese
Translation?
Attached you will find the file pt_BR.po. It is UTF-8
encoded and it is tested with msgfmt and
podebconf-display-po.
Kind regards.
--
Atenciosamente;
J.S.Júnior
Analis
Accepted:
geotiff-bin_1.3.0+dfsg-2_amd64.deb
to main/libg/libgeotiff-dfsg/geotiff-bin_1.3.0+dfsg-2_amd64.deb
libgeotiff-dev_1.3.0+dfsg-2_amd64.deb
to main/libg/libgeotiff-dfsg/libgeotiff-dev_1.3.0+dfsg-2_amd64.deb
libgeotiff-dfsg_1.3.0+dfsg-2.debian.tar.gz
to main/libg/libgeotiff-dfsg/libg
The following commit has been merged in the master branch:
commit 2c35360da725ee20dc08f53e3c1d9f15dc00f894
Author: Francesco P. Lovergine
Date: Sat Feb 25 19:27:21 2012 +0100
Restored Hamish changes erroneously done in debian/control.
diff --git a/debian/changelog b/debian/changelog
index
libgeotiff-dfsg_1.3.0+dfsg-2_amd64.changes uploaded successfully to localhost
along with the files:
libgeotiff-dfsg_1.3.0+dfsg-2.dsc
libgeotiff-dfsg_1.3.0+dfsg-2.debian.tar.gz
libgeotiff-dev_1.3.0+dfsg-2_amd64.deb
libgeotiff2_1.3.0+dfsg-2_amd64.deb
geotiff-bin_1.3.0+dfsg-2_amd64.deb
Gree
On Sat, Feb 25, 2012 at 02:37:44AM +, M. Hamish Bowman wrote:
> +# why not use 'sed -i' here?
> cp $i $i.old
> sed -e s,$ZOTPATH,,g $i.old >$i
> rm -f $i.old
>
Probably because that script has been introduced when sed did not have a -i arg?
I would change it properly to use
The following commit has been merged in the master branch:
commit 467dc9e5add0ab54960aecac04847ddb1cc80e27
Author: Francesco P. Lovergine
Date: Sat Feb 25 19:11:05 2012 +0100
Removed duplicated comment in changelog.
diff --git a/debian/changelog b/debian/changelog
index f1828f4..6deb4a9 10
The following commit has been merged in the master branch:
commit 3a1f450576df6c0eb6d2e94298a5182ef6aae34c
Author: Francesco P. Lovergine
Date: Sat Feb 25 19:07:58 2012 +0100
Regenerated debian/control after upstream merge.
diff --git a/debian/control b/debian/control
index e29662f..385d47
The following commit has been merged in the master branch:
commit b12280ef699934a0cd1bb872e49bd2cb15835621
Merge: ecd806309c1310791ad842fd08facc73f849ee11
611e791c7e0045c562374015525838ee8b0f40d8
Author: Francesco P. Lovergine
Date: Sat Feb 25 19:06:51 2012 +0100
Merge tag 'upstream/6.4.2'
The following commit has been merged in the master branch:
commit ecd806309c1310791ad842fd08facc73f849ee11
Author: Francesco P. Lovergine
Date: Sat Feb 25 19:00:35 2012 +0100
Updated a couple of b-ds.
diff --git a/debian/changelog b/debian/changelog
index e20b246..f1828f4 100644
--- a/debi
The following commit has been merged in the master branch:
commit a0b9467ce9cce694371dee3fe8a5840180f0911c
Author: M. Hamish Bowman
Date: Sun Feb 26 02:54:01 2012 +1300
todo: parallel builds
diff --git a/debian/TODO b/debian/TODO
index 8dc69ef..457b007 100644
--- a/debian/TODO
+++ b/debian
The following commit has been merged in the master branch:
commit 59a8eab03447e02926a5c7ba7b2f4df4a0b377b5
Author: M. Hamish Bowman
Date: Sun Feb 26 02:37:08 2012 +1300
stray command
diff --git a/debian/rules b/debian/rules
index e8c2f4e..db9f02d 100755
--- a/debian/rules
+++ b/debian/rule
The following commit has been merged in the master branch:
commit 70fe174d439efbb78747259e61e4be1e5f910b7e
Author: M. Hamish Bowman
Date: Sun Feb 26 02:31:44 2012 +1300
quantify savings
diff --git a/debian/rules b/debian/rules
index 4ccc6bd..e8c2f4e 100755
--- a/debian/rules
+++ b/debian/r
The following commit has been merged in the master branch:
commit 49b7884c0b2589432759c8e6ec29eb8ea8aceea2
Author: M. Hamish Bowman
Date: Sun Feb 26 02:29:09 2012 +1300
more programmers manual install updates
diff --git a/debian/TODO b/debian/TODO
index 40456c2..8dc69ef 100644
--- a/debian
The following commit has been merged in the master branch:
commit af67862aba01d4fb97b25f5e441a88aba2e31757
Author: M. Hamish Bowman
Date: Sun Feb 26 01:01:25 2012 +1300
more programmers manual install updates
diff --git a/debian/grass-dev-doc.install b/debian/grass-dev-doc.install
index dc
The following commit has been merged in the master branch:
commit f04aacd655ef085c39a2a7200b1495cd36b7e6a8
Author: M. Hamish Bowman
Date: Sat Feb 25 23:45:08 2012 +1300
typo
diff --git a/debian/rules b/debian/rules
index 4d19a53..78adbed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124
The following commit has been merged in the master branch:
commit e616376c8761ef6b4a6a311784b48df75e4d98cc
Author: Antonio Valentino
Date: Sat Feb 25 12:12:20 2012 +0100
Updated copyright format URL
diff --git a/debian/changelog b/debian/changelog
index 20b29a2..8a498d9 100644
--- a/debian
The following commit has been merged in the master branch:
commit feab29158eed288ebb0506cbea224b4ce91a4cf2
Author: Antonio Valentino
Date: Thu Feb 23 21:43:06 2012 +0100
Standard version bumped to 3.9.3
diff --git a/debian/changelog b/debian/changelog
index 6135450..20b29a2 100644
--- a/de
The following commit has been merged in the master branch:
commit 046865238cf4c300b427a60c356455d74a5d003f
Author: M. Hamish Bowman
Date: Sat Feb 25 23:40:19 2012 +1300
install full programmers' manual
diff --git a/debian/TODO b/debian/TODO
index 8b38309..40456c2 100644
--- a/debian/TODO
+
Author: hamish-guest
Date: 2012-02-25 10:01:48 + (Sat, 25 Feb 2012)
New Revision: 3064
Modified:
packages/opencpn/trunk/debian/changelog
packages/opencpn/trunk/debian/control
Log:
Policy bumped to 3.9.3, without changes
Modified: packages/opencpn/trunk/debian/changelog
=
The following commit has been merged in the master branch:
commit 97e97c60cd5eb37ea09276157ad2c661a66ec55c
Author: M. Hamish Bowman
Date: Sat Feb 25 22:49:06 2012 +1300
Policy bumped to 3.9.3, using metapackages archive section for 'grass'
diff --git a/debian/changelog b/debian/changelog
i
The following commit has been merged in the master branch:
commit bd84739a2235d86dff5988947cb456bb0496fd8e
Author: M. Hamish Bowman
Date: Sat Feb 25 22:26:48 2012 +1300
fix www-browser patch
diff --git a/debian/patches/www-browser b/debian/patches/www-browser
index ef5f0f2..1743798 100644
The following commit has been merged in the master branch:
commit e0a0a33b6ca074584b56fb0974cf6bd879cc15ae
Author: M. Hamish Bowman
Date: Sat Feb 25 22:21:10 2012 +1300
move jquery.js cleaning to more appropriate place
diff --git a/debian/changelog b/debian/changelog
index f3a2b59..ee3e789
The following commit has been merged in the master branch:
commit 7de55098972dbb218a1671add2933aa3f50f5d4a
Author: M. Hamish Bowman
Date: Sat Feb 25 22:20:12 2012 +1300
move jquery.js cleaning to more appropriate place
diff --git a/debian/rules b/debian/rules
index 4ddf4a3..257e6f9 100755
The following commit has been merged in the master branch:
commit 529b56eae2fa8c9fa5929788e8fcf62549d3d395
Author: M. Hamish Bowman
Date: Sat Feb 25 22:16:32 2012 +1300
std changelog close bug style
diff --git a/debian/changelog b/debian/changelog
index baa7b84..f3a2b59 100644
--- a/debian
The following commit has been merged in the master branch:
commit fa49ad5db8c1c1b9083e4a6c4a128362cb820eaf
Author: M. Hamish Bowman
Date: Sat Feb 25 22:11:11 2012 +1300
Use xdg-open for GRASS_HTML_BROWSER when available (patch from Thibault
Lemaitre; closes #615667)
diff --git a/debian/ch
The following commit has been merged in the master branch:
commit 6dbf4c0b9419222c4fa0eca0152a03e62f5717c4
Author: M. Hamish Bowman
Date: Sat Feb 25 22:05:34 2012 +1300
libmysqlclient-dev replaces libmysqlclient15-dev (closes #650361)
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the master branch:
commit cd842ed076e79996f81593c9c0fb37dece993641
Author: M. Hamish Bowman
Date: Sat Feb 25 22:00:09 2012 +1300
use system's copy of jquery.js
diff --git a/debian/control b/debian/control
index 6a95a63..6f7a722 100644
--- a/debian/co
The following commit has been merged in the master branch:
commit 0a692d2be3a17015a70031bf749766795049434f
Author: M. Hamish Bowman
Date: Sat Feb 25 21:21:17 2012 +1300
more moving of GUI library depending stuff into the grass-gui pkg
diff --git a/debian/grass-gui.install b/debian/grass-gu
35 matches
Mail list logo
