diff --git a/.gitattributes b/.gitattributes index 0789e6f3c92..4f365dbc99a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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/cgal_create_makefile.1 -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/cgal-create-makefile.dpatch svneol=native#text/x-diff 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-demo-examples-makefiles.sed -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/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/cgal-create-makefile.dpatch svneol=native#text/x-diff Maintenance/deb/sid/debian/rules -text diff --git a/Maintenance/deb/README b/Maintenance/deb/README index 79e1396851a..dd0c35cebf2 100644 --- a/Maintenance/deb/README +++ b/Maintenance/deb/README @@ -2,11 +2,7 @@ README ====== next revision: -- check if linda override is needed for #369997 - /usr/share/linda/overrides/libcgal-dev: - # override bogus warning caused by #369997 - Tag: exec-not-elf-or-script - Data: /usr/bin/cgal_create_makefile +- check if linda override for #369977 is still needed backport for sarge: - debian/control: diff --git a/Maintenance/deb/sarge/debian/README.Debian b/Maintenance/deb/sarge/debian/README.Debian index b4dde47cdee..74ab94e8e15 100644 --- a/Maintenance/deb/sarge/debian/README.Debian +++ b/Maintenance/deb/sarge/debian/README.Debian @@ -11,10 +11,8 @@ Documentation ------------- Note that the CGAL documentation cannot be packaged for Debian due to unclear -license conditions. In fact, the upstream tarball of CGAL contains the -installation instructions as PDF. Therefore, this document had to be removed -from the Debian tarball. The complete documentation in PDF and HTML is -available at http://www.cgal.org/. +license conditions. The complete documentation in PDF and HTML is available at +http://www.cgal.org/. CGAL_MAKEFILE diff --git a/Maintenance/deb/sarge/debian/changelog b/Maintenance/deb/sarge/debian/changelog index ca00bfc9c7e..f07db027968 100644 --- a/Maintenance/deb/sarge/debian/changelog +++ b/Maintenance/deb/sarge/debian/changelog @@ -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 Fri, 14 Jul 2006 21:20:16 +0200 + cgal (3.2-0sarge1) stable; urgency=low * New upstream release. diff --git a/Maintenance/deb/sarge/debian/patches/00list b/Maintenance/deb/sarge/debian/patches/00list index 047dbc28ae5..3a987ce29a4 100644 --- a/Maintenance/deb/sarge/debian/patches/00list +++ b/Maintenance/deb/sarge/debian/patches/00list @@ -1,3 +1,2 @@ build-library.dpatch cgal-create-makefile.dpatch -bugfix-demo-examples-makefiles.dpatch diff --git a/Maintenance/deb/sarge/debian/patches/bugfix-demo-examples-makefiles.dpatch b/Maintenance/deb/sarge/debian/patches/bugfix-demo-examples-makefiles.dpatch deleted file mode 100755 index 289e2d04c76..00000000000 --- a/Maintenance/deb/sarge/debian/patches/bugfix-demo-examples-makefiles.dpatch +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## bugfix-demo-examples-makefiles.dpatch by Joachim Reichel -## -## 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 diff --git a/Maintenance/deb/sarge/debian/patches/build-library.dpatch b/Maintenance/deb/sarge/debian/patches/build-library.dpatch index 044bb7423d9..ffbc32e72f0 100755 --- a/Maintenance/deb/sarge/debian/patches/build-library.dpatch +++ b/Maintenance/deb/sarge/debian/patches/build-library.dpatch @@ -24,8 +24,8 @@ diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile # target entries #---------------------------------------------------------------------# -+SOVERSION=2.0.0 -+SOMAJOR=2 ++SOVERSION=1.0.1 ++SOMAJOR=1 + shared_lib: $(CGAL_OBJECTS) - $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \ diff --git a/Maintenance/deb/sarge/debian/rules b/Maintenance/deb/sarge/debian/rules index 18fa86ca0b6..515648a2341 100755 --- a/Maintenance/deb/sarge/debian/rules +++ b/Maintenance/deb/sarge/debian/rules @@ -15,8 +15,8 @@ ifndef CXX CXX = g++ endif -SOVERSION=2.0.0 -SOMAJOR=2 +SOVERSION=1.0.1 +SOMAJOR=1 build: build-stamp build-stamp: patch-stamp diff --git a/Maintenance/deb/sid/debian/README.Debian b/Maintenance/deb/sid/debian/README.Debian index b4dde47cdee..74ab94e8e15 100644 --- a/Maintenance/deb/sid/debian/README.Debian +++ b/Maintenance/deb/sid/debian/README.Debian @@ -11,10 +11,8 @@ Documentation ------------- Note that the CGAL documentation cannot be packaged for Debian due to unclear -license conditions. In fact, the upstream tarball of CGAL contains the -installation instructions as PDF. Therefore, this document had to be removed -from the Debian tarball. The complete documentation in PDF and HTML is -available at http://www.cgal.org/. +license conditions. The complete documentation in PDF and HTML is available at +http://www.cgal.org/. CGAL_MAKEFILE diff --git a/Maintenance/deb/sid/debian/changelog b/Maintenance/deb/sid/debian/changelog index d0cb72864cc..83a4d3f92e5 100644 --- a/Maintenance/deb/sid/debian/changelog +++ b/Maintenance/deb/sid/debian/changelog @@ -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 Fri, 14 Jul 2006 21:20:16 +0200 + cgal (3.2-1) unstable; urgency=low * New upstream release. diff --git a/Maintenance/deb/sid/debian/misc/linda-override b/Maintenance/deb/sid/debian/misc/linda-override new file mode 100644 index 00000000000..d0c112b7798 --- /dev/null +++ b/Maintenance/deb/sid/debian/misc/linda-override @@ -0,0 +1,3 @@ +# override bogus warning caused by #369977 +Tag: exec-not-elf-or-script +Data: /usr/bin/cgal_create_makefile diff --git a/Maintenance/deb/sid/debian/patches/00list b/Maintenance/deb/sid/debian/patches/00list index 047dbc28ae5..3a987ce29a4 100644 --- a/Maintenance/deb/sid/debian/patches/00list +++ b/Maintenance/deb/sid/debian/patches/00list @@ -1,3 +1,2 @@ build-library.dpatch cgal-create-makefile.dpatch -bugfix-demo-examples-makefiles.dpatch diff --git a/Maintenance/deb/sid/debian/patches/bugfix-demo-examples-makefiles.dpatch b/Maintenance/deb/sid/debian/patches/bugfix-demo-examples-makefiles.dpatch deleted file mode 100755 index 289e2d04c76..00000000000 --- a/Maintenance/deb/sid/debian/patches/bugfix-demo-examples-makefiles.dpatch +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## bugfix-demo-examples-makefiles.dpatch by Joachim Reichel -## -## 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 diff --git a/Maintenance/deb/sid/debian/patches/build-library.dpatch b/Maintenance/deb/sid/debian/patches/build-library.dpatch index 044bb7423d9..ffbc32e72f0 100755 --- a/Maintenance/deb/sid/debian/patches/build-library.dpatch +++ b/Maintenance/deb/sid/debian/patches/build-library.dpatch @@ -24,8 +24,8 @@ diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile # target entries #---------------------------------------------------------------------# -+SOVERSION=2.0.0 -+SOMAJOR=2 ++SOVERSION=1.0.1 ++SOMAJOR=1 + shared_lib: $(CGAL_OBJECTS) - $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \ diff --git a/Maintenance/deb/sid/debian/rules b/Maintenance/deb/sid/debian/rules index 18fa86ca0b6..05126231946 100755 --- a/Maintenance/deb/sid/debian/rules +++ b/Maintenance/deb/sid/debian/rules @@ -15,8 +15,8 @@ ifndef CXX CXX = g++ endif -SOVERSION=2.0.0 -SOMAJOR=2 +SOVERSION=1.0.1 +SOMAJOR=1 build: build-stamp build-stamp: patch-stamp @@ -60,7 +60,7 @@ install: build dh_clean -k 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 @@ -102,6 +102,9 @@ install: build install -d debian/libcgal1/DEBIAN 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 dh_testdir -i dh_testroot -i