[clanlib] 26/40: Get ready to release to unstable. Update origUrl property.

Stephen Kitt skitt at moszumanska.debian.org
Fri Jun 10 20:13:39 UTC 2016 

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

skitt pushed a commit to branch master
in repository clanlib.

commit 482fecd9f53e424bba082909ae41171723cdb3ac
Author: Barry deFreese <bdefreese at debian.org>
Date:   Wed Sep 30 01:49:56 2009 +0000

    Get ready to release to unstable.
    Update origUrl property.
---
 debian/README.source                               |  57 +++++++++
 debian/changelog                                   |  23 +++-
 debian/control                                     |  10 +-
 debian/copyright                                   |  10 +-
 debian/libclanapp-0.8-1.install                    |  11 --
 debian/libclanapp-1.0.install                      |  11 ++
 debian/libclanlib-dev.links                        |   4 +-
 debian/libclansdl-0.8-1.install                    |   1 -
 debian/libclansdl-0.8-1.links                      |   1 -
 .../{libclansdl-0.8-1.dirs => libclansdl-1.0.dirs} |   0
 debian/libclansdl-1.0.install                      |   1 +
 debian/libclansdl-1.0.links                        |   1 +
 debian/patches/005_am_maintainer_mode.diff         |  10 +-
 debian/patches/010_full_linking.diff               | 137 +++++++++++----------
 debian/patches/200_kfreebsd.diff                   |  35 ++----
 debian/patches/400_test_subdirs_signals.diff       |  12 ++
 debian/patches/series                              |   5 +-
 debian/rules                                       |  20 ++-
 18 files changed, 220 insertions(+), 129 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8646078
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/changelog b/debian/changelog
index 0e81e7d..218bf01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,28 @@
-clanlib (0.8.1-3) unstable; urgency=low
+clanlib (1.0~svn3827-2) unstable; urgency=low
 
