r12531 - packages/trunk/crystalspace/debian

[Ansgar Burchardt]

Author: ansgar
Date: 2011-07-16 13:31:57 +0000 (Sat, 16 Jul 2011)
New Revision: 12531

Modified:
   packages/trunk/crystalspace/debian/README.source
   packages/trunk/crystalspace/debian/changelog
   packages/trunk/crystalspace/debian/control
   packages/trunk/crystalspace/debian/rules
Log:
* Team upload.
* Build-dep on libjpeg-dev instead of libjpeg62-dev. (Closes: #633727)
* Drop build-dep on libcucul-dev. (Closes: #633809)
* debian/rules: Just skip dh_auto_test instead of forcing DEB_BUILD_OPTIONS
  to "nocheck".
* debian/README.source: Remove quilt documentation.

Modified: packages/trunk/crystalspace/debian/README.source
===================================================================
--- packages/trunk/crystalspace/debian/README.source	2011-07-16 12:01:46 UTC (rev 12530)
+++ packages/trunk/crystalspace/debian/README.source	2011-07-16 13:31:57 UTC (rev 12531)
@@ -4,63 +4,3 @@
     crystalspace tarball.
 
  -- Devid Antonio Filoni <d.filoni at ubuntu.com>  Sat, 14 Aug 2010 18:43:16 +0200
-
-
-
-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.

Modified: packages/trunk/crystalspace/debian/changelog
===================================================================
--- packages/trunk/crystalspace/debian/changelog	2011-07-16 12:01:46 UTC (rev 12530)
+++ packages/trunk/crystalspace/debian/changelog	2011-07-16 13:31:57 UTC (rev 12531)
@@ -1,3 +1,14 @@
+crystalspace (1.4.0+dfsg-5) unstable; urgency=low
+
+  * Team upload.
+  * Build-dep on libjpeg-dev instead of libjpeg62-dev. (Closes: #633727)
+  * Drop build-dep on libcucul-dev. (Closes: #633809)
+  * debian/rules: Just skip dh_auto_test instead of forcing DEB_BUILD_OPTIONS
+    to "nocheck".
+  * debian/README.source: Remove quilt documentation.
+
+ -- Ansgar Burchardt <ansgar at debian.org>  Sat, 16 Jul 2011 15:29:30 +0200
+
 crystalspace (1.4.0+dfsg-4) unstable; urgency=low
 
   * Add upstream debian/patches/ARM_support.diff patch to add ARM to supported

Modified: packages/trunk/crystalspace/debian/control
===================================================================
--- packages/trunk/crystalspace/debian/control	2011-07-16 12:01:46 UTC (rev 12530)
+++ packages/trunk/crystalspace/debian/control	2011-07-16 13:31:57 UTC (rev 12531)
@@ -5,10 +5,10 @@
 Uploaders: Christian Bayle <bayle at debian.org>, Barry deFreese
  <bdefreese at debian.org>, Devid Antonio Filoni <d.filoni at ubuntu.com>
 Build-Depends: debhelper (>= 7.2.6), lib3ds-dev, autoconf,
- libogg-dev, libjpeg62-dev, libfreetype6-dev, zlib1g-dev, libode-dev
+ libogg-dev, libjpeg-dev, libfreetype6-dev, zlib1g-dev, libode-dev
  | libode0-dev, libopenal-dev, libcal3d-dev, swig, flex, bison, doxygen,
  libmng-dev, libsdl1.2-dev, libx11-dev, libcaca-dev, libwxgtk2.8-dev,
- libcegui-mk2-dev, python-dev, libcppunit-dev, libcucul-dev,
+ libcegui-mk2-dev, python-dev, libcppunit-dev,
  libasound-dev [ linux-any ], liblcms-dev, libcairo-dev, libcairomm-1.0-dev,
  libgtk2.0-dev, jam, libgl1-mesa-dev | libgl-dev, libvorbis-dev,
  libxxf86vm-dev, libxaw7-dev, default-jdk, libpng12-dev

Modified: packages/trunk/crystalspace/debian/rules
===================================================================
--- packages/trunk/crystalspace/debian/rules	2011-07-16 12:01:46 UTC (rev 12530)
+++ packages/trunk/crystalspace/debian/rules	2011-07-16 13:31:57 UTC (rev 12531)
@@ -48,6 +48,9 @@
 	# Fix script-not-executable lintian warning:
 	chmod 755 $(CURDIR)/debian/crystalspace-data/usr/share/crystalspace-*/bindings/perl5/perlsimp.pl
 
+override_dh_auto_test:
+	# skipping tests
+
 override_dh_makeshlibs:
 	dh_makeshlibs -V 'libcrystalspace-1.4 (>= 1.4.0+dfsg-4)'