Changeset ccb904 in git

Timestamp:

Apr 29, 2013, 11:39:37 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

9f9dd43ae70c6fefcee2255f30e3cb98f9c50ace

Parents:

2e7132d3e6a6b5db4b3d0b22eeb095b9a3e57e7510c89cd820352b07e7cbd9b4472ae6a32d0281f1

Message:

Merge pull request #322 from mschulze/spielwiese

Spielwiese - debian package stuff

Files:

• debian/control (modified) (1 diff)
• debian/copyright (modified) (1 diff)
• debian/rules (modified) (2 diffs)
• debian/singular-bin.install (added)
• debian/singular-common.dirs (moved) (moved from debian/singular.dirs)
• debian/singular-common.install (added)
• debian/singular-dev.install (added)
• libpolys/polys/ext_fields/transext.cc (modified) (5 diffs)

debian/control

@@ -8 +8 @@
 Package: singular
 Architecture: any
+Depends: singular-bin, singular-common
+Description: computer algebra system for polynomial computations (meta package)
+ Singular is a computer algebra system for polynomial computations with
+ emphasis on the special needs of commutative algebra, algebraic geometry,
+ and singularity theory.
+ .
+ This meta package provides a complete installation for users. 
+
+Package: singular-bin
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: computer algebra system for polynomial computations
- Singular is a computer algebra system for polynomial computations with emphasis on the special needs of commutative algebra, algebraic geometry, and singularity theory.
- Singular's main computational objects are ideals and modules over a large variety of baserings. The baserings are polynomial rings or localizations thereof over a field (e.g., finite fields, the rationals, floats, algebraic extensions, transcendental extensions) or quotient rings with respect to an ideal.
- Singular features one of the fastest and most general implementations of various algorithms for computing Groebner resp. standard bases. The implementation includes Buchberger's algorithm (if the ordering is a wellordering) and Mora's algorithm (if the ordering is a tangent cone ordering) as special cases. Furthermore, it provides polynomial factorizations, resultant, characteristic set and gcd computations, syzygy and free-resolution computations, and many more related functionalities.
- Based on an easy-to-use interactive shell and a C-like programming language, Singular's internal functionality is augmented and user-extendible by libraries written in the Singular programming language. A general and efficient implementation of communication links allows Singular to make its functionality available to other programs.
+Description: computer algebra system for polynomial computations (binary files)
+ Singular is a computer algebra system for polynomial computations with 
+ emphasis on the special needs of commutative algebra, algebraic geometry,
+ and singularity theory.
+ .
+ This package contains binary files.
 
+Package: singular-common
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: computer algebra system for polynomial computations (common files)
+ Singular is a computer algebra system for polynomial computations with
+ emphasis on the special needs of commutative algebra, algebraic geometry,
+ and singularity theory.
+ .
+ This package contains architecture-independent files.
+
+Package: singular-dev
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: computer algebra system for polynomial computations (development)
+ Singular is a computer algebra system for polynomial computations with
+ emphasis on the special needs of commutative algebra, algebraic geometry,
+ and singularity theory.
+ .
+ This package contains develoment files.
+

debian/copyright

@@ -8 +8 @@
 
 License: GPL-2
-The full text of the GPL is distributed in
-/usr/share/common-licenses/GPL-2 on Debian systems.
+The full text of the GPL is distributed in /usr/share/common-licenses/GPL-2 
+on Debian systems.
 
 License: GL-3
-The full text of the GPL is distributed in
-/usr/share/common-licenses/GPL-3 on Debian systems.
+The full text of the GPL is distributed in /usr/share/common-licenses/GPL-3 
+on Debian systems.
 

debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
-
-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
 
 %:
@@ -11 +9 @@
 override_dh_auto_install:
         dh_auto_install
-        install debian/icons/Singular.desktop debian/singular/usr/share/applications
-        install debian/icons/Singular-manual.desktop debian/singular/usr/share/applications
-        install debian/icons/Singular.png debian/singular/usr/share/icons
+        install debian/icons/Singular.desktop debian/singular-common/usr/share/applications
+        install debian/icons/Singular-manual.desktop debian/singular-common/usr/share/applications
+        install debian/icons/Singular.png debian/singular-common/usr/share/icons
 

libpolys/polys/ext_fields/transext.cc

@@ -183 +183 @@
       number n=pGetCoeff(p);
       n_Test(n,ntCoeffs);
+      if ((!(SR_HDL(n) & SR_INT))&&(n->s==0))
+      /* not normalized, just do for the following test*/
+      {
+        n_Normalize(pGetCoeff(p),ntCoeffs);
+        n=pGetCoeff(p);
+      }
       if (!(SR_HDL(n) & SR_INT))
       {
@@ -988 +994 @@
        then both the numerator and the denominator will be divided by the
        GCD of the a_alpha's and the c_beta's (if this GCD is != 1),
-   (3) if 'a' is - e.g. after having performed steps (1) and (2) - of the
-       form
-          (sum_alpha a_alpha * t^alpha)
-          -----------------------------
-                        c
-       with integers a_alpha, and c != 1, then 'a' will be replaced by
-       (sum_alpha a_alpha/c * t^alpha);
    this procedure does not alter COM(f) (this has to be done by the
    calling procedure);
@@ -1004 +1003 @@
   assume(!DENIS1(f));
 
-  if (!p_IsConstant(DEN(f), ntRing))
   { /* step (1); see documentation of this procedure above */
     p_Normalize(NUM(f), ntRing);
@@ -1038 +1036 @@
     }
     n_Delete(&lcmOfDenominators, ntCoeffs);
-    if (!p_IsConstant(DEN(f), ntRing))
+    if (DEN(f)!=NULL)
     { /* step (2); see documentation of this procedure above */
       p = NUM(f);
@@ -1072 +1070 @@
       n_Delete(&gcdOfCoefficients, ntCoeffs);
     }
-  }
-  if (p_IsConstant(DEN(f), ntRing) &&
-      (!n_IsOne(p_GetCoeff(DEN(f), ntRing), ntCoeffs)))
-  { /* step (3); see documentation of this procedure above */
-    number inverseOfDen = n_Invers(p_GetCoeff(DEN(f), ntRing), ntCoeffs);
-    NUM(f) = p_Mult_nn(NUM(f), inverseOfDen, ntRing);
-    n_Delete(&inverseOfDen, ntCoeffs);
-    p_Delete(&DEN(f), ntRing);
-    DEN(f) = NULL;
   }