This is an automated email from the git hooks/post-receive script.

giggls-guest pushed a commit to branch master
in repository sfcgal.

commit 91c4af311a68c32d9aee986d95dc1835e8a3aedf
Author: Sven Geggus <sven-...@geggus.net>
Date:   Fri Jun 12 23:11:49 2015 +0200

    first try of the quest to make this debian-policy compliant
---
 debian/changelog                    |  6 ++---
 debian/control                      | 30 +++++++++++++------------
 debian/copyright                    | 41 ++++++++++++++++++++++-----------
 debian/get-orig-source              | 45 -------------------------------------
 debian/libsfcgal-dev.dirs           |  4 ----
 debian/{docs => libsfcgal-dev.docs} |  1 -
 debian/libsfcgal-dev.install        |  1 -
 debian/libsfcgal-dev.manpages       |  1 +
 debian/libsfcgal1.dirs              |  1 -
 debian/{docs => libsfcgal1.docs}    |  1 -
 debian/rules                        | 23 +++++--------------
 debian/sfcgal-bin.dirs              |  2 --
 debian/{docs => sfcgal-bin.docs}    |  1 -
 debian/sfcgal-bin.install           |  1 -
 debian/sfcgal-bin.manpages          |  1 +
 debian/viewer-SFCGAL.1              |  2 +-
 debian/watch                        | 27 +++++-----------------
 17 files changed, 62 insertions(+), 126 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 369cfce..ca6816e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-sfcgal (1.1.0-1) UNRELEASED; urgency=low
+sfcgal (1.1.0-1) UNRELEASED; urgency=medium
 
-  * Initial release
+  * Initial release (closes: #788560)
 
- -- Sven Geggus <sven-...@geggus.net>  Tue, 09 Jun 2015 14:24:02 +0200
+ -- Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>  Tue, 09 Jun 
2015 14:24:02 +0200
diff --git a/debian/control b/debian/control
index 2f694af..83b452b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,24 @@
 Source: sfcgal
 Priority: optional
-Maintainer: Sven Geggus <sven-...@geggus.net>
+Section: science
+Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+Uploaders: Sven Geggus <sven-deb...@geggus.net>
 Build-Depends: debhelper (>= 9), cmake,
     libcgal-dev, libboost-all-dev, libmpfr-dev, libgmp-dev,
     libopenscenegraph-dev, libopenthreads-dev, libpq-dev,
-    libqt4-dev, libqt4-opengl-dev, libopenscenegraph-dev
+    libqt4-dev, libqt4-opengl-dev
 Standards-Version: 3.9.6
-Section: libs
 Homepage: http://www.sfcgal.org/
-#Vcs-Git: git://anonscm.debian.org/collab-maint/sfcgal.git
-#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/sfcgal.git;a=summary
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/sfcgal.git/
+Vcs-Git: git://anonscm.debian.org/pkg-grass/sfcgal.git
 
-Package: libsfcgal-dev
-Section: libdevel
+Package: libsfcgal1
+Pre-Depends: ${misc:Pre-Depends}
+Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: libsfcgal1 (= ${binary:Version}), ${misc:Depends}
-Description: Library for ISO 19107:2013 and OGC Simple Features 1.2 for 3D 
operations.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations 
(runtime part)
  SFCGAL is a C++ wrapper library around CGAL with the aim of
  supporting ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D
  operations.
@@ -26,12 +28,12 @@ Description: Library for ISO 19107:2013 and OGC Simple 
Features 1.2 for 3D opera
  to expose some SFCGAL's functions in spatial databases (cf. PostGIS
  manual). 
 
-Package: libsfcgal1
-Pre-Depends: ${misc:Pre-Depends}
+Package: libsfcgal-dev
+Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Library for ISO 19107:2013 and OGC Simple Features 1.2 for 3D 
operations.
+Depends: libsfcgal1 (= ${binary:Version}), ${misc:Depends}
+Description: Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations (dev 
part)
  SFCGAL is a C++ wrapper library around CGAL with the aim of
  supporting ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D
  operations.
