r38156 - in /packages/gmp/trunk/debian: control rules
smr at users.alioth.debian.org
smr at users.alioth.debian.org
Sat Mar 5 03:46:16 UTC 2011
Author: smr
Date: Sat Mar 5 03:46:15 2011
New Revision: 38156
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38156
Log:
Files that failed to merge.
Modified:
packages/gmp/trunk/debian/control
packages/gmp/trunk/debian/rules
Modified: packages/gmp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/control?rev=38156&op=diff
==============================================================================
--- packages/gmp/trunk/debian/control (original)
+++ packages/gmp/trunk/debian/control Sat Mar 5 03:46:15 2011
@@ -9,13 +9,11 @@
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/gmp/trunk/
Standards-Version: 3.8.4
-Package: libgmp3c2
-Section: libs
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libgmp3, libgmp2 (<< 2.0.2-10)
-Replaces: libgmp3
+Package: libgmp10
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Multiprecision arithmetic library
GNU MP is a programmer's library for arbitrary precision
arithmetic (ie, a bignum package). It can operate on signed
@@ -36,19 +34,33 @@
arithmetic (ie, a bignum package). It can operate on signed
integer, rational, and floating point numeric types.
-Package: libgmp3-dev
+Package: libmp3
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libgmp3, libgmp3c2
+Description: Multiprecision arithmetic library (BSD MP)
+ GNU MP is a programmer's library for arbitrary precision
+ arithmetic (ie, a bignum package). It can operate on signed
+ integer, rational, and floating point numeric types.
+ .
+ It has a rich set of functions, and the functions have a regular
+ interface.
+
+Package: libgmp10-dev
Section: libdevel
Priority: optional
Architecture: any
-Depends: libgmp3c2 (= ${binary:Version}), libgmpxx4ldbl (= ${binary:Version}), ${misc:Depends}
-Replaces: libgmp2-dev
-Conflicts: libgmp2-dev
+Depends: libgmp10 (= ${binary:Version}), libgmpxx4ldbl (= ${binary:Version}), libmp3 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libgmp3-dev
+Replaces: libgmp3-dev
Recommends: libstdc++-dev
-Suggests: libgmp3-doc, libmpfr-dev
+Suggests: libgmp10-doc, libmpfr-dev
Description: Multiprecision arithmetic library developers tools
This development package provides the header files and the symbolic
links to allow compilation and linking of programs that use the libraries
- provided in the libgmp3 package.
+ provided in the libgmp10 package.
.
Both C and C++ bindings are present in this package. Package
libstdc++-dev is required to use the C++ bindings.
@@ -56,7 +68,7 @@
The MPFR library (multiple-precision floating-point) used to be
included, but has since been moved to package libmpfr-dev.
-Package: lib32gmp3
+Package: lib32gmp10
Section: libs
Priority: optional
Architecture: amd64 ppc64 kfreebsd-amd64
@@ -83,17 +95,34 @@
integer, rational, and floating point numeric types. This
package includes a 32 bit version of the shared library.
-Package: lib32gmp3-dev
+Package: lib32mp3
+Section: libs
+Priority: optional
+Architecture: amd64 ppc64 kfreebsd-amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libc6-i386 (<= 2.9-18)
+Replaces: lib32gmp3
+Description: Multiprecision arithmetic library (BSD MP, 32bit)
+ GNU MP is a programmer's library for arbitrary precision
+ arithmetic (ie, a bignum package). It can operate on signed
+ integer, rational, and floating point numeric types. This
+ package includes a 32 bit version of the shared library.
+ .
+ It has a rich set of functions, and the functions have a regular
+ interface.
+
+Package: lib32gmp10-dev
Section: libdevel
Priority: optional
Architecture: amd64 ppc64 kfreebsd-amd64
-Depends: libgmp3-dev (= ${binary:Version}), lib32gmp3 (= ${binary:Version}), lib32gmpxx4 (= ${binary:Version}), ${misc:Depends}
-Suggests: libgmp3-doc, libmpfr-dev
-Conflicts: libc6-i386 (<= 2.9-18)
+Depends: libgmp10-dev (= ${binary:Version}), lib32gmp10 (= ${binary:Version}), lib32gmpxx4 (= ${binary:Version}), lib32mp3 (= ${binary:Version}), ${misc:Depends}
+Suggests: libgmp10-doc, libmpfr-dev
+Conflicts: libc6-i386 (<= 2.9-18), lib32gmp3-dev
+Replaces: lib32gmp3-dev
Description: Multiprecision arithmetic library developers tools (32bit)
This development package provides the header files and the symbolic
links to allow compilation and linking of programs that use the
- libraries provided in the libgmp3 package. This package includes 32
+ libraries provided in the libgmp10 package. This package includes 32
bit versions of the link libraries.
.
Both C and C++ bindings are present in this package. Package
@@ -102,7 +131,7 @@
The MPFR library (multiple-precision floating-point) used to be
included, but has since been moved to package libmpfr-dev.
-Package: lib64gmp3
+Package: lib64gmp10
Section: libs
Priority: optional
Architecture: powerpc
@@ -127,16 +156,33 @@
integer, rational, and floating point numeric types. This
package includes a 64 bit version of the shared library.
-Package: lib64gmp3-dev
+Package: lib64mp3
+Section: libs
+Priority: optional
+Architecture: powerpc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: lib64gmp3
+Description: Multiprecision arithmetic library (BSD MP, 64bit library)
+ GNU MP is a programmer's library for arbitrary precision
+ arithmetic (ie, a bignum package). It can operate on signed
+ integer, rational, and floating point numeric types. This
+ package includes a 64 bit version of the shared library.
+ .
+ It has a rich set of functions, and the functions have a regular
+ interface.
+
+Package: lib64gmp10-dev
Section: libdevel
Priority: optional
Architecture: powerpc
-Depends: libgmp3-dev (= ${binary:Version}), lib64gmp3 (= ${binary:Version}), lib64gmpxx4 (= ${binary:Version}), ${misc:Depends}
-Suggests: libgmp3-doc, libmpfr-dev
+Depends: libgmp10-dev (= ${binary:Version}), lib64gmp10 (= ${binary:Version}), lib64gmpxx4 (= ${binary:Version}), lib64mp3 (= ${binary:Version}), ${misc:Depends}
+Conflicts: lib64mp3-dev
+Replaces: lib64mp3-dev
+Suggests: libgmp10-doc, libmpfr-dev
Description: Multiprecision arithmetic library developers tools (64bit)
This development package provides the header files and the symbolic
links to allow compilation and linking of programs that use the
- libraries provided in the libgmp3 package. This package includes 64
+ libraries provided in the libgmp10 package. This package includes 64
bit versions of the link libraries.
.
Both C and C++ bindings are present in this package. Package
@@ -145,10 +191,10 @@
The MPFR library (multiple-precision floating-point) used to be
included, but has since been moved to package libmpfr-dev.
-Package: libgmp3-doc
+Package: libgmp10-doc
Section: doc
Priority: optional
Architecture: all
-Replaces: libgmp3 (<< 3.1.1-8)
+Depends: ${misc:Depends}
Description: Multiprecision arithmetic library example code
This package provides example code illustrating the use of GMP.
Modified: packages/gmp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/rules?rev=38156&op=diff
==============================================================================
--- packages/gmp/trunk/debian/rules (original)
+++ packages/gmp/trunk/debian/rules Sat Mar 5 03:46:15 2011
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-ORIG_SRC_VERSION = 4.3.2
+ORIG_SRC_VERSION = 5.0.1
include /usr/share/quilt/quilt.make
@@ -167,46 +167,46 @@
install: build-stamp install-prep
$(MAKE) DESTDIR=`pwd`/debian/tmp -C build install
- dh_install -plibgmp3c2 usr/lib/libgmp.so.*
- dh_install -plibgmp3c2 usr/lib/libmp.so.*
+ dh_install -plibgmp10 usr/lib/libgmp.so.*
+ dh_install -plibmp3 usr/lib/libmp.so.*
dh_install -plibgmpxx4ldbl usr/lib/libgmpxx.so.*
- dh_install -plibgmp3-dev usr/lib/lib*.so
- dh_install -plibgmp3-dev usr/lib/lib*.a
- dh_install -plibgmp3-dev usr/lib/lib*.la
- dh_install -plibgmp3-dev usr/include
- dh_install -plibgmp3-dev -Xgmp-mparam.h build/gmp*.h usr/include
+ dh_install -plibgmp10-dev usr/lib/lib*.so
+ dh_install -plibgmp10-dev usr/lib/lib*.a
+ dh_install -plibgmp10-dev usr/lib/lib*.la
+ dh_install -plibgmp10-dev usr/include
+ dh_install -plibgmp10-dev -Xgmp-mparam.h build/gmp*.h usr/include
# Install upstream ChangeLog, AUTHORS, NEWS, and README only in -dev package
- dh_installchangelogs -plibgmp3-dev
- dh_installdocs -plibgmp3-dev AUTHORS NEWS README
+ dh_installchangelogs -plibgmp10-dev
+ dh_installdocs -plibgmp10-dev AUTHORS NEWS README
install32: build32-stamp install-prep
$(MAKE) DESTDIR=`pwd`/debian/tmp -C build32 install
- dh_install -plib32gmp3 ${lib32dir}/libgmp.so.*
- dh_install -plib32gmp3 ${lib32dir}/libmp.so.*
+ dh_install -plib32gmp10 ${lib32dir}/libgmp.so.*
+ dh_install -plib32mp3 ${lib32dir}/libmp.so.*
dh_install -plib32gmpxx4 ${lib32dir}/libgmpxx.so.*
- dh_install -plib32gmp3-dev ${lib32dir}/lib*.so
- dh_install -plib32gmp3-dev ${lib32dir}/lib*.a
- dh_install -plib32gmp3-dev ${lib32dir}/lib*.la
- dh_install -plib32gmp3-dev -Xgmp-mparam.h -Xgmp.h build32/gmp*.h usr/include
+ dh_install -plib32gmp10-dev ${lib32dir}/lib*.so
+ dh_install -plib32gmp10-dev ${lib32dir}/lib*.a
+ dh_install -plib32gmp10-dev ${lib32dir}/lib*.la
+ dh_install -plib32gmp10-dev -Xgmp-mparam.h -Xgmp.h build32/gmp*.h usr/include
install64: build64-stamp install-prep
$(MAKE) DESTDIR=`pwd`/debian/tmp -C build64 install
- dh_install -plib64gmp3 ${lib64dir}/libgmp.so.*
- dh_install -plib64gmp3 ${lib64dir}/libmp.so.*
+ dh_install -plib64gmp10 ${lib64dir}/libgmp.so.*
+ dh_install -plib64mp3 ${lib64dir}/libmp.so.*
dh_install -plib64gmpxx4 ${lib64dir}/libgmpxx.so.*
- dh_install -plib64gmp3-dev ${lib64dir}/lib*.so
- dh_install -plib64gmp3-dev ${lib64dir}/lib*.a
- dh_install -plib64gmp3-dev ${lib64dir}/lib*.la
- dh_install -plib64gmp3-dev -Xgmp-mparam.h -Xgmp.h build64/gmp*.h usr/include
+ dh_install -plib64gmp10-dev ${lib64dir}/lib*.so
+ dh_install -plib64gmp10-dev ${lib64dir}/lib*.a
+ dh_install -plib64gmp10-dev ${lib64dir}/lib*.la
+ dh_install -plib64gmp10-dev -Xgmp-mparam.h -Xgmp.h build64/gmp*.h usr/include
# This single target is used to build all the packages, all at once, or
More information about the debian-science-commits
mailing list