[Pkg-cli-libs-commits] [taoframework] 71/91: Packaging and 2.10 cleanups

Jo Shields directhex at moszumanska.debian.org
Mon Sep 22 08:33:22 UTC 2014


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

directhex pushed a commit to branch master
in repository taoframework.

commit ebb0e047e1e973843c0690eb3656f67e6e5ca3fc
Author: Iain Lane <laney at debian.org>
Date:   Tue Jun 7 15:53:29 2011 +0000

    Packaging and 2.10 cleanups
    
    Still wants DH7ing
---
 debian/changelog                             | 13 +++++++++
 debian/control                               | 41 +++++++++++++++++++++++-----
 debian/libtaoframework-ode0.9-cil.install    |  2 +-
 debian/libtaoframework-opengl3.0-cil.install |  2 +-
 debian/libtaoframework-sdl1.2-cil.install    |  2 +-
 debian/rules                                 |  6 ++--
 6 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7407783..2ccd71f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+taoframework (2.1.svn20090801-5) UNRELEASED; urgency=low
+
+  * debian/control:
+    + Remove some obsolete BDs
+    + Use dh_prep instead of dh_clean  
+    + Standards-Version → 3.9.2, no changes required
+  * debian/rules:
+    + Use the system default gacutil instead of hardcoding gacutil2 
+    + Use dh_prep instead of dh_clean  
+  * Run wrap-and-sort
+
+ -- Iain Lane <laney at debian.org>  Mon, 06 Jun 2011 22:17:46 +0100
+
 taoframework (2.1.svn20090801-4) unstable; urgency=low
 
   * d/control:  
diff --git a/debian/control b/debian/control
index b9f7c08..27fcd8c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,35 @@ Source: taoframework
 Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>, Dylan R. E. Moonfire <debian at mfgames.com>, Sam Hocevar <sho at debian.org>
+Uploaders: Sebastian Dröge <slomo at debian.org>,
+           Dylan R. E. Moonfire <debian at mfgames.com>,
+           Sam Hocevar <sho at debian.org>
 Build-Depends: debhelper (>= 5), quilt
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gac, mono-devel (>= 2.4.3), mono-utils, libmono-dev, libopenal-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev, libsdl1.2-dev, libsmpeg-dev, libode-dev, libdevil-dev, libphysfs-dev, freeglut3-dev, libglu1-mesa-dev | libglu1-dev, libgl1-mesa-dev | libgl1-dev, monodoc-base, liblua5.1-0-dev, libavcodec-dev (>= 3:0.svn20090303), libavformat-dev (>= 3:0.svn20090303), libswscale-dev, lib [...]
+Build-Depends-Indep: cli-common-dev (>= 0.4.4),
+                     freeglut3-dev,
+                     libalut-dev,
+                     libavcodec-dev (>= 3:0.svn20090303),
+                     libavformat-dev (>= 3:0.svn20090303),
+                     libdevil-dev,
+                     libfreetype6-dev,
+                     libftgl-dev,
+                     libgl1-mesa-dev | libgl1-dev,
+                     libglu1-mesa-dev | libglu1-dev,
+                     liblua5.1-0-dev,
+                     libnunit-cil-dev,
+                     libode-dev,
+                     libopenal-dev,
+                     libphysfs-dev,
+                     libsdl-gfx1.2-dev,
+                     libsdl-image1.2-dev,
+                     libsdl-mixer1.2-dev,
+                     libsdl-net1.2-dev,
+                     libsdl-ttf2.0-dev,
+                     libsdl1.2-dev,
+                     libsmpeg-dev,
+                     libswscale-dev,
+                     mono-devel (>= 2.4.3),
+                     monodoc-base
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/taoframework/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk?op=log
@@ -41,7 +67,8 @@ Package: libtaoframework-opengl-cil-dev
 Architecture: all
 Depends: libtaoframework-opengl3.0-cil (= ${binary:Version}), ${misc:Depends}
 Conflicts: libtaoframework-opengl2.1-cil
-Replaces: libtaoframework-opengl2.1-cil, libtaoframework-opengl3.0-cil (<< 2.1.svn20090801-2~)
+Replaces: libtaoframework-opengl2.1-cil,
+          libtaoframework-opengl3.0-cil (<< 2.1.svn20090801-2~)
 Description: Tao CLI binding for OpenGL and GLU - development files
  The Tao Framework is a collection of bindings and libraries to
  facilitate cross-platform games-related development utilizing the Mono
@@ -143,7 +170,8 @@ Package: libtaoframework-ode-cil-dev
 Architecture: all
 Depends: libtaoframework-ode0.9-cil (= ${binary:Version}), ${misc:Depends}
 Conflicts: libtaoframework-ode0.6-cil