@@ -45,6 +47,6 @@ Package: sfcgal-bin
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Simple viewer SFCGAL library
+Description: Simple viewer for SFCGAL library
  viewer-SFCGAL is a simple application demonstrating the features of
  the SFCGAL library
diff --git a/debian/copyright b/debian/copyright
index 6b4694b..9ff7a15 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,38 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SFCGAL
+Upstream-Contact: in...@oslandia.com
 Source: http://www.sfcgal.org/
 
 Files: *
 Copyright: 2012-2015 Mickael Borne (IGN), Hugo Mercier (Oslandia), Vincent 
Mora (Oslandia), Olivier Courtin (Oslandia)
-License: GPL-2+
- 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
- (at your option) any later version.
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
  .
- This package is distributed in the hope that it will be useful,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
  .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ On Debian systems, the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ /usr/share/common-licenses/LGPL-2'.
 
+Files: debian/*
+Copyright: Copyright 2015 Sven Geggus <sven-deb...@geggus.net>
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ /usr/share/common-licenses/LGPL-2'.
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index e486809..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# if you need to repack for whatever reason you can
-# use this script via uscan or directly
-#
-# FIXME: currently the code is not conform to Debian Policy
-#        http://www.debian.org/doc/debian-policy/ch-source.html
-#        "get-orig-source (optional)"
-#        This target may be invoked in any directory, ...
-# --> currently it is assumed the script is called in the
-#     source directory featuring the debian/ dir
-
-COMPRESS=xz
-
-set -e
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-
-if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 
's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-    uscan --force-download
-else
-    VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) 
.*${NAME}.*?\1?"`
-    if echo "$VERSION" | grep -q "upstream-version" ; then
-        echo "Unable to parse version number"
-        exit
-    fi
-fi
-
-TARDIR=${NAME}-${VERSION}
-mkdir -p ../tarballs
-cd ../tarballs
-# need to clean up the tarballs dir first because upstream tarball might
-# contain a directory with unpredictable name
-rm -rf *
-tar -xaf ../${TARDIR}.tar.gz
-
-UPSTREAMTARDIR=`find . -mindepth 1 -maxdepth 1 -type d`
-if [ "${UPSTREAMTARDIR}" != "${TARDIR}" ] ; then
-    mv "${UPSTREAMTARDIR}" "${TARDIR}"
-fi
-
-# Remove useless binaries
-# ... do something which needs to be done ...
-
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf 
"$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
-rm -rf ${TARDIR}
diff --git a/debian/libsfcgal-dev.dirs b/debian/libsfcgal-dev.dirs
deleted file mode 100644
index 3e5e870..0000000
--- a/debian/libsfcgal-dev.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/lib
-usr/include
-usr/share/man/man1
diff --git a/debian/docs b/debian/libsfcgal-dev.docs
similarity index 66%
copy from debian/docs
copy to debian/libsfcgal-dev.docs
index 8913f46..b43bf86 100644
--- a/debian/docs
+++ b/debian/libsfcgal-dev.docs
@@ -1,2 +1 @@
-NEWS
 README.md
diff --git a/debian/libsfcgal-dev.install b/debian/libsfcgal-dev.install
index 7dac8b7..4f3c444 100644
--- a/debian/libsfcgal-dev.install
+++ b/debian/libsfcgal-dev.install
@@ -1,4 +1,3 @@
 usr/include/*
 usr/lib/*/lib*.so
 usr/bin/sfcgal-config
-/usr/share/man/man1/sfcgal-config.1
diff --git a/debian/libsfcgal-dev.manpages b/debian/libsfcgal-dev.manpages
new file mode 100644
index 0000000..b2f6cbc
--- /dev/null
+++ b/debian/libsfcgal-dev.manpages
@@ -0,0 +1 @@
+debian/sfcgal-config.1
diff --git a/debian/libsfcgal1.dirs b/debian/libsfcgal1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libsfcgal1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/docs b/debian/libsfcgal1.docs
similarity index 66%
copy from debian/docs
copy to debian/libsfcgal1.docs
index 8913f46..b43bf86 100644
--- a/debian/docs
+++ b/debian/libsfcgal1.docs
@@ -1,2 +1 @@
-NEWS
 README.md
