[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
Bas Couwenberg
sebastic at xs4all.nl
Wed Sep 11 15:55:15 UTC 2013
The following commit has been merged in the master branch:
commit 478997425ad4e59b080a5cbc4d23d8693d525c09
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Sep 2 21:47:53 2013 +0200
SONAME of libmapserver changed from libmapserver-6.2.1.so to libmapserver.so.1.
diff --git a/debian/changelog b/debian/changelog
index 56cf633..d45d1da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
install-ruby-mapscript.patch
* Add patch to fix the Perl mapscript module installation directory:
perl-mapscript-install.patch
+ * SONAME of libmapserver changed from libmapserver-6.2.1.so to
+ libmapserver.so.1.
-- Bas Couwenberg <sebastic at xs4all.nl> Sun, 01 Sep 2013 14:14:54 +0200
diff --git a/debian/control b/debian/control
index fdf5982..a29131a 100644
--- a/debian/control
+++ b/debian/control
@@ -24,16 +24,26 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
Package: libmapserver
-Depends: libmapserver-6.2.1, ${misc:Depends}
+Depends: libmapserver1, ${misc:Depends}
Architecture: all
Section: oldlibs
-Description: Transitional dummy package for libmapserver-6.2.1
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1 package. It can safely be removed.
+Description: Dummy package for libmapserver to libmapserver1 transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver package to the libmapserver1 package.
+ It can safely be removed.
Package: libmapserver-6.2.1
-Replaces: libmapserver (<< 6.2.1-3~)
-Breaks: libmapserver (<< 6.2.1-3~)
+Depends: libmapserver1, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: Dummy package for libmapserver-6.2.1 to libmapserver1 transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-6.2.1 package to the libmapserver1 package.
+ It can safely be removed.
+
+Package: libmapserver1
+Replaces: libmapserver (<< 6.2.1-3~), libmapserver-6.2.1
+Breaks: libmapserver (<< 6.2.1-3~), libmapserver-6.2.1
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
@@ -49,19 +59,29 @@ Description: Shared library for MapServer
library packages.
Package: libmapserver-dev
-Depends: libmapserver-6.2.1-dev, ${misc:Depends}
+Depends: libmapserver1-dev, ${misc:Depends}
Architecture: all
Section: oldlibs
-Description: Transitional dummy package for libmapserver-6.2.1-dev
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1-dev package. It can safely be removed.
+Description: Transitional dummy package for libmapserver1-dev
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-dev package to the libmapserver1-dev package.
+ It can safely be removed.
Package: libmapserver-6.2.1-dev
-Replaces: libmapserver-dev (<< 6.2.1-3~)
-Breaks: libmapserver-dev (<< 6.2.1-3~)
+Depends: libmapserver1-dev, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: Dummy package for libmapserver1-dev transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-6.2.1-dev package to the libmapserver1-dev package.
+ It can safely be removed.
+
+Package: libmapserver1-dev
+Replaces: libmapserver-dev (<< 6.2.1-3~), libmapserver-6.2.1-dev
+Breaks: libmapserver-dev (<< 6.2.1-3~), libmapserver-6.2.1-dev
Section: libdevel
Architecture: any
-Depends: libmapserver-6.2.1 (=${binary:Version}), ${misc:Depends}
+Depends: libmapserver1 (=${binary:Version}), ${misc:Depends}
Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
libmapscript-perl, php5-mapscript, python-mapscript, ruby-mapscript
Description: Shared library development files for MapServer
diff --git a/debian/libmapserver-6.2.1-dev.install b/debian/libmapserver-6.2.1-dev.install
deleted file mode 100644
index bbe1641..0000000
--- a/debian/libmapserver-6.2.1-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/mapserver-config
-usr/include/mapserver/*
-usr/lib/*/libmapserver.la
-usr/lib/*/libmapserver.so
diff --git a/debian/libmapserver-6.2.1-dev.manpages b/debian/libmapserver-6.2.1-dev.manpages
deleted file mode 100644
index 4951557..0000000
--- a/debian/libmapserver-6.2.1-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/mapserver-config.1
diff --git a/debian/libmapserver-6.2.1.install b/debian/libmapserver-6.2.1.install
deleted file mode 100644
index 01666b4..0000000
--- a/debian/libmapserver-6.2.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmapserver-*.so
diff --git a/debian/libmapserver1-dev.install b/debian/libmapserver1-dev.install
new file mode 100644
index 0000000..37c593f
--- /dev/null
+++ b/debian/libmapserver1-dev.install
@@ -0,0 +1,2 @@
+usr/include/mapserver/*
+usr/lib/*/libmapserver.so
diff --git a/debian/libmapserver1.install b/debian/libmapserver1.install
new file mode 100644
index 0000000..d66fe12
--- /dev/null
+++ b/debian/libmapserver1.install
@@ -0,0 +1 @@
+usr/lib/*/libmapserver.so.*
diff --git a/debian/libmapserver-6.2.1.postinst b/debian/libmapserver1.postinst
similarity index 100%
rename from debian/libmapserver-6.2.1.postinst
rename to debian/libmapserver1.postinst
diff --git a/debian/libmapserver-6.2.1.postrm b/debian/libmapserver1.postrm
similarity index 100%
rename from debian/libmapserver-6.2.1.postrm
rename to debian/libmapserver1.postrm
diff --git a/debian/libmapserver-6.2.1.symbols b/debian/libmapserver1.symbols
similarity index 99%
rename from debian/libmapserver-6.2.1.symbols
rename to debian/libmapserver1.symbols
index fb988cb..bdfcf0c 100644
--- a/debian/libmapserver-6.2.1.symbols
+++ b/debian/libmapserver1.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 6.2.1 amd64 i386
-libmapserver-6.2.1.so #PACKAGE# #MINVER#
+libmapserver.so.1 #PACKAGE# #MINVER#
BuildExpressionTree at Base 6.2.1
CleanVSIDir at Base 6.2.1
CompareEllipseRegion at Base 6.2.1
diff --git a/debian/man/mapserver-config.1.xml b/debian/man/mapserver-config.1.xml
deleted file mode 100644
index ba6ef7c..0000000
--- a/debian/man/mapserver-config.1.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<refentry id='mapserver-config'>
-
- <refmeta>
- <refentrytitle>mapserver-config</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
-
- <refnamediv>
- <refname>mapserver-config</refname>
- <refpurpose>query mapserver build options</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv id='synopsis'>
- <cmdsynopsis>
- <command>mapserver-config</command>
- <arg choice='opt'><option>--libs</option></arg>
- <arg choice='opt'><option>--dep-libs</option></arg>
- <arg choice='opt'><option>--cflags</option></arg>
- <arg choice='opt'><option>--defines</option></arg>
- <arg choice='opt'><option>--includes</option></arg>
- <arg choice='opt'><option>--version</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1 id='description'>
- <title>DESCRIPTION</title>
- <para>
- <command>mapserver-config</command> allows querying the options used to
- build the MapServer binaries.
- </para>
- </refsect1>
-
- <refsect1 id='options'>
- <title>OPTIONS</title>
- <variablelist>
-
- <varlistentry>
- <term><option>--libs</option></term>
- <listitem>
- <para>
- Libraries (SUP_LIBS)
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--dep-libs</option></term>
- <listitem>
- <para>Libraries (LIBS)</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--cflags</option></term>
- <listitem>
- <para>Compiler flags (CFLAGS)</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--defines</option></term>
- <listitem>
- <para>Compiler defines (DEFINES/ALL_ENABLED)</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--includes</option></term>
- <listitem>
- <para>Compiler includes (INCLUDES)</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--version</option></term>
- <listitem>
- <para>MapServer version (MS_VERSION)</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
- </refsect1>
-
-</refentry>
--
Packaging for MapServer
More information about the Pkg-grass-devel
mailing list