-Replaces: libtaoframework-ode0.6-cil, libtaoframework-ode0.9-cil (<< 2.1.svn20090801-2~)
+Replaces: libtaoframework-ode0.6-cil,
+          libtaoframework-ode0.9-cil (<< 2.1.svn20090801-2~)
 Description: Tao CLI binding for ODE - development files
  The Tao Framework is a collection of bindings and libraries to
  facilitate cross-platform games-related development utilizing the Mono
@@ -202,8 +230,8 @@ Description: Tao CLI binding for freeglut
 Package: libtaoframework-freeglut-cil-dev
 Architecture: all
 Depends: libtaoframework-freeglut2.4-cil (= ${binary:Version}),
-    libtaoframework-opengl-cil-dev,
-    ${misc:Depends}
+         libtaoframework-opengl-cil-dev,
+         ${misc:Depends}
 Replaces: libtaoframework-freeglut2.4-cil (<< 2.1.svn20090801-2~)
 Description: Tao CLI binding for freeglut - development files
  The Tao Framework is a collection of bindings and libraries to
@@ -364,4 +392,3 @@ Description: compiled XML documentation for all the Tao libraries
  implementation.
  .
  This package contains the compiled XML documentation for Tao.
-
diff --git a/debian/libtaoframework-ode0.9-cil.install b/debian/libtaoframework-ode0.9-cil.install
index b7fec48..6c1d537 100644
--- a/debian/libtaoframework-ode0.9-cil.install
+++ b/debian/libtaoframework-ode0.9-cil.install
@@ -1,2 +1,2 @@
-/usr/lib/mono/gac/Tao.Ode/*/*		/usr/lib/cli/Tao.Ode-0.9/
 /usr/lib/mono/gac/Tao.Ode.Tests/*/*		/usr/lib/cli/Tao.Ode.Tests-1.0/
+/usr/lib/mono/gac/Tao.Ode/*/*		/usr/lib/cli/Tao.Ode-0.9/
diff --git a/debian/libtaoframework-opengl3.0-cil.install b/debian/libtaoframework-opengl3.0-cil.install
index 15eef1a..b3851e7 100644
--- a/debian/libtaoframework-opengl3.0-cil.install
+++ b/debian/libtaoframework-opengl3.0-cil.install
@@ -1,3 +1,3 @@
 /usr/lib/mono/gac/Tao.OpenGl/*/*	/usr/lib/cli/Tao.OpenGl-3.0/
-/usr/lib/mono/gac/Tao.Platform.X11/*/*	/usr/lib/cli/Tao.Platform.X11-1.0/
 /usr/lib/mono/gac/Tao.Platform.Windows/*/*	/usr/lib/cli/Tao.Platform.Windows-1.0/
+/usr/lib/mono/gac/Tao.Platform.X11/*/*	/usr/lib/cli/Tao.Platform.X11-1.0/
diff --git a/debian/libtaoframework-sdl1.2-cil.install b/debian/libtaoframework-sdl1.2-cil.install
index 8cfb931..b47d0dd 100644
--- a/debian/libtaoframework-sdl1.2-cil.install
+++ b/debian/libtaoframework-sdl1.2-cil.install
@@ -1,2 +1,2 @@
-/usr/lib/mono/gac/Tao.Sdl/*/*		/usr/lib/cli/Tao.Sdl-1.2/
 /usr/lib/mono/gac/Tao.Sdl.Tests/*/*		/usr/lib/cli/Tao.Sdl.Tests-1.0/
+/usr/lib/mono/gac/Tao.Sdl/*/*		/usr/lib/cli/Tao.Sdl-1.2/
diff --git a/debian/rules b/debian/rules
index 6a467f6..ed29a05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	CSC=/usr/bin/mono-csc ./configure --prefix=/usr
+	GACUTIL=/usr/bin/gacutil CSC=/usr/bin/mono-csc ./configure --prefix=/usr
 	touch configure-stamp
 
 build: build-stamp
@@ -50,7 +50,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	$(MAKE) install DESTDIR=$$(pwd)/debian/tmp
 	
 	# Copy examples contents, then clean up unwanted files
@@ -95,7 +95,7 @@ binary-indep: build install
 	dh_fixperms
 	dh_installdeb
 	dh_makeclilibs -m $(UPVERSION) -l $(NEXT_UPVERSION)
-	dh_clideps -d
+	dh_clideps -d --exclude-moduleref=libdl.dylib --exclude-moduleref=/System/Library/Frameworks/Cocoa.framework/Cocoa --exclude-moduleref=libobjc.dylib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/taoframework.git



More information about the Pkg-cli-libs-commits mailing list