[SCM] libgaiagraphics branch, master, updated. upstream/0.5-24-g16e7f3a
The following commit has been merged in the master branch: commit 16e7f3ad2991c306d3388623467f6d4cc06a614a Merge: c8474f480e2192de822a3795a831a96ed1383818 a5a0cb39f8b6cb82fc49e248aaec0bc5333523ad Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Oct 14 20:05:04 2013 +0200 Merge branch 'master' of http://git.debian.org/git/pkg-grass/libgaiagraphics Conflicts: debian/copyright -- Packaging of libgaiagraphics in Debian ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] libgaiagraphics branch, master, updated. upstream/0.5-24-g16e7f3a
The following commit has been merged in the master branch:
commit b3ee173bdf4b721b6f06ae407a91b27d7f7d6407
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 30 21:56:42 2013 +0200
Enable Multi-Arch for libgaiagraphics1.
diff --git a/debian/changelog b/debian/changelog
index b2b55bc..96f048c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libgaiagraphics (0.5-1) experimental; urgency=low
* Update symbols file for 0.5 on amd64.
* Update copyright file.
* Bump debhelper compatibility to 9.
+ * Enable Multi-Arch for libgaiagraphics1.
-- Bas Couwenberg sebas...@xs4all.nl Mon, 30 Sep 2013 20:11:57 +0200
diff --git a/debian/control b/debian/control
index babb9f5..3d6357d 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,8 @@ Description: Gaia common graphics support - development
headers
Package: libgaiagraphics1
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Gaia common graphics support
libgaiagraphics is a library supporting common-utility raster handling
@@ -45,6 +47,7 @@ Package: libgaiagraphics1-dbg
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}
, libgaiagraphics1 (= ${binary:Version})
Description: Gaia common graphics support - debugging symbols
diff --git a/debian/libgaiagraphics-dev.install
b/debian/libgaiagraphics-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/libgaiagraphics-dev.install
+++ b/debian/libgaiagraphics-dev.install
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libgaiagraphics1.install b/debian/libgaiagraphics1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libgaiagraphics1.install
+++ b/debian/libgaiagraphics1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
--
Packaging of libgaiagraphics in Debian
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] libgaiagraphics branch, master, updated. upstream/0.5-24-g16e7f3a
The following commit has been merged in the master branch: commit ba1e1a2404a6e26f00b4c8df57166ddbf7967734 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 30 21:44:27 2013 +0200 Bump debhelper compatibility to 9. diff --git a/debian/changelog b/debian/changelog index cb15a28..b2b55bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ libgaiagraphics (0.5-1) experimental; urgency=low * Improve extended description for the shared library package. * Update symbols file for 0.5 on amd64. * Update copyright file. + * Bump debhelper compatibility to 9. -- Bas Couwenberg sebas...@xs4all.nl Mon, 30 Sep 2013 20:11:57 +0200 diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 -- Packaging of libgaiagraphics in Debian ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] libgaiagraphics branch, master, updated. upstream/0.5-24-g16e7f3a
The following commit has been merged in the master branch: commit b482b6496ac586622d59ec7ea6ab35b342555e02 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 30 21:43:48 2013 +0200 Update copyright file. diff --git a/debian/changelog b/debian/changelog index 29d49f7..cb15a28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ libgaiagraphics (0.5-1) experimental; urgency=low * Add lintian overrides for no upstream changelog, link to upstream timeline. * Improve extended description for the shared library package. * Update symbols file for 0.5 on amd64. + * Update copyright file. -- Bas Couwenberg sebas...@xs4all.nl Mon, 30 Sep 2013 20:11:57 +0200 diff --git a/debian/copyright b/debian/copyright index ef753fb..54cea72 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,16 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libgaiagraphics -Source: http://www.gaia-gis.it/gaia-sins/gaiagraphics-sources/ +Upstream-Contact: Alessandro Furieri a.furi...@lqt.it +Source: https://www.gaia-gis.it/fossil/libgaiagraphics +License: LGPL-3.0+ Files: * Copyright: © 2009-2010, Alessandro Furieri a.furi...@lqt.it -License: LGPL-3+ +License: LGPL-3.0+ -Files: debian/* -Copyright: © 2012, David Paleino da...@debian.org -License: GPL-2+ +Files: ltmain.sh +Copyright: 1996-2001, 2003-2010, Free Software Foundation, Inc. +License: GPL-2.0+ with Libtool exception Files: src/gaiagraphics_gif.c Copyright: © 2010, Alessandro Furieri a.furi...@lqt.it @@ -18,9 +20,13 @@ License: GIF Files: src/gaiagraphics_quantize.c Copyright: © 2009-2010, Alessandro Furieri a.furi...@lqt.it © 2001-2002, Martin Weber -License: LGPL-2.1+ or LGPL-3+ +License: LGPL-2.1+ or LGPL-3.0+ + +Files: debian/* +Copyright: © 2012, David Paleino da...@debian.org +License: GPL-2.0+ -License: LGPL-3+ +License: LGPL-3.0+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or @@ -37,7 +43,33 @@ License: LGPL-3+ On Debian systems, the complete text of the GNU Lesser General Public License version 3 can be found in /usr/share/common-licenses/LGPL-3. -License: GPL-2+ +License: GPL-2.0+ with Libtool exception + GNU Libtool is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + As a special exception to the GNU General Public License, + if you distribute this file as part of a program or library that + is built using GNU Libtool, you may include this file under the + same distribution terms that you use for the rest of that program. + . + GNU Libtool is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with GNU Libtool; see the file COPYING. If not, a copy + can be downloaded from http://www.gnu.org/licenses/gpl.html, + or obtained by writing to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: GPL-2.0+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -82,3 +114,4 @@ License: GIF The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated. GIF(sm) is a Service Mark property of CompuServe Incorporated. + -- Packaging of libgaiagraphics in Debian ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] libgaiagraphics branch, master, updated. upstream/0.5-24-g16e7f3a
The following commit has been merged in the master branch: commit 411198fbc5af55b582f576eb4c1ca958b3fca17e Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 30 21:47:59 2013 +0200 List missing files after install. diff --git a/debian/rules b/debian/rules index fd8cd22..ed0b038 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,9 @@ VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | s override_dh_auto_configure: dh_auto_configure -- $(shell dpkg-buildflags --export=configure) +override_dh_install: + dh_install --autodest --list-missing + override_dh_makeshlibs: dh_makeshlibs -- -c0 -v$(VERSION) -- Packaging of libgaiagraphics in Debian ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] libgaiagraphics branch, master, updated. upstream/0.5-24-g16e7f3a
The following commit has been merged in the master branch:
commit c8474f480e2192de822a3795a831a96ed1383818
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 30 22:03:02 2013 +0200
Restructure control file with cme fix dpkg-control.
diff --git a/debian/control b/debian/control
index 3d6357d..b4f1d53 100644
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,30 @@
Source: libgaiagraphics
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: David Paleino da...@debian.org,
+ Bas Couwenberg sebas...@xs4all.nl
Section: libs
Priority: optional
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: David Paleino da...@debian.org
- , Bas Couwenberg sebas...@xs4all.nl
-Build-Depends:
- debhelper (= 9)
- , autotools-dev
- , dh-autoreconf
- , libjpeg8-dev
- , libgeotiff-dev
- , zlib1g-dev
- , libtiff-dev
- , libproj-dev
- , libpng-dev
- , libcairo2-dev
- , libxml2-dev
+Build-Depends: debhelper (= 9),
+ autotools-dev,
+ dh-autoreconf,
+ libjpeg8-dev,
+ libgeotiff-dev,
+ zlib1g-dev,
+ libtiff-dev,
+ libproj-dev,
+ libpng-dev,
+ libcairo2-dev,
+ libxml2-dev
Standards-Version: 3.9.4
-Homepage: https://www.gaia-gis.it/fossil/libgaiagraphics/index
-Vcs-Git: git://anonscm.debian.org/pkg-grass/libgaiagraphics.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libgaiagraphics.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/libgaiagraphics.git
+Homepage: https://www.gaia-gis.it/fossil/libgaiagraphics/index
Package: libgaiagraphics-dev
-Section: libdevel
Architecture: any
-Depends: libgaiagraphics1 (= ${binary:Version})
- , ${misc:Depends}
+Section: libdevel
+Depends: libgaiagraphics1 (= ${binary:Version}),
+ ${misc:Depends}
Description: Gaia common graphics support - development headers
libgaiagraphics is a library supporting common-utility raster handling
functions.
@@ -35,8 +34,9 @@ Description: Gaia common graphics support - development
headers
Package: libgaiagraphics1
Architecture: any
Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Gaia common graphics support
libgaiagraphics is a library supporting common-utility raster handling
functions.
@@ -44,14 +44,15 @@ Description: Gaia common graphics support
This package contains the shared library.
Package: libgaiagraphics1-dbg
-Section: debug
-Priority: extra
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}
- , libgaiagraphics1 (= ${binary:Version})
+Section: debug
+Priority: extra
+Depends: ${misc:Depends},
+ libgaiagraphics1 (= ${binary:Version})
Description: Gaia common graphics support - debugging symbols
libgaiagraphics is a library supporting common-utility raster handling
functions.
.
This package contains debugging symbols.
+
--
Packaging of libgaiagraphics in Debian
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
