[SCM] freewrl packaging branch, UNRELEASED, updated. 071a016ecd4a9d397227e360c514809aa18d3bb7
rzr-guest at users.alioth.debian.org
rzr-guest at users.alioth.debian.org
Sun Mar 21 00:10:31 UTC 2010
The following commit has been merged in the UNRELEASED branch:
commit 071a016ecd4a9d397227e360c514809aa18d3bb7
Author: Philippe Coval <rzr at gna.org>
Date: Sun Mar 21 01:09:44 2010 +0100
Work in progress : http://rzr.online.fr/q/vrml
diff --git a/debian/changelog b/debian/changelog
index 18d12c3..00b2cee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-freewrl (1.22.6.99~7pre1-1) unstable; urgency=low
+freewrl (1.22.6.99~7pre1-0) UNRELEASED; urgency=low
* New upstream release
+ * Fix upstream mistake (to be confirmed)
+ * Updated standards
+ * Updated description
+ * Remove hardcoded dependencies
+ * Add debian/watch
+ * Add missing dependencies : pkg-config, x11proto-print-dev
+ * Merged from archive
+ * Work in progress : http://rzr.online.fr/q/vrml
- -- Philippe Coval <rzr at gna.org> Sat, 20 Mar 2010 16:46:33 +0100
+ -- Philippe Coval <rzr at gna.org> Sun, 21 Mar 2010 00:43:30 +0100
freewrl (1.22.6-1) unstable; urgency=low
@@ -358,5 +366,3 @@ freewrl (0.14-1) unstable; urgency=low
* Initial Release.
-- John Lapeyre <lapeyre at physics.arizona.edu> Fri, 31 Jul 1998 13:04:33 -0700
-
-
diff --git a/debian/changelog.debdiff b/debian/changelog.debdiff
deleted file mode 100644
index 192dc05..0000000
--- a/debian/changelog.debdiff
+++ /dev/null
@@ -1,121 +0,0 @@
-freewrl (1.22.5-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Rebuild package as native debian package
-
- -- Philippe Coval <rzr at gna.org> Sat, 20 Mar 2010 16:29:00 +0100
-
-freewrl (1.22.5-1) unstable; urgency=low
-
- * New upstream release.
- * Backport from branch win32: Windows port.
- * New depend: libGLEW.
- * Lintian fix: diff-contains-cvs-control-dir.
- * Now depends on Imlib2, removing lot of explicit depends.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Sat, 03 Oct 2009 13:08:59 +0200
-
-freewrl (1.22.4-1) unstable; urgency=low
-
- * New upstream release.
- * Lintian fixes: debian-rules-ignores-make-clean-error,
- package-uses-deprecated-debhelper-compat-version,
- debhelper-script-needs-versioned-build-depends,
- virtual-package-depends-without-real-package-depends.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Tue, 21 Jul 2009 13:01:12 +0200
-
-freewrl (1.22.3-1) unstable; urgency=low
-
- * New main version, JAS tagged source tree with FREEWRL_1_22_3.
- * pak knows how to pick up a cvs tagged version.
- * libEAI enabled for the first time in this Debian packaging.
- * Added icon and desktop file.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Sun, 07 Jun 2009 12:51:21 +0200
-
-freewrl (1.22.0-2) unstable; urgency=low
-
- * Upstream fixes.
- * Build system fix (to make build work with ld option --as-needed).
- * Debian rules fix (libtool finish, proper use of fast install).
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Thu, 19 Feb 2009 10:58:58 +0100
-
-freewrl (1.22.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Thu, 12 Feb 2009 01:44:36 +0100
-
-freewrl (1.21.2-3) unstable; urgency=low
-
- * Dependencies fixed (libmozjs1d).
- * Mozilla Plugin directory fixed.
- * Fonts directory fixed.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Tue, 03 Feb 2009 16:32:50 +0100
-
-freewrl (1.21.2-2) unstable; urgency=low
-
- * Linux: font directory fixed.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Fri, 21 Nov 2008 00:31:34 +0100
-
-freewrl (1.21.2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Wed, 19 Nov 2008 19:44:07 +0100
-
-freewrl (1.21.1-2) unstable; urgency=low
-
- * Plugin install directory reworked.
- * Menu integration.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Thu, 06 Nov 2008 12:36:30 +0100
-
-freewrl (1.21.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Mon, 03 Nov 2008 23:09:05 +0100
-
-freewrl (1.20.7-1.1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Mon, 03 Nov 2008 23:08:30 +0100
-
-freewrl (1.20.7-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Tue, 23 Sep 2008 16:42:14 +0200
-
-freewrl (1.20.5-1) unstable; urgency=low
-
- * New upstream release.
- * New recommend dependencies.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Thu, 14 Aug 2008 13:46:25 +0200
-
-freewrl (1.20.2-1) unstable; urgency=low
-
- * New upstream version.
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Wed, 05 Mar 2008 11:01:23 +0100
-
-freewrl (1.19.9-1) unstable; urgency=low
-
- * Adapt package from Ubuntu to Debian. Changed policy, build depends,
- and Makefile.PL. Removed installation of fonts (depends on
- ttf-bitstream-vera instead).
-
- -- Michel Briand (Quand on veut on peut !) <michelbriand at free.fr> Sun, 28 Oct 2007 13:23:24 +0100
-
-freewrl (1.18.2-1) dapper; urgency=low
-
- * Initial release
-
- -- sarah <sarah.dumoulin at crc.ca> Tue, 11 Jul 2006 15:17:27 -0400
diff --git a/debian/compat.debdiff b/debian/compat.debdiff
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat.debdiff
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control.debdiff b/debian/control.debdiff
deleted file mode 100644
index 1afce77..0000000
--- a/debian/control.debdiff
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: freewrl
-Section: graphics
-Priority: optional
-Maintainer: Michel Briand (Quand on veut on peut !) <michelbriand at free.fr>
-Build-Depends: debhelper (>= 7), libxxf86vm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libglew1.5-dev, libxaw7-dev, lesstif2-dev, libimlib2-dev, libxml2-dev, libexpat1-dev, libmozjs-dev, gcj | java-compiler, iceape-dev
-Standards-Version: 3.8.0
-
-Package: freewrl
-Architecture: any
-Depends: libgl1, libglu1, libglew1.5, libxaw7, lesstif2, libimlib2, libxml2, libexpat1, libmozjs1d, java-runtime
-Recommends: ttf-bitstream-vera, wget, sox, convert
-Description: FreeWRL X3D/VRML browser
diff --git a/debian/copyright.debdiff b/debian/copyright.debdiff
deleted file mode 100644
index 9bed0fd..0000000
--- a/debian/copyright.debdiff
+++ /dev/null
@@ -1,170 +0,0 @@
-This package was debianized by Michel Briand <michelbriand at free.fr> on
-Sat, 03 Oct 2009 12:04:43 +0200 (main review of debian files). First
-debianization occured in fall 2007.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
diff --git a/debian/rules.debdiff b/debian/rules.debdiff
deleted file mode 100644
index ef6a269..0000000
--- a/debian/rules.debdiff
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/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
-
-build_support_parallelization=true
-
-plugin=libFreeWRLplugin.so
-jar=FreeWRL.jar
-
-CFLAGS = -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-ifeq ($(build_support_parallelization),true)
- N=$(shell cat /proc/cpuinfo | grep processor | wc -l)
- MAKE+="-j$(N)"
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- if ! test -f ./configure ; then \
- echo "Creating configure..."; \
- autoreconf --force --install; \
- fi
- ./configure --prefix=/usr \
- --with-fontsdir=/usr/share/fonts/truetype/ttf-bitstream-vera \
- --disable-static \
- --disable-dependency-tracking \
- --enable-debug \
- --with-target=motif \
- --with-mesa \
- --enable-libeai \
- --with-browser=/usr/bin/firefox \
- --with-soundconv=/usr/bin/sox \
- --with-unzip=/usr/bin/unzip \
- --with-wget=/usr/bin/wget \
- --with-imageconvert=/usr/bin/convert
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- dh_prep
- $(MAKE)
- touch build-stamp
-
-clean-source:
- [ ! -f Makefile ] || $(MAKE) distclean
-
-clean-debian:
- dh_testdir
- rm -f build-stamp configure-stamp
- dh_clean
-
-clean: clean-source clean-debian
-
-install: build
- dh_testdir
- dh_testroot
- dh_installdirs
- # Install through Make target
- $(MAKE) install DESTDIR=$(CURDIR)/debian/freewrl
- -rm -f $(PLUGIN_DIR)/*.la
- # Plugin is installed in /usr/lib/mozilla/plugins (default on Debian)
- # but if other directory exists (Ubuntu) we create symlink
- # for the plugin in other directories
- for i in firefox firefox-plugins xulrunner-addons iceape iceweasel mozilla-firefox; do \
- mkdir -p $(CURDIR)/debian/freewrl/usr/lib/$$i/plugins; \
- cd $(CURDIR)/debian/freewrl/usr/lib/$$i/plugins; \
- pwd; echo $$i; \
- ln -s ../../mozilla/plugins/$(plugin) $(plugin); \
- ln -s ../../mozilla/plugins/$(jar) $(jar); \
- done
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
-# dh_installdocs
-# dh_installexamples
-# dh_install
- dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
--
freewrl packaging
More information about the pkg-multimedia-commits
mailing list