+  [ Barry deFreese ]
+  * Add missing copyright holder to debian/copyright.
+  * Clean up debian/copyright layout.
+  * Upload to unstable.
+
+ -- Barry deFreese <bdefreese at debian.org>  Tue, 29 Sep 2009 21:45:33 -0400
+
+clanlib (1.0~svn3827-1) experimental; urgency=low
+
+  [ Barry deFreese ]
+  * New upstream release. (Taken from upstream svn).
+    + Remove patches no longer needed.
+    + Refresh old patches.
+    + Use autotools on build instead of rebootstrap patch.
+    + Rename binary packages for SONAME bump.
+  * Add README.source file for quilt.
+  * Bump Standards Version to 3.8.3. (No changes needed).
+
+  [ Christoph Egger ]
   * Fix missing includes when building with gcc 4.4 (Closes: #528942)
     Thanks to Martin Michlmayr for the patch
 
- -- Christoph Egger <debian at christoph-egger.org>  Tue, 15 Sep 2009 12:49:59 +0200
+ -- Barry deFreese <bdefreese at debian.org>  Wed, 23 Sep 2009 13:37:09 -0400
 
 clanlib (0.8.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1bfb7e9..75f3c21 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: libs
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake1.9, bzip2, libesd0-dev, libfreetype6-dev, libglu1-mesa-dev | libgl-dev, libjpeg62-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
+Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake, libtool, bzip2, libesd0-dev, libfreetype6-dev, libglu1-mesa-dev | libgl-dev, libjpeg62-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
 Build-Conflicts: libutahglx-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.clanlib.org/
 Vcs-Svn: svn://svn.debian.org/pkg-games/packages/trunk/clanlib
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/clanlib/
 
-Package: libclanapp-0.8-1
+Package: libclanapp-1.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ClanLib game SDK runtime
@@ -31,7 +31,7 @@ Description: ClanLib game SDK runtime
  This is the runtime part of the ClanLib SDK, needed to run applications
  built with it.
 
-Package: libclansdl-0.8-1
+Package: libclansdl-1.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SDL module for ClanLib game SDK
@@ -52,7 +52,7 @@ Description: SDL module for ClanLib game SDK
 Package: libclanlib-dev
 Section: libdevel
 Architecture: any
-Depends: libclanapp-0.8-1, libclansdl-0.8-1, ${misc:Depends}
+Depends: libclanapp-1.0 (= ${binary:Version}), libclansdl-1.0 (= ${binary:Version}), ${misc:Depends}
 Recommends: libfreetype6-dev, libglu1-mesa-dev | xlibmesa-dev | libgl-dev, libjpeg62-dev, libmikmod2-dev, libpng12-0-dev, libvorbis-dev
 Conflicts: clanlib0-common, libutahglx-dev, clanlib2 (<< 0.6.1-1-3), clanlib-dev
 Provides: clanlib-dev
diff --git a/debian/copyright b/debian/copyright
index 96c1130..9e8c561 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,6 @@ This is the Debian GNU/Linux prepackaged version of ClanLib.
 This version of the package was made by Sam Hocevar, from sources obtained
 from http://www.clanlib.org/download/releases-0.8/ClanLib-0.8.1.tgz
 
-Copyright (c) 1997-2005 The ClanLib Team
-
 Upstream Authors:
    Magnus Norddahl <mbn at clanlib.org>
    Kenneth Gangstoe <sphair at clanlib.org>
@@ -42,6 +40,13 @@ Upstream Authors:
    Seth "mrfun" A. Robinson <seth at rtsoft.com>
    Thomi Richards <thomir at gmail.com>
 
+Copyright:
+	Copyright (C) 2005  Erik Ylvisaker
+	Copyright (C) 1997-2005 The ClanLib Team
+
+
+License:
+
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
 arising from the use of this software.
@@ -57,4 +62,3 @@ freely, subject to the following restrictions:
 2. Altered source versions must be plainly marked as such, and must not be
    misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
-
diff --git a/debian/libclanapp-0.8-1.install b/debian/libclanapp-0.8-1.install
deleted file mode 100644
index a7f3e31..0000000
--- a/debian/libclanapp-0.8-1.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/lib/libclanApp-0.8.so.*
-usr/lib/libclanCore-0.8.so.*
-usr/lib/libclanDisplay-0.8.so.*
-usr/lib/libclanGL-0.8.so.*
-usr/lib/libclanGUI-0.8.so.*
-usr/lib/libclanGUIStyleSilver-0.8.so.*
-usr/lib/libclanMikMod-0.8.so.*
-usr/lib/libclanNetwork-0.8.so.*
-usr/lib/libclanSignals-0.8.so.*
-usr/lib/libclanSound-0.8.so.*
-usr/lib/libclanVorbis-0.8.so.*
diff --git a/debian/libclanapp-1.0.install b/debian/libclanapp-1.0.install
new file mode 100644
index 0000000..ab5c87d
--- /dev/null
+++ b/debian/libclanapp-1.0.install
@@ -0,0 +1,11 @@
+usr/lib/libclanApp*.so.*
+usr/lib/libclanCore*.so.*
+usr/lib/libclanDisplay*.so.*
+usr/lib/libclanGL*.so.*
+usr/lib/libclanGUI*.so.*
+usr/lib/libclanGUIStyleSilver*.so.*
+usr/lib/libclanMikMod*.so.*
+usr/lib/libclanNetwork*.so.*
+usr/lib/libclanSignals*.so.*
+usr/lib/libclanSound*.so.*
+usr/lib/libclanVorbis*.so.*
diff --git a/debian/libclanlib-dev.links b/debian/libclanlib-dev.links
index 0df9ff4..0e187d7 100644
--- a/debian/libclanlib-dev.links
+++ b/debian/libclanlib-dev.links
@@ -1,2 +1,2 @@
-/usr/share/doc/libclanapp-0.8-1 /usr/share/doc/libclanlib-dev
-/usr/include/ClanLib-0.8/ClanLib /usr/include/ClanLib
+/usr/share/doc/libclanapp-1.0 /usr/share/doc/libclanlib-dev
+/usr/include/ClanLib-1.0/ClanLib /usr/include/ClanLib
diff --git a/debian/libclansdl-0.8-1.install b/debian/libclansdl-0.8-1.install
deleted file mode 100644
index bf252fb..0000000
--- a/debian/libclansdl-0.8-1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libclanSDL-0.8.so.*
diff --git a/debian/libclansdl-0.8-1.links b/debian/libclansdl-0.8-1.links
deleted file mode 100644
index 3543315..0000000
--- a/debian/libclansdl-0.8-1.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/libclanapp-0.8-1 /usr/share/doc/libclansdl-0.8-1
diff --git a/debian/libclansdl-0.8-1.dirs b/debian/libclansdl-1.0.dirs
similarity index 100%
rename from debian/libclansdl-0.8-1.dirs
rename to debian/libclansdl-1.0.dirs
diff --git a/debian/libclansdl-1.0.install b/debian/libclansdl-1.0.install
new file mode 100644
index 0000000..77f87b3
--- /dev/null
+++ b/debian/libclansdl-1.0.install
@@ -0,0 +1 @@
+usr/lib/libclanSDL*.so.*
diff --git a/debian/libclansdl-1.0.links b/debian/libclansdl-1.0.links
new file mode 100644
index 0000000..c04c907
--- /dev/null
+++ b/debian/libclansdl-1.0.links
@@ -0,0 +1 @@
+/usr/share/doc/libclanapp-1.0 /usr/share/doc/libclansdl-1.0
diff --git a/debian/patches/005_am_maintainer_mode.diff b/debian/patches/005_am_maintainer_mode.diff
index 6b7f8cb..c01208e 100644
--- a/debian/patches/005_am_maintainer_mode.diff
+++ b/debian/patches/005_am_maintainer_mode.diff
@@ -1,12 +1,12 @@
-Index: clanlib-0.8.0/configure.ac
+Index: clanlib-1.0~svn3827/configure.ac
 ===================================================================
---- clanlib-0.8.0.orig/configure.ac	2007-04-14 16:49:13.000000000 +0200
-+++ clanlib-0.8.0/configure.ac	2007-04-14 16:49:23.000000000 +0200
+--- clanlib-1.0~svn3827.orig/configure.ac	2009-09-23 13:14:43.000000000 -0400
++++ clanlib-1.0~svn3827/configure.ac	2009-09-23 13:15:11.000000000 -0400
 @@ -8,6 +8,7 @@
  AC_CONFIG_SRCDIR(Sources/API/core.h)
  AC_CANONICAL_TARGET
  AM_INIT_AUTOMAKE( foreign dist-bzip2 dist-zip 1.5b subdir-objects )
 +AM_MAINTAINER_MODE
  
- CLANLIB_MAJOR_VERSION=0
- CLANLIB_MINOR_VERSION=8
+ CLANLIB_MAJOR_VERSION=1
+ CLANLIB_MINOR_VERSION=0
diff --git a/debian/patches/010_full_linking.diff b/debian/patches/010_full_linking.diff
index d0d9316..d2f5c13 100644
--- a/debian/patches/010_full_linking.diff
+++ b/debian/patches/010_full_linking.diff
@@ -1,7 +1,7 @@
-Index: clanlib-0.8.0/Sources/Application/Makefile.am
+Index: clanlib-1.0~svn3827/Sources/Application/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/Application/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/Application/Makefile.am	2007-04-14 20:51:17.000000000 +0200
+--- clanlib-1.0~svn3827.orig/Sources/Application/Makefile.am	2009-09-23 13:17:19.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Application/Makefile.am	2009-09-23 13:17:51.000000000 -0400
 @@ -6,6 +6,10 @@
  libclanApp_la_SOURCES = Unix/clanapp.cpp
  endif
@@ -11,13 +11,13 @@ Index: clanlib-0.8.0/Sources/Application/Makefile.am
 +  ../Core/libclanCore.la
 +
  libclanApp_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Index: clanlib-0.8.0/Sources/Core/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+ 
+Index: clanlib-1.0~svn3827/Sources/Core/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/Core/Makefile.am	2005-07-10 01:25:31.000000000 +0200
-+++ clanlib-0.8.0/Sources/Core/Makefile.am	2007-04-14 21:29:36.000000000 +0200
-@@ -125,7 +125,9 @@
+--- clanlib-1.0~svn3827.orig/Sources/Core/Makefile.am	2009-09-23 13:18:21.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Core/Makefile.am	2009-09-23 13:18:44.000000000 -0400
+@@ -126,7 +126,9 @@
  endif
  
  # FIXME: Hardcoding these here might not be a good idea
@@ -27,23 +27,23 @@ Index: clanlib-0.8.0/Sources/Core/Makefile.am
 +  @LIBPTHREAD@ -ldl
  
  libclanCore_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-Index: clanlib-0.8.0/Sources/Display/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+Index: clanlib-1.0~svn3827/Sources/Display/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/Display/Makefile.am	2005-07-07 20:17:44.000000000 +0200
-+++ clanlib-0.8.0/Sources/Display/Makefile.am	2007-04-14 20:51:17.000000000 +0200
+--- clanlib-1.0~svn3827.orig/Sources/Display/Makefile.am	2009-09-23 13:19:18.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Display/Makefile.am	2009-09-23 13:21:03.000000000 -0400
 @@ -2,8 +2,9 @@
  
  # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that
  if WIN32
 +xlibs = 
  else
--libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
+-libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
 +xlibs = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
  endif
  
  libclanDisplay_la_SOURCES = \
-@@ -114,6 +115,11 @@
+@@ -117,6 +118,11 @@
  Win32/input_device_win32mouse.h
  endif
  
@@ -53,30 +53,30 @@ Index: clanlib-0.8.0/Sources/Display/Makefile.am
 +  $(xlibs)
 +
  libclanDisplay_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Index: clanlib-0.8.0/Sources/GL/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+ 
+Index: clanlib-1.0~svn3827/Sources/GL/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/GL/Makefile.am	2005-02-11 15:13:43.000000000 +0100
-+++ clanlib-0.8.0/Sources/GL/Makefile.am	2007-04-14 20:51:17.000000000 +0200
+--- clanlib-1.0~svn3827.orig/Sources/GL/Makefile.am	2009-09-23 13:21:29.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/GL/Makefile.am	2009-09-23 13:22:38.000000000 -0400
 @@ -34,6 +34,7 @@
  libclanGL_la_SOURCES += \
  WGL/display_window_opengl.h \
  WGL/display_window_opengl.cpp
-+xlibs = 
++xlibs =
  else
  libclanGL_la_SOURCES += \
  GLX/display_window_opengl.h \
-@@ -51,7 +52,7 @@
+@@ -58,7 +59,7 @@
  GLX/input_device_x11keyboard.h \
  GLX/input_device_xinput.cpp \
  GLX/input_device_xinput.h
 -libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL 
-+xlibs = -lXxf86vm -lXi -lGLU -lGL 
++xlibs = -lXxf86vm -lXi -lGLU -lGL
  endif
  
  EXTRA_DIST = \
-@@ -59,6 +60,12 @@
+@@ -66,6 +67,12 @@
   WGL/displaycard_opengl_win32.h   \
   WGL/setupgl_win32.cpp
  
@@ -87,31 +87,33 @@ Index: clanlib-0.8.0/Sources/GL/Makefile.am
 +  $(xlibs)
 +
  libclanGL_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Index: clanlib-0.8.0/Sources/GUI/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+ 
+Index: clanlib-1.0~svn3827/Sources/GUI/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/GUI/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/GUI/Makefile.am	2007-04-14 20:51:17.000000000 +0200
-@@ -88,6 +88,10 @@
+--- clanlib-1.0~svn3827.orig/Sources/GUI/Makefile.am	2009-09-23 13:25:27.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/GUI/Makefile.am	2009-09-23 13:25:58.000000000 -0400
+@@ -92,7 +92,10 @@
+ deck_generic.h \
  deck_generic.cpp
  
- 
+-
 +libclanGUI_la_LIBADD = \
 +  ../Display/libclanDisplay.la \
 +  ../Signals/libclanSignals.la \
 +  ../Core/libclanCore.la
  
  libclanGUI_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-Index: clanlib-0.8.0/Sources/GUIStyleSilver/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+Index: clanlib-1.0~svn3827/Sources/GUIStyleSilver/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/GUIStyleSilver/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/GUIStyleSilver/Makefile.am	2007-04-14 20:51:17.000000000 +0200
-@@ -14,6 +14,11 @@
+--- clanlib-1.0~svn3827.orig/Sources/GUIStyleSilver/Makefile.am	2009-09-23 13:26:16.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/GUIStyleSilver/Makefile.am	2009-09-23 13:26:39.000000000 -0400
+@@ -13,7 +13,11 @@
+ treeitem_silver.cpp	treeview_silver.cpp \
  treeitem_silver.h	treeview_silver.h
  
- 
+-
 +libclanGUIStyleSilver_la_LIBADD = \
 +  ../GUI/libclanGUI.la \
 +  ../Display/libclanDisplay.la \
@@ -119,11 +121,11 @@ Index: clanlib-0.8.0/Sources/GUIStyleSilver/Makefile.am
 +  ../Core/libclanCore.la
  
  libclanGUIStyleSilver_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-Index: clanlib-0.8.0/Sources/MikMod/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+Index: clanlib-1.0~svn3827/Sources/MikMod/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/MikMod/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/MikMod/Makefile.am	2007-04-14 20:51:17.000000000 +0200
+--- clanlib-1.0~svn3827.orig/Sources/MikMod/Makefile.am	2009-09-23 13:27:01.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/MikMod/Makefile.am	2009-09-23 13:27:25.000000000 -0400
 @@ -8,7 +8,11 @@
   soundprovider_mikmod.cpp   \
   soundprovider_mikmod_session.cpp
@@ -136,11 +138,11 @@ Index: clanlib-0.8.0/Sources/MikMod/Makefile.am
 +  -lmikmod
  
  libclanMikMod_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-Index: clanlib-0.8.0/Sources/Network/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+Index: clanlib-1.0~svn3827/Sources/Network/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/Network/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/Network/Makefile.am	2007-04-14 20:51:17.000000000 +0200
+--- clanlib-1.0~svn3827.orig/Sources/Network/Makefile.am	2009-09-23 13:27:49.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Network/Makefile.am	2009-09-23 13:28:12.000000000 -0400
 @@ -62,6 +62,10 @@
  libclanNetwork_la_SOURCES += setupnetwork_unix.cpp
  endif
@@ -150,17 +152,18 @@ Index: clanlib-0.8.0/Sources/Network/Makefile.am
 +  ../Core/libclanCore.la
 +
  libclanNetwork_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Index: clanlib-0.8.0/Sources/SDL/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+ 
+Index: clanlib-1.0~svn3827/Sources/SDL/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/SDL/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/SDL/Makefile.am	2007-04-14 20:51:17.000000000 +0200
-@@ -20,7 +20,11 @@
+--- clanlib-1.0~svn3827.orig/Sources/SDL/Makefile.am	2009-09-23 13:28:33.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/SDL/Makefile.am	2009-09-23 13:28:58.000000000 -0400
+@@ -20,7 +20,12 @@
  surface_sdl.h
  
  libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS)
 -libclanSDL_la_LIBADD   = $(SDL_LIBS)
++
 +libclanSDL_la_LIBADD = \
 +  ../Display/libclanDisplay.la \
 +  ../Signals/libclanSignals.la \
@@ -168,12 +171,12 @@ Index: clanlib-0.8.0/Sources/SDL/Makefile.am
 +  $(SDL_LIBS)
  
  libclanSDL_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-Index: clanlib-0.8.0/Sources/Sound/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+Index: clanlib-1.0~svn3827/Sources/Sound/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/Sound/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/Sound/Makefile.am	2007-04-14 20:51:17.000000000 +0200
-@@ -42,6 +42,10 @@
+--- clanlib-1.0~svn3827.orig/Sources/Sound/Makefile.am	2009-09-23 13:29:21.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Sound/Makefile.am	2009-09-23 13:29:45.000000000 -0400
+@@ -48,6 +48,10 @@
  SoundProviders/Unix/soundprovider_recorder_oss.h
  endif
  
@@ -182,12 +185,12 @@ Index: clanlib-0.8.0/Sources/Sound/Makefile.am
 +  ../Core/libclanCore.la
 +
  libclanSound_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-Index: clanlib-0.8.0/Sources/Vorbis/Makefile.am
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+   $(SOUND_LDFLAGS)
+Index: clanlib-1.0~svn3827/Sources/Vorbis/Makefile.am
 ===================================================================
---- clanlib-0.8.0.orig/Sources/Vorbis/Makefile.am	2004-11-08 13:13:52.000000000 +0100
-+++ clanlib-0.8.0/Sources/Vorbis/Makefile.am	2007-04-14 20:51:17.000000000 +0200
+--- clanlib-1.0~svn3827.orig/Sources/Vorbis/Makefile.am	2009-09-23 13:30:06.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Vorbis/Makefile.am	2009-09-23 13:30:34.000000000 -0400
 @@ -5,7 +5,11 @@
  	soundprovider_vorbis.cpp \
  	soundprovider_vorbis_session.cpp
@@ -200,12 +203,12 @@ Index: clanlib-0.8.0/Sources/Vorbis/Makefile.am
 +  -lvorbis -logg
  
  libclanVorbis_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-Index: clanlib-0.8.0/configure.ac
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+Index: clanlib-1.0~svn3827/configure.ac
 ===================================================================
---- clanlib-0.8.0.orig/configure.ac	2007-04-14 20:51:17.000000000 +0200
-+++ clanlib-0.8.0/configure.ac	2007-04-14 20:51:17.000000000 +0200
-@@ -423,7 +423,7 @@
+--- clanlib-1.0~svn3827.orig/configure.ac	2009-09-23 13:31:26.000000000 -0400
++++ clanlib-1.0~svn3827/configure.ac	2009-09-23 13:32:16.000000000 -0400
+@@ -458,7 +458,7 @@
  CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
  
  # Modules which will be build
@@ -214,7 +217,7 @@ Index: clanlib-0.8.0/configure.ac
  ClanLib_pkgconfig="clanApp.pc"
  
  # API header files for the Modules which will be installed
-@@ -432,7 +432,8 @@
+@@ -467,7 +467,8 @@
  # Default examples which will be build
  ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
  
diff --git a/debian/patches/200_kfreebsd.diff b/debian/patches/200_kfreebsd.diff
index 543151b..9f9fc70 100644
--- a/debian/patches/200_kfreebsd.diff
+++ b/debian/patches/200_kfreebsd.diff
@@ -1,35 +1,22 @@
-Index: clanlib-0.8.0/Sources/Core/System/Unix/mutex_pthread.cpp
+Index: clanlib-1.0~svn3827/Sources/Core/System/Unix/mutex_pthread.cpp
 ===================================================================
---- clanlib-0.8.0.orig/Sources/Core/System/Unix/mutex_pthread.cpp	2007-04-14 17:52:43.000000000 +0200
-+++ clanlib-0.8.0/Sources/Core/System/Unix/mutex_pthread.cpp	2007-04-14 17:53:10.000000000 +0200
+--- clanlib-1.0~svn3827.orig/Sources/Core/System/Unix/mutex_pthread.cpp	2009-09-23 13:33:07.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Core/System/Unix/mutex_pthread.cpp	2009-09-23 13:34:24.000000000 -0400
 @@ -40,7 +40,7 @@
  // suck:
  extern "C"
  {
--#ifdef __FreeBSD__
-+#if defined __FreeBSD__ || defined __FreeBSD_kernel__
+-#if defined(__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__APPLE__) || defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__OpenBSD__)
  	int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
  #else
  	int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
-@@ -63,7 +63,7 @@
- #ifdef __APPLE__
- 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE );
- #else
--#ifdef __FreeBSD__
-+#if defined __FreeBSD__ || defined __FreeBSD_kernel__
+@@ -60,7 +60,7 @@
+ 	pthread_mutexattr_t attr;
+ 	pthread_mutexattr_init(&attr);
+ 
+-#if defined(__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__APPLE__) || defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__OpenBSD__)
          pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
  #else
  #if PTHREAD_MUTEX_RECURSIVE_NP
-Index: clanlib-0.8.0/Sources/Network/setupnetwork_unix.cpp
-===================================================================
---- clanlib-0.8.0.orig/Sources/Network/setupnetwork_unix.cpp	2007-04-14 17:52:43.000000000 +0200
-+++ clanlib-0.8.0/Sources/Network/setupnetwork_unix.cpp	2007-04-14 17:53:23.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Socket/socket_select.h"
- #include <signal.h>
- 
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
- #define sighandler_t sig_t
- #endif
- 
diff --git a/debian/patches/400_test_subdirs_signals.diff b/debian/patches/400_test_subdirs_signals.diff
new file mode 100644
index 0000000..1efb3e7
--- /dev/null
+++ b/debian/patches/400_test_subdirs_signals.diff
@@ -0,0 +1,12 @@
+Index: clanlib-1.0~svn3827/Sources/Makefile.am
+===================================================================
+--- clanlib-1.0~svn3827.orig/Sources/Makefile.am	2009-09-23 23:30:32.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/Makefile.am	2009-09-23 23:30:55.000000000 -0400
+@@ -10,6 +10,7 @@
+   GUIStyleSilver \
+   MikMod         \
+   Network        \
++  Signals        \
+   Sound          \
+   SDL            \
+   Vorbis
diff --git a/debian/patches/series b/debian/patches/series
index 202e249..0970480 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 005_am_maintainer_mode.diff
 010_full_linking.diff
 200_kfreebsd.diff
-300_rebootstrap.diff
-305_gcc43.diff
-310_gcc44.diff
+300_log_h.diff
+400_test_subdirs_signals.diff
diff --git a/debian/rules b/debian/rules
index 72f41b0..952185b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,9 @@ build-stamp: configure-stamp
 configure-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+	autoreconf -fvi
+
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure $(CONFIG_FLAGS)
 	touch $@
 
@@ -44,7 +47,14 @@ clean:
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f build-stamp configure-stamp
+	rm -f config.sub config.guess ltmain.sh configure
+	rm -f missing depcomp install-sh aclocal.m4
+	find ./ -name Makefile.in -and -not -path './Examples/Makefile.in' -delete
+	rm -f Documentation/*.html
+	rm -f Documentation/Tutorial/*.html
+	rm -f Documentation/Tutorial/Kavanek/*.html
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc
 	dh_clean
 
 install: build-stamp
@@ -75,16 +85,16 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdebconf -a
-	dh_installdocs -plibclanapp-0.8-1
-	dh_installchangelogs -plibclanapp-0.8-1 
+	dh_installdocs -plibclanapp-1.0
+	dh_installchangelogs -plibclanapp-1.0 
 	dh_strip -a
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibclanapp-0.8-1 -V "libclanapp-0.8-1"
-	dh_makeshlibs -plibclansdl-0.8-1 -V "libclansdl-0.8-1"
+	dh_makeshlibs -plibclanapp-1.0 -V "libclanapp-1.0"
+	dh_makeshlibs -plibclansdl-1.0 -V "libclansdl-1.0"
 	dh_installdeb -a
-	dh_shlibdeps -a -L libclanapp-0.8-1 -L libclansdl-0.8-1 -ldebian/libclanapp-0.8-1/usr/lib:debian/libclansdl-0.8-1/usr/lib
+	dh_shlibdeps -a -L libclanapp-1.0 -L libclansdl-1.0 -ldebian/libclanapp-1.0/usr/lib:debian/libclansdl-1.0/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

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

More information about the Pkg-games-commits mailing list