mirror of https://github.com/CGAL/cgal
* updated for 3.2.1-1 (sid) and 3.2-1sarge1 (sarge)
* revert Laurent's premature SONAME change
This commit is contained in:
Joachim Reichel
parent
a3fb4459b0
commit
ff89873527
|
|
@ -600,7 +600,6 @@ Maintenance/deb/sarge/debian/misc/adjust-default-makefile.sed -text
|
||||||
Maintenance/deb/sarge/debian/misc/adjust-demo-examples-makefiles.sed -text
|
Maintenance/deb/sarge/debian/misc/adjust-demo-examples-makefiles.sed -text
|
||||||
Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1 -text
|
Maintenance/deb/sarge/debian/misc/cgal_create_makefile.1 -text
|
||||||
Maintenance/deb/sarge/debian/patches/00list -text
|
Maintenance/deb/sarge/debian/patches/00list -text
|
||||||
Maintenance/deb/sarge/debian/patches/bugfix-demo-examples-makefiles.dpatch svneol=native#text/x-diff
|
|
||||||
Maintenance/deb/sarge/debian/patches/build-library.dpatch svneol=native#text/x-diff
|
Maintenance/deb/sarge/debian/patches/build-library.dpatch svneol=native#text/x-diff
|
||||||
Maintenance/deb/sarge/debian/patches/cgal-create-makefile.dpatch svneol=native#text/x-diff
|
Maintenance/deb/sarge/debian/patches/cgal-create-makefile.dpatch svneol=native#text/x-diff
|
||||||
Maintenance/deb/sarge/debian/rules -text
|
Maintenance/deb/sarge/debian/rules -text
|
||||||
|
|
@ -615,8 +614,8 @@ Maintenance/deb/sid/debian/libcgal1.shlibs -text
|
||||||
Maintenance/deb/sid/debian/misc/adjust-default-makefile.sed -text
|
Maintenance/deb/sid/debian/misc/adjust-default-makefile.sed -text
|
||||||
Maintenance/deb/sid/debian/misc/adjust-demo-examples-makefiles.sed -text
|
Maintenance/deb/sid/debian/misc/adjust-demo-examples-makefiles.sed -text
|
||||||
Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 -text
|
Maintenance/deb/sid/debian/misc/cgal_create_makefile.1 -text
|
||||||
|
Maintenance/deb/sid/debian/misc/linda-override -text
|
||||||
Maintenance/deb/sid/debian/patches/00list -text
|
Maintenance/deb/sid/debian/patches/00list -text
|
||||||
Maintenance/deb/sid/debian/patches/bugfix-demo-examples-makefiles.dpatch svneol=native#text/x-diff
|
|
||||||
Maintenance/deb/sid/debian/patches/build-library.dpatch svneol=native#text/x-diff
|
Maintenance/deb/sid/debian/patches/build-library.dpatch svneol=native#text/x-diff
|
||||||
Maintenance/deb/sid/debian/patches/cgal-create-makefile.dpatch svneol=native#text/x-diff
|
Maintenance/deb/sid/debian/patches/cgal-create-makefile.dpatch svneol=native#text/x-diff
|
||||||
Maintenance/deb/sid/debian/rules -text
|
Maintenance/deb/sid/debian/rules -text
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,7 @@ README
|
||||||
======
|
======
|
||||||
|
|
||||||
next revision:
|
next revision:
|
||||||
- check if linda override is needed for #369997
|
- check if linda override for #369977 is still needed
|
||||||
/usr/share/linda/overrides/libcgal-dev:
|
|
||||||
# override bogus warning caused by #369997
|
|
||||||
Tag: exec-not-elf-or-script
|
|
||||||
Data: /usr/bin/cgal_create_makefile
|
|
||||||
|
|
||||||
backport for sarge:
|
backport for sarge:
|
||||||
- debian/control:
|
- debian/control:
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,8 @@ Documentation
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
Note that the CGAL documentation cannot be packaged for Debian due to unclear
|
Note that the CGAL documentation cannot be packaged for Debian due to unclear
|
||||||
license conditions. In fact, the upstream tarball of CGAL contains the
|
license conditions. The complete documentation in PDF and HTML is available at
|
||||||
installation instructions as PDF. Therefore, this document had to be removed
|
http://www.cgal.org/.
|
||||||
from the Debian tarball. The complete documentation in PDF and HTML is
|
|
||||||
available at http://www.cgal.org/.
|
|
||||||
|
|
||||||
|
|
||||||
CGAL_MAKEFILE
|
CGAL_MAKEFILE
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,10 @@
|
||||||
|
cgal (3.2.1-0sarge1) stable; urgency=low
|
||||||
|
|
||||||
|
* New upstream release.
|
||||||
|
* Remove patch bugfix-demo-examples-makefiles.dpatch (no longer needed).
|
||||||
|
|
||||||
|
-- Joachim Reichel <joachim.reichel@gmx.de> Fri, 14 Jul 2006 21:20:16 +0200
|
||||||
|
|
||||||
cgal (3.2-0sarge1) stable; urgency=low
|
cgal (3.2-0sarge1) stable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,2 @@
|
||||||
build-library.dpatch
|
build-library.dpatch
|
||||||
cgal-create-makefile.dpatch
|
cgal-create-makefile.dpatch
|
||||||
bugfix-demo-examples-makefiles.dpatch
|
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
||||||
## bugfix-demo-examples-makefiles.dpatch by Joachim Reichel <joachim.reichel@gmx.de>
|
|
||||||
##
|
|
||||||
## All lines beginning with `## DP:' are a description of the patch.
|
|
||||||
## DP: No description.
|
|
||||||
|
|
||||||
@DPATCH@
|
|
||||||
diff -urNad cgal-3.2~/demo/makefile cgal-3.2/demo/makefile
|
|
||||||
--- cgal-3.2~/demo/makefile 2006-05-22 21:00:57.000000000 +0200
|
|
||||||
+++ cgal-3.2/demo/makefile 2006-05-29 20:22:24.000000000 +0200
|
|
||||||
@@ -8,6 +8,6 @@
|
|
||||||
clean:
|
|
||||||
@for DIR in *; do \
|
|
||||||
if test -d "$$DIR"; then \
|
|
||||||
- ( cd "$$DIR" && $(MAKE) ) \
|
|
||||||
+ ( cd "$$DIR" && $(MAKE) clean ) \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
diff -urNad cgal-3.2~/examples/makefile cgal-3.2/examples/makefile
|
|
||||||
--- cgal-3.2~/examples/makefile 2006-05-22 21:00:57.000000000 +0200
|
|
||||||
+++ cgal-3.2/examples/makefile 2006-05-29 20:22:31.000000000 +0200
|
|
||||||
@@ -8,6 +8,6 @@
|
|
||||||
clean:
|
|
||||||
@for DIR in *; do \
|
|
||||||
if test -d "$$DIR"; then \
|
|
||||||
- ( cd "$$DIR" && $(MAKE) ) \
|
|
||||||
+ ( cd "$$DIR" && $(MAKE) clean ) \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
|
|
@ -24,8 +24,8 @@ diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile
|
||||||
# target entries
|
# target entries
|
||||||
#---------------------------------------------------------------------#
|
#---------------------------------------------------------------------#
|
||||||
|
|
||||||
+SOVERSION=2.0.0
|
+SOVERSION=1.0.1
|
||||||
+SOMAJOR=2
|
+SOMAJOR=1
|
||||||
+
|
+
|
||||||
shared_lib: $(CGAL_OBJECTS)
|
shared_lib: $(CGAL_OBJECTS)
|
||||||
- $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \
|
- $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ ifndef CXX
|
||||||
CXX = g++
|
CXX = g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SOVERSION=2.0.0
|
SOVERSION=1.0.1
|
||||||
SOMAJOR=2
|
SOMAJOR=1
|
||||||
|
|
||||||
build: build-stamp
|
build: build-stamp
|
||||||
build-stamp: patch-stamp
|
build-stamp: patch-stamp
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,8 @@ Documentation
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
Note that the CGAL documentation cannot be packaged for Debian due to unclear
|
Note that the CGAL documentation cannot be packaged for Debian due to unclear
|
||||||
license conditions. In fact, the upstream tarball of CGAL contains the
|
license conditions. The complete documentation in PDF and HTML is available at
|
||||||
installation instructions as PDF. Therefore, this document had to be removed
|
http://www.cgal.org/.
|
||||||
from the Debian tarball. The complete documentation in PDF and HTML is
|
|
||||||
available at http://www.cgal.org/.
|
|
||||||
|
|
||||||
|
|
||||||
CGAL_MAKEFILE
|
CGAL_MAKEFILE
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,11 @@
|
||||||
|
cgal (3.2.1-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New upstream release.
|
||||||
|
* Add linda override for bug #369977.
|
||||||
|
* Remove patch bugfix-demo-examples-makefiles.dpatch (no longer needed).
|
||||||
|
|
||||||
|
-- Joachim Reichel <joachim.reichel@gmx.de> Fri, 14 Jul 2006 21:20:16 +0200
|
||||||
|
|
||||||
cgal (3.2-1) unstable; urgency=low
|
cgal (3.2-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
# override bogus warning caused by #369977
|
||||||
|
Tag: exec-not-elf-or-script
|
||||||
|
Data: /usr/bin/cgal_create_makefile
|
||||||
|
|
@ -1,3 +1,2 @@
|
||||||
build-library.dpatch
|
build-library.dpatch
|
||||||
cgal-create-makefile.dpatch
|
cgal-create-makefile.dpatch
|
||||||
bugfix-demo-examples-makefiles.dpatch
|
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
||||||
## bugfix-demo-examples-makefiles.dpatch by Joachim Reichel <joachim.reichel@gmx.de>
|
|
||||||
##
|
|
||||||
## All lines beginning with `## DP:' are a description of the patch.
|
|
||||||
## DP: No description.
|
|
||||||
|
|
||||||
@DPATCH@
|
|
||||||
diff -urNad cgal-3.2~/demo/makefile cgal-3.2/demo/makefile
|
|
||||||
--- cgal-3.2~/demo/makefile 2006-05-22 21:00:57.000000000 +0200
|
|
||||||
+++ cgal-3.2/demo/makefile 2006-05-29 20:22:24.000000000 +0200
|
|
||||||
@@ -8,6 +8,6 @@
|
|
||||||
clean:
|
|
||||||
@for DIR in *; do \
|
|
||||||
if test -d "$$DIR"; then \
|
|
||||||
- ( cd "$$DIR" && $(MAKE) ) \
|
|
||||||
+ ( cd "$$DIR" && $(MAKE) clean ) \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
diff -urNad cgal-3.2~/examples/makefile cgal-3.2/examples/makefile
|
|
||||||
--- cgal-3.2~/examples/makefile 2006-05-22 21:00:57.000000000 +0200
|
|
||||||
+++ cgal-3.2/examples/makefile 2006-05-29 20:22:31.000000000 +0200
|
|
||||||
@@ -8,6 +8,6 @@
|
|
||||||
clean:
|
|
||||||
@for DIR in *; do \
|
|
||||||
if test -d "$$DIR"; then \
|
|
||||||
- ( cd "$$DIR" && $(MAKE) ) \
|
|
||||||
+ ( cd "$$DIR" && $(MAKE) clean ) \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
|
|
@ -24,8 +24,8 @@ diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile
|
||||||
# target entries
|
# target entries
|
||||||
#---------------------------------------------------------------------#
|
#---------------------------------------------------------------------#
|
||||||
|
|
||||||
+SOVERSION=2.0.0
|
+SOVERSION=1.0.1
|
||||||
+SOMAJOR=2
|
+SOMAJOR=1
|
||||||
+
|
+
|
||||||
shared_lib: $(CGAL_OBJECTS)
|
shared_lib: $(CGAL_OBJECTS)
|
||||||
- $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \
|
- $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ ifndef CXX
|
||||||
CXX = g++
|
CXX = g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SOVERSION=2.0.0
|
SOVERSION=1.0.1
|
||||||
SOMAJOR=2
|
SOMAJOR=1
|
||||||
|
|
||||||
build: build-stamp
|
build: build-stamp
|
||||||
build-stamp: patch-stamp
|
build-stamp: patch-stamp
|
||||||
|
|
@ -60,7 +60,7 @@ install: build
|
||||||
dh_clean -k
|
dh_clean -k
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
|
|
||||||
mkdir -p debian/tmp/{usr/bin,usr/include,usr/lib,usr/share/cgal,usr/share/doc/cgal}
|
mkdir -p debian/tmp/{usr/bin,usr/include,usr/lib,usr/share/cgal,usr/share/doc/cgal,usr/share/linda/overrides/libcgal-dev}
|
||||||
|
|
||||||
cp -a scripts/cgal_create_makefile debian/tmp/usr/bin
|
cp -a scripts/cgal_create_makefile debian/tmp/usr/bin
|
||||||
|
|
||||||
|
|
@ -102,6 +102,9 @@ install: build
|
||||||
install -d debian/libcgal1/DEBIAN
|
install -d debian/libcgal1/DEBIAN
|
||||||
install -m644 debian/libcgal1.shlibs debian/libcgal1/DEBIAN/shlibs
|
install -m644 debian/libcgal1.shlibs debian/libcgal1/DEBIAN/shlibs
|
||||||
|
|
||||||
|
install -d debian/libcgal-dev/usr/share/linda/overrides
|
||||||
|
install -m644 debian/misc/linda-override debian/libcgal-dev/usr/share/linda/overrides/libcgal-dev
|
||||||
|
|
||||||
binary-indep: build install
|
binary-indep: build install
|
||||||
dh_testdir -i
|
dh_testdir -i
|
||||||
dh_testroot -i
|
dh_testroot -i
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue