Package: gcc-3.4
Severity: wishlist
Tags: patch
In debian/rules.d/binary-fortran.mk the libg2c0 and libg2c0-dev packages
are created with different version numbers:
dh_gencontrol -p$(p_g2c) -u-v$(DEB_EVERSION)
dh_gencontrol -p$(p_g2cd) -u-v$(DEB_VERSION)
The libg2c0 package will get a version '1:3.4...' while the libg2c0-dev
package will get at version '3.4...' (i.e. without the leading '1:').
To avoid problems when upgrading from the '1:3.3...' versions, both
packages should get a '1:3.4...' version.
This will be a problem when the libg2c0-dev package will be built from
the gcc-3.4 package (instead of gcc-3.3 as it is now).
The attached patch fixes the version number for the libg2c0-dev package
in debian/rules.d/binary-fortran.mk.
The patch also changes debian/rules.defs to build the common_pkgs and
common_libs from gcc-3.4 for the amd64 architecture.
Regards
Andreas Jochens
diff -urN ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules.d/binary-fortran.mk
./debian/rules.d/binary-fortran.mk
--- ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules.d/binary-fortran.mk
2004-08-02 09:13:46.765435768 +0200
+++ ./debian/rules.d/binary-fortran.mk 2004-08-02 09:13:05.800361893 +0200
@@ -98,7 +98,7 @@
dh_compress -p$(p_g2cd)
dh_fixperms -p$(p_g2cd)
dh_shlibdeps -p$(p_g2cd)
- dh_gencontrol -p$(p_g2cd) -u-v$(DEB_VERSION)
+ dh_gencontrol -p$(p_g2cd) -u-v$(DEB_EVERSION)
dh_installdeb -p$(p_g2cd)
dh_md5sums -p$(p_g2cd)
dh_builddeb -p$(p_g2cd)
diff -urN ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules.defs ./debian/rules.defs
--- ../tmp-orig/gcc-3.4-3.4.1ds1/debian/rules.defs 2004-08-02
09:13:47.113368448 +0200
+++ ./debian/rules.defs 2004-08-02 09:13:05.801361699 +0200
@@ -92,8 +92,14 @@
# gcc versions (fastjar, fixincludes, libgcj-common) ...
with_common_pkgs := no
-# ... and some libraries, which do not change (libffi2, libg2c, libobjc1).
-with_common_libs := no
+# ... and some libraries, which do not change (libffi3, libg2c, libobjc1).
+with_common_libs := built from gcc-3.3
+
+# build common_pkgs and common_libs for amd64
+ifeq ($(DEB_TARGET_GNU_CPU),$(findstring $(DEB_TARGET_GNU_CPU),x86_64))
+ with_common_pkgs := yes
+ with_common_libs := yes
+endif
#no_common_libs := s390
#ifeq ($(DEB_TARGET_GNU_CPU), $(findstring
$(DEB_TARGET_GNU_CPU),$(no_common_libs)))
