Author: frankie
Date: 2008-04-02 10:15:56 +0000 (Wed, 02 Apr 2008)
New Revision: 1494
Modified:
packages/hdf5/trunk/debian/changelog
packages/hdf5/trunk/debian/control.in
packages/hdf5/trunk/debian/rules
Log:
Fixating for #473871
Modified: packages/hdf5/trunk/debian/changelog
===================================================================
--- packages/hdf5/trunk/debian/changelog 2008-04-01 13:02:15 UTC (rev
1493)
+++ packages/hdf5/trunk/debian/changelog 2008-04-02 10:15:56 UTC (rev
1494)
@@ -1,3 +1,11 @@
+hdf5 (1.6.6-4) unstable; urgency=low
+
+ * Previous fix had typos. Also now it controls archs in control.in by
debian/rules.
+ Added versioning for sed to use -e arg for completeness.
+ (closes: #473871)
+
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Wed, 02 Apr 2008 12:11:24
+0200
+
hdf5 (1.6.6-3) unstable; urgency=low
* Fixating for most (not any) archs debhelper flag.
Modified: packages/hdf5/trunk/debian/control.in
===================================================================
--- packages/hdf5/trunk/debian/control.in 2008-04-01 13:02:15 UTC (rev
1493)
+++ packages/hdf5/trunk/debian/control.in 2008-04-02 10:15:56 UTC (rev
1494)
@@ -73,7 +73,7 @@
Package: [EMAIL PROTECTED]@-0
Section: libs
Priority: extra
-Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
+Architecture: @ARCHS@
Depends: ${shlibs:Depends}
Conflicts: [EMAIL PROTECTED]@-0
Provides: [EMAIL PROTECTED]@-0
@@ -88,7 +88,7 @@
Package: libhdf5-openmpi-dev
Section: libdevel
Priority: extra
-Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
+Architecture: @ARCHS@
Depends: [EMAIL PROTECTED]@-0 (= ${binary:Version}), libc6-dev, zlib1g-dev,
libjpeg62-dev, libopenmpi-dev
Conflicts: libhdf5-dev
Provides: libhdf5-dev
Modified: packages/hdf5/trunk/debian/rules
===================================================================
--- packages/hdf5/trunk/debian/rules 2008-04-01 13:02:15 UTC (rev 1493)
+++ packages/hdf5/trunk/debian/rules 2008-04-02 10:15:56 UTC (rev 1494)
@@ -22,7 +22,9 @@
# To be used if binary packages were buildable on any arch
#ARCH_FLAG=-a
+#ARCHS=any
ARCH_FLAG=-s
+ARCHS=alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
ifeq ($(DEB_BUILD_ARCH),arm)
build_openmpi = no
@@ -80,7 +82,7 @@
--enable-shared --enable-production=$(USE_PROD)
-configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam
$(configure-stamp-openmpi) configure-stamp-mpich
+configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam
$(configure_stamp_openmpi) configure-stamp-mpich
configure-stamp-debian: debian/control.in
cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \
@@ -138,7 +140,7 @@
--enable-parallel=yes
touch configure-stamp-mpich
-build: build-stamp-serial build-stamp-lam $(build-stamp-openmpi)
build-stamp-mpich
+build: build-stamp-serial build-stamp-lam $(build_stamp_openmpi)
build-stamp-mpich
build-stamp-serial: configure-stamp-serial
dh_testdir
@@ -168,10 +170,10 @@
-rm -rf debian/build-openmpi
-rm -rf debian/build-mpich
-find debian -type l | xargs rm -f
- grep -v ^\% debian/control.in | sed "s/@VERSION@/$(version)/g" >
debian/control
+ grep -v ^\% debian/control.in | sed -e "s/@VERSION@/$(version)/g" -e
"s/@ARCHS@/$(ARCHS)/" > debian/control
dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
-install: install-serial install-lam install-openmpi install-mpich install-doc
+install: install-serial install-lam $(install_openmpi) install-mpich
install-doc
install-serial: build-stamp-serial
dh_testdir
@@ -222,7 +224,7 @@
dh_md5sums -i
dh_builddeb -i
-binary-arch: build install-serial install-lam $(install-openmpi) install-mpich
+binary-arch: build install-serial install-lam $(install_openmpi) install-mpich
dh_testdir
dh_testroot
dh_installdocs $(ARCH_FLAG)
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
