[graphite2] 07/38: Import Debian changes 1.10.2-2
Rene Engelhard
rene at moszumanska.debian.org
Sun May 14 10:53:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch experimental
in repository graphite2.
commit ecd4b1233c484934d7d9370fc4c469c87bbd1481
Author: Steve M. Robbins <smr at debian.org>
Date: Sun Apr 3 15:44:09 2005 -0400
Import Debian changes 1.10.2-2
cppunit (1.10.2-2) unstable; urgency=low
* Rename library package to reflect the SONAME change. Package
libcppunit-1.10-2 conflicts and replaces libcppunit-1.10-0 (version
1.10.2-1). Closes: #297026.
---
aclocal.m4 | 24 +++++++++----
configure | 106 ++++++++++++++++++++++++++++++++++++++++---------------
debian/changelog | 8 +++++
debian/control | 6 ++--
debian/rules | 2 +-
5 files changed, 108 insertions(+), 38 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 580d925..080033f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -14,7 +14,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 203 $
+# Debian $Rev: 214 $
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1448,6 +1448,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -2178,7 +2190,7 @@ linux*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | knetbsd*-gnu)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3172,7 +3184,7 @@ case $host_os in
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -4662,7 +4674,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5105,7 +5117,7 @@ EOF
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5523,7 +5535,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
diff --git a/configure b/configure
index 42752fa..c829fd7 100755
--- a/configure
+++ b/configure
@@ -4128,7 +4128,7 @@ linux*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | knetbsd*-gnu)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -6851,7 +6851,7 @@ EOF
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -7369,7 +7369,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -8018,6 +8018,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -8850,7 +8862,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8853 "configure"
+#line 8865 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8948,7 +8960,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8951 "configure"
+#line 8963 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10459,7 +10471,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -11014,7 +11026,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -11125,11 +11137,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11128: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11140: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11132: \$? = $ac_status" >&5
+ echo "$as_me:11144: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11185,11 +11197,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11188: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11200: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11192: \$? = $ac_status" >&5
+ echo "$as_me:11204: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11710,6 +11722,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -12542,7 +12566,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12545 "configure"
+#line 12569 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12640,7 +12664,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12643 "configure"
+#line 12667 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13467,11 +13491,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13470: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13494: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13474: \$? = $ac_status" >&5
+ echo "$as_me:13498: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13527,11 +13551,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13530: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13554: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13534: \$? = $ac_status" >&5
+ echo "$as_me:13558: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13704,7 +13728,7 @@ EOF
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -14202,7 +14226,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs_F77=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -14851,6 +14875,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -15560,11 +15596,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15563: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15599: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15567: \$? = $ac_status" >&5
+ echo "$as_me:15603: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15793,11 +15829,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15796: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15832: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15800: \$? = $ac_status" >&5
+ echo "$as_me:15836: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15853,11 +15889,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15856: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15892: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15860: \$? = $ac_status" >&5
+ echo "$as_me:15896: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16030,7 +16066,7 @@ EOF
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -16548,7 +16584,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs_GCJ=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -17197,6 +17233,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -18029,7 +18077,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18032 "configure"
+#line 18080 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18127,7 +18175,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18130 "configure"
+#line 18178 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/debian/changelog b/debian/changelog
index ac87f78..663de18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cppunit (1.10.2-2) unstable; urgency=low
+
+ * Rename library package to reflect the SONAME change. Package
+ libcppunit-1.10-2 conflicts and replaces libcppunit-1.10-0 (version
+ 1.10.2-1). Closes: #297026.
+
+ -- Steve M. Robbins <smr at debian.org> Sun, 3 Apr 2005 15:44:09 -0400
+
cppunit (1.10.2-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/control b/debian/control
index 538d6de..de26e2a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,11 @@ Description: Unit Testing Library for C++ [transitional package]
This package simply depends on libcppunit-dev, and may be
safely removed once the latter is installed.
-Package: libcppunit-1.10-0
+Package: libcppunit-1.10-2
Architecture: any
Depends: ${shlibs:Depends}
+Conflicts: libcppunit-1.10-0 (= 1.10.2-1)
+Replaces: libcppunit-1.10-0 (= 1.10.2-1)
Description: Unit Testing Library for C++
CppUnit is a simple Framework for incorporating test cases in
your C++ code. It is similar to, and inspired by, xUnit and
@@ -39,7 +41,7 @@ Description: Unit Testing Library for C++
Package: libcppunit-dev
Architecture: any
-Depends: libcppunit-1.10-0 (= ${Source-Version}), ${shlibs:Depends}
+Depends: libcppunit-1.10-2 (= ${Source-Version}), ${shlibs:Depends}
Suggests: libqttestrunner1 (= ${Source-Version})
Replaces: cppunit (<< 1.10.0-3)
Description: Unit Testing Library for C++
diff --git a/debian/rules b/debian/rules
index f8bc413..fecab29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ install: build
install
# Runtime library package
- dh_install -plibcppunit-1.10-0 --autodest debian/tmp/usr/lib/lib*.so.*
+ dh_install -plibcppunit-1.10-2 --autodest debian/tmp/usr/lib/lib*.so.*
# Qt Test runner library package
dh_install -plibqttestrunner1 lib/lib*.so.* usr/lib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
More information about the Pkg-openoffice-commits
mailing list