[SCM] Packaging for DFArc branch, master, updated. debian/3.6-1-1-g0f8b915
Sylvain Beucler
beuc at beuc.net
Sun May 23 21:06:59 UTC 2010
The following commit has been merged in the master branch:
commit 0f8b91586c4a3a2474d49c8870f1d24cf5bdeb46
Author: Sylvain Beucler <beuc at beuc.net>
Date: Sun May 23 23:06:38 2010 +0200
Doc fixes
diff --git a/debian/README.source b/debian/README.source
index ad29965..5f8f824 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,59 +1,31 @@
-To build the Debian package
-===========================
+wxgtk
+=====
- tar xzf dfarc-*.tar.gz
- ln -s dfarc-x.y.z.tar.gz freedink-dfarc_x.y.z.orig.tar.gz
- git clone git://git.sv.gnu.org/freedink/dfarc dfarcgit
- cp -a dfarcgit/debian dfarc-*/
- cd dfarc-*/
- debuild -us -uc
+At a point I needed to compile with either wxWidgets v2.6 or v2.8,
+depending on the Debian release. So I specified a preference to 2.8
+in Build-Depends: libwxgtk2.8-dev | libwxgtk2.6-dev
-
-dh_icons
-========
-
-DFArc requires 'dh_icons' to properly associate the Dink icon with
-.dmod files in a postinst script. 'dh_icons' appears in debhelper
-5.0.51, and an Etch backport is available at version 5.0.60
-(2008-07-19). So debian/control depends on debhelper >= 5.0.51~.
-
-5.0.60 uses 'update-icon-caches' with is not available in Etch. We
-could use 'gtk-update-icon-cache' instead as a fallback, but this
-looks tedious to do with debhelper.
-
-
-wxgtk-2.6
-=========
-
-Some packaged version of wxWidgets 2.6, such as 2.6.3.2 in Debian Etch
-and Lenny, lack good enough ::wxLaunchDefaultBrowser implementation,
-introduced in 2.6.4 (argh). In practice, it will say it succeeded in
-launching the URL in the default browser, but will probably just
-launch 'epiphany' which may not be installed. It will still return
-true/success, denying simple work-arounds. wx2.8 is good. I eventually
-used conditional compilation to include updated Unix code from
-wxWidgets 2.6.4.
-
-So I specified a preference to 2.8 in Build-Depends:
-libwxgtk2.8-dev | libwxgtk2.6-dev
-
-This allows me to keep building install-anywhere .deb packages from
+This allowed me to keep building install-anywhere .deb packages from
Etch, while choosing the appropriate version if rebuilt from a more
recent distro.
-If you backport the package to Etch though, you'll have to remove
-"libwxgtk2.8-dev | ", as autobuilders don't understand alternate build
-dependencies (e.g. see
+When backporting though, I had to remove "libwxgtk2.8-dev | ", as
+autobuilders don't understand alternate build dependencies (e.g. see
http://lists.backports.org/lurker-bpo/message/20080422.123102.e1829e51.en.html)
+Currently only libwxgtk2.8 is used, but we may have the same problem
+when 2.10 comes out, so let's keep the technique documented here.
+
wxglade
=======
-The .wxg GUI files use some features (such as 'stock items') present
-in wxglade 0.6 (Lenny) but not 0.4 (Etch). Since the build system
-preprocess .wxg->.cpp files in release tarballs, this is not a problem
-as long as the system generating the tarball has wxglade >= 0.6
-installed. However, this means .wxg files must not be reprocessed in
-Debian Etch builds, otherwise bugs may be introduced (e.g. OK/Cancel
-buttons not working anymore).
+The .wxg GUI files are pre-processsed to .cpp files by the build
+system when generating upstream release tarballs. It may use a
+version of wxglade that is more recent that your target Debian
+release, so it's better not to reprocess them, otherwise bugs may be
+introduced (last time that happened, OK/Cancel buttons didn't work
+anymore). This is similar to keeping upstream './configure' scripts
+instead autoreconf-ing.
+
+ -- Sylvain Beucler <beuc at beuc.net>, Sun, 23 May 2010 22:30:02 +0200
diff --git a/debian/changelog b/debian/changelog
index a4e54c3..e3acd36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+freedink-dfarc (3.6-2) UNRELEASED; urgency=low
+
+ * Use http: rather than ftp: in the watch file, as FTP sometimes doesn't
+ work in some NAT'd networks
+ * Clean-up Etch-related caveats in README.source
+ * Remove alternate dependency to wxWidgets 2.6
+ * Fix typo in package description
+ * Clarify debian/copyright
+
+ -- Sylvain Beucler <beuc at beuc.net> Sun, 23 May 2010 22:42:37 +0200
+
freedink-dfarc (3.6-1) unstable; urgency=low
* New Upstream Version
diff --git a/debian/control b/debian/control
index 671b709..8961dc4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Sylvain Beucler <beuc at beuc.net>
-Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libbz2-dev, libwxgtk2.8-dev | libwxgtk2.6-dev, intltool (>= 0.31)
+Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libbz2-dev, libwxgtk2.8-dev, intltool (>= 0.31)
Standards-Version: 3.8.4
Homepage: http://www.freedink.org/
Vcs-Git: git://git.debian.org/git/pkg-games/freedink-dfarc.git
@@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: freedink, xdg-utils
Description: frontend and .dmod installer for GNU FreeDink
DFArc2 makes it easy to play and manage the Dink Smallwood game and
- it's numerous Dink Modules (or D-Mods).
+ its numerous Dink Modules (or D-Mods).
Package: freedink-dfarc-dbg
Section: debug
@@ -23,6 +23,6 @@ Architecture: any
Depends: ${misc:Depends}, freedink-dfarc (= ${binary:Version})
Description: debugging symbols for dfarc
DFArc2 makes it easy to play and manage the Dink Smallwood game and
- it's numerous Dink Modules (or D-Mods).
+ its numerous Dink Modules (or D-Mods).
.
This package contains the debugging symbols for dfarc.
diff --git a/debian/copyright b/debian/copyright
index 46e0747..f584ad1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,36 +3,6 @@ This is DFArc 3.
The original source can always be found at:
ftp://ftp.gnu.org/gnu/freedink/
-DFarc was initially released under this license (COPYING.DFArc):
- This software is provided "as is" without express or implied
- warranties. You may freely use, modify and distribute this
- source provided that the copyright text below is included in
- the resulting source code, for example:
- "Portions Copyright (C) Seth A. Robinson, 1997-2003
-
- You may use this source in personal and commercial products, you
- are not required to release the source code.
-
- Please note that sharing this source does not in any way relinquish interest or forfeit any rights enjoyed by
- Robinson Technologies and Seth A. Robinson concerning the name Dink Smallwood and related media includeding graphics,
- sounds, music, scripts and map data. (hereafter referred to as "Dink Smallwood Media").
-
- Repackaging or distributing the Dink Smallwood Media in a modified format requires permission from
- Seth A. Robinson. Please consult the license included with the Dink Smallwood full version distribution for
- more information.
-
-
-DFarc 1.5 was released under this license (COPYING.DFArc-2.0):
- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Redistributions in any form must be accompanied by information on how to obtain complete source code for the DB software and any accompanying software that uses the DB software. The source code must either be included in the distribution or be available for no more than the cost of distribution plus a nominal fee, and must be freely redistributable under reasonable conditions. For an executable file, complete source code means the source code for all modules it contains. It does not include source code for modules or files that typically accompany the major components of the operating system on which the executable file runs.
- * The files produced by DFArc are not subject to this license but instead any licensing terms provided inside said files.
-
- THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (C) Seth A. Robinson, 1997-2003
Copyright (C) 2004 Andrew Reading
Copyright (C) 2005, 2006 Dan Walma
Copyright (C) 2008, 2009, 2010 Sylvain Beucler
@@ -51,7 +21,6 @@ pl - Copyright (C) 2008 GOKUSSJ6
Copyright (C) 2009 Michał Trzebiatowski
vi - Copyright (C) 2009, 2010 Free Software Foundation
-DFarc 2.0 is licensed under GNU GPL v3:
License:
GNU FreeDink is free software; you can redistribute it and/or modify
@@ -73,8 +42,41 @@ On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
-src/BZip.cpp this file come from bzip2 1.0.4 and is covered by the
-GNU GPL v3 and the bzip2 licenses:
+DFArc was previously released under different yet GPL-compatible
+licenses (cf. COPYING.DFArc and COPYING.DFArc-2.0) that request some
+notices to be included with modified versions, including in binary
+form. We reproduce these notices below:
+
+- First notice from the first public release of DFArc:
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Redistributions in any form must be accompanied by information on how to obtain complete source code for the DB software and any accompanying software that uses the DB software. The source code must either be included in the distribution or be available for no more than the cost of distribution plus a nominal fee, and must be freely redistributable under reasonable conditions. For an executable file, complete source code means the source code for all modules it contains. It does not include source code for modules or files that typically accompany the major components of the operating system on which the executable file runs.
+ * The files produced by DFArc are not subject to this license but instead any licensing terms provided inside said files.
+
+ THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+- Second notice for DFArc2 released as part of a bigger software
+ package:
+
+ This software is provided "as is" without express or implied
+ warranties. You may freely use, modify and distribute this
+ source provided that the copyright text below is included in
+ the resulting source code, for example:
+ "Portions Copyright (C) Seth A. Robinson, 1997-2003
+
+ You may use this source in personal and commercial products, you
+ are not required to release the source code.
+
+
+----------
+
+
+'src/BZip.cpp' comes from bzip2 1.0.4 and is covered by the GNU GPL v3
+and the bzip2 licenses:
+
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
@@ -103,5 +105,10 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-The Debian packaging is Copyright (C) 2008, 2009, 2010, Sylvain Beucler <beuc at beuc.net>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+----------
+
+
+The Debian packaging is Copyright (C) 2008, 2009, 2010, Sylvain
+Beucler <beuc at beuc.net> and is licensed under the GPL, either version
+3, or (at your option) any later version, see
+`/usr/share/common-licenses/GPL-3'.
diff --git a/debian/watch b/debian/watch
index d95e9d5..70b0627 100644
--- a/debian/watch
+++ b/debian/watch
@@ -6,4 +6,4 @@
version=3
# Uncommment to examine a FTP server
-ftp://ftp.gnu.org/gnu/freedink/dfarc-(.*)\.tar\.gz debian uupdate
+http://ftp.gnu.org/gnu/freedink/dfarc-(.*)\.tar\.gz debian uupdate
--
Packaging for DFArc
More information about the Pkg-games-commits
mailing list