The following commit has been merged in the master branch:
commit e4d5be6b54fe186d3c37f5fd422b949783a07cc3
Author: D Haley <mycae at gmx.com>
Date: Sat Apr 27 13:28:07 2013 +0200
* Remove README.source
* Update to compat level 9
* Set standards version to 3.9.4
* Drop DM-Upload-Allowed
* Update debian copyright to dep5
* Drop debian/dirs
* Convert rules to use dh override_
* Add DEP3 headers to patches
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 82fdda7..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-Package uses quilt
-/usr/share/doc/quilt/README.source
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 50f01d2..008da99 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: D Haley <mycae at gmx.com>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1~), libgl1-mesa-dev | libgl-dev, libpng-dev | libpng15-dev, libqhull-dev, libwxgtk2.8-dev, libftgl-dev, autoconf, libxml2-dev, libmgl-dev, autotools-dev
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libgl1-mesa-dev | libgl-dev, libpng-dev | libpng15-dev, libqhull-dev, libwxgtk2.8-dev, libftgl-dev, autoconf, libxml2-dev, libmgl-dev, autotools-dev
+Standards-Version: 3.9.4
Homepage: http://threedepict.sourceforge.net/index.html
Vcs-Git: git://git.debian.org/debian-science/packages/3depict.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/3depict.git
diff --git a/debian/copyright b/debian/copyright
index 2590f3e..1b4e28a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,42 +1,58 @@
-This package was debianized by D Haley <mycae at yahoo.com> on
-Sat, 24 Jul 2010 23:23:50 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: 3Depict
+Upstream: http://threedepict.sourceforge.net
+
+Files: *
+Copyright: 3Depict is Copyright (C) 2013 by D Haley.
+License: GPL-3+
+ On Debian systems the full text of the GNU General Public License v3
+ can be found in the `/usr/share/common-licenses/GPL-3' file.
+
+Files: docs/manual-latex/manual.tex
+Copyright: Copyright (C) 2013 by D Haley.
+License: CC-BY-SA 3.0
+ The work (as defined below) is provided under the terms of this creative
+ commons public license ("CCPL"; or "license"). The work is protected by
+ copyright and/or other applicable law. any use of the work other than as
+ authorized under this license or copyright law is prohibited.
+ By exercising any rights to the work provided here, you accept and agree
+ to be bound by the terms of this license. to the extent this license may
+ be considered to be a contract, the licensor grants you the rights
+ contained here in consideration of your acceptance of such terms and
+ conditions.
+
+Files: debian/*
+Copyright: Copyright 2013, D Haley <mycae gmx com>
+License: GPL-3+
+ On Debian systems the full text of the GNU General Public License v3
+ can be found in the `/usr/share/common-licenses/GPL-3' file.
+
+Files:data/textures/*rrow*png data/textures/*rrow*svg data/textures/tex-source/*rrow*svg data/textures/*enlarge*png data/textures/tex-source/*enlarge.svg
+Copyright: Copyright 2006, Everaldo Coelho
+Source: https://commons.wikimedia.org/wiki/Crystal_clear
+License: LGPL-2+
+ On Debian systems the full text of the Lesser GNU General Public License
+ v2 can be found in the `/usr/share/common-licenses/LGPL-2' file.
+
+Files: data/textures/tex-source/*mouse.svg data/textures/*mouse*png
+Copyright: Copyright 2007, User:Darklama
+Source: https://commons.wikimedia.org/wiki/File:Left_clicked_mouse.svg
+License: GFDL-1.2
+ On Debian systems the full text of the GNU Free Documentation License
+ v1.2 can be found in the `/usr/share/common-licenses/GFDL-1.2' file.
+
+Files: data/textures/tex-source/*phere.svg data/textures/tex-source/*phere.png
+Copyright: Copyright 2003-2004, David Vignoni
+Source: www.icon-king.com/projects/nuvola//
+License: LGPL-2+
+ On Debian systems the full text of the Lesser GNU General Public License
+ v2 can be found in the `/usr/share/common-licenses/LGPL-2' file.
+
+Files: docs/web/style.css
+Copyright: Copyright 2006, Minamalistic-design
+Source: http://www.minimalistic-design.com/minimalistic.zip
+License: GPL-2+
+ On Debian systems the full text of the Lesser GNU General Public License
+ v2 can be found in the `/usr/share/common-licenses/LGPL-2' file.
-It was downloaded from <http://threedepict.sourceforge.net>
-Upstream Author(s):
-
- D Haley <mycae at yahoo.com>
-
-Copyright:
-
- Copyright (C) 2012 D. Haley
-
-License:
-
- This program 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 3 of the License, or (at your option) any later version.
-
- This program 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.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
- On your Debian GNU/Linux system, a copy of the GNU GPLv3 can be found in
- /usr/share/common-licenses/GPL-3
-
-The Debian packaging is:
-
- Copyright (C) 2012 D Haley <mycae at yahoo.com>
-
-and is licensed under the GPL version 3 or any later version,
-see `/usr/share/common-licenses/GPL-3'.
-
-Icons are covered by the GNU Free Documentation Licence, GFDL. For this
-licence, please see '/usr/share/common-licencses/GFDL'
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 5673a50..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/sbin
-usr/share/applications
-usr/share/3depict
diff --git a/debian/docs b/debian/docs
index ecd03c5..c17f037 100644
--- a/debian/docs
+++ b/debian/docs
@@ -2,4 +2,3 @@ AUTHORS
NEWS
README
TODO
-COPYING
diff --git a/debian/patches/FTGL-lowercase.patch b/debian/patches/FTGL-lowercase.patch
index c6d9b10..9d87b3f 100644
--- a/debian/patches/FTGL-lowercase.patch
+++ b/debian/patches/FTGL-lowercase.patch
@@ -1,3 +1,7 @@
+Description: Debian uses lowercase lib names.
+Forwarded: not-needed
+Origin: Other
+Author: D Haley <mycae - gmx - com>
Index: 3depict-0.0.13/configure
===================================================================
--- 3depict-0.0.13.orig/configure 2013-04-12 22:16:55.000000000 +0200
diff --git a/debian/patches/debian-desktop-naming.patch b/debian/patches/debian-desktop-naming.patch
index cd3e031..bd8d446 100644
--- a/debian/patches/debian-desktop-naming.patch
+++ b/debian/patches/debian-desktop-naming.patch
@@ -1,4 +1,8 @@
-Debian packages are lowercase, but upstream uses uppercase "D"
+Description: Debian packages are lowercase, but upstream uses uppercase
+ "D"
+Forwarded: not-needed
+Origin: Other
+Author: D Haley <mycae - gmx - com>
Index: 3depict-0.0.8/packaging/3Depict.desktop
===================================================================
--- 3depict-0.0.8.orig/packaging/3Depict.desktop 2011-10-23 16:32:14.000000000 +0100
diff --git a/debian/patches/lowercase-textdomain.patch b/debian/patches/lowercase-textdomain.patch
index 7cac462..f43c630 100644
--- a/debian/patches/lowercase-textdomain.patch
+++ b/debian/patches/lowercase-textdomain.patch
@@ -1,4 +1,7 @@
-Debian uses different text domain for the lang files
+Description: Debian uses different text domain for the lang files
+Forwarded: not-needed
+Origin: Other
+Author: D Haley <mycae - gmx - com>
Index: 3depict-0.0.13/src/3Depict.cpp
===================================================================
--- 3depict-0.0.13.orig/src/3Depict.cpp 2013-03-23 16:07:50.000000000 +0100
diff --git a/debian/rules b/debian/rules
index 503ff2d..9537c07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,4 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -24,38 +14,29 @@ endif
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+%:
+ dh $@
-config.status: configure
- dh_testdir
+override_dh_auto_configure:
#Compile package, disabling internal debug checking and enabling parallelism
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-openmp-parallel --disable-debug-checks --with-libpng-link="-lpng" --with-libpng-flags="-L/lib" --with-ftgl-prefix="/usr"
-
-
-build: build-arch
-
-build-arch: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
+ dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-openmp-parallel --disable-debug-checks --with-libpng-link="-lpng" --with-libpng-flags="-L/lib" --with-ftgl-prefix="/usr"
- touch $@
-clean:
+override_dh_clean:
dh_testdir
dh_testroot
rm -f build-stamp
- # Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.status config.cache
- #Prevent quilt 3.0 from annoyingly convoluting config.log with a patch
+ #Prevent quilt 3.0 from annoyingly convoluting config.log with
+ #a patch
rm -f config.log
dh_clean
-install: build
+
+override_dh_install:
dh_testdir
dh_testroot
dh_prep
@@ -96,35 +77,3 @@ install: build
#Install manual to 3depict dir
cp $(CURDIR)/docs/manual-latex/manual.pdf $(CURDIR)/debian/3depict/usr/share/3depict/
-
- #delete some dirs that are generated.
- rmdir $(CURDIR)/debian/3depict/usr/sbin
-
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_install
- dh_installmenu
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-build-indep:
-
--
3depict