diff --git a/debian/rules b/debian/rules
index daf6d6e..ce06450 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,15 @@
 #!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
+
 DH_VERBOSE = 1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
 # main packaging script based on dh7 syntax
 %:
-       dh $@ 
+       dh $@ --parallel
 
 override_dh_auto_configure:
        dh_auto_configure -- -DSFCGAL_BUILD_VIEWER=ON -DCMAKE_SKIP_RPATH=ON 
-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON 
-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
@@ -29,9 +17,10 @@ override_dh_auto_configure:
 # in addition to the upstream stuff we also want to
 # install the two manpages written for the debian package
 override_dh_install:
-       mkdir -p debian/tmp/usr/share/man/man1
-       install -m 644 debian/*.1 debian/tmp/usr/share/man/man1
-       dh_install
+#      mkdir -p debian/tmp/usr/share/man/man1
+#      install -m 644 debian/*.1 debian/tmp/usr/share/man/man1
+#      dh_installman
+       dh_install --list-missing
        
 
 override_dh_auto_test:
diff --git a/debian/sfcgal-bin.dirs b/debian/sfcgal-bin.dirs
deleted file mode 100644
index f57433a..0000000
--- a/debian/sfcgal-bin.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
\ No newline at end of file
diff --git a/debian/docs b/debian/sfcgal-bin.docs
similarity index 66%
rename from debian/docs
rename to debian/sfcgal-bin.docs
index 8913f46..b43bf86 100644
--- a/debian/docs
+++ b/debian/sfcgal-bin.docs
@@ -1,2 +1 @@
-NEWS
 README.md
diff --git a/debian/sfcgal-bin.install b/debian/sfcgal-bin.install
index b4a8ed9..0c1e4a6 100644
--- a/debian/sfcgal-bin.install
+++ b/debian/sfcgal-bin.install
@@ -1,2 +1 @@
 usr/bin/viewer-SFCGAL
-usr/share/man/man1/viewer-SFCGAL.1
diff --git a/debian/sfcgal-bin.manpages b/debian/sfcgal-bin.manpages
new file mode 100644
index 0000000..4e47eb8
--- /dev/null
+++ b/debian/sfcgal-bin.manpages
@@ -0,0 +1 @@
+debian/viewer-SFCGAL.1
diff --git a/debian/viewer-SFCGAL.1 b/debian/viewer-SFCGAL.1
index 41144d8..4c36be1 100644
--- a/debian/viewer-SFCGAL.1
+++ b/debian/viewer-SFCGAL.1
@@ -1,6 +1,6 @@
 .TH "viewer-SFCGAL" "1" "June 10, 2015" "viewer-SFCGAL" "User Commands"
 .SH "NAME"
-.B viewer\-SFCGAL
+viewer\-SFCGAL \-
 A basic 3D viewer based on OpenSceneGraph
 
 .SH "DESCRIPTION"
diff --git a/debian/watch b/debian/watch
index 432d77c..f02a74f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,22 +1,7 @@
 version=3
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/#PACKAGE#-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge
-# 
http://sf.net/#PACKAGE#/#PACKAGE#-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
-
-# Uncomment to find new files on GooglePages
-# http://code.google.com/p/#PACKAGE#/downloads/list?can=1 \
-#  .*/#PACKAGE#-([-.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)
-
-# if tweaking of source is needed
-# \
-# debian debian/get-orig-source
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*)?v(\d[\d\.]*)\.tar\.gz/SFCGAL-$1.tar.gz/ \
+https://github.com/Oslandia/SFCGAL/releases \
+(?:.*/)?(?:rel|v|SFCGAL)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/sfcgal.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to