[hedgewars] 01/01: Upload to unstable

2016-10-28 Thread Gianfranco Costamagna 
This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 9bfdcb69191c369aad14b30755e3d950f55fae45
Author: Gianfranco Costamagna 
Date:   Fri Oct 28 08:38:52 2016 +0200

Upload to unstable
---
 debian/changelog  |   7 +--
 debian/control|   2 +-
 debian/patches/ad435d95ca4b.patch | 110 ++
 debian/patches/series |   2 +
 4 files changed, 117 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd50bdd..a6d303f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-hedgewars (0.9.23-dfsg-1) UNRELEASED; urgency=medium
+hedgewars (0.9.22-dfsg-8) unstable; urgency=medium
 
   * Remove workardound for game0.log dump, useless.
   * Remove bytestring-show references
-  * Closes: #836686 (dataenc needs to be removed in next release,
-upstream is aware of that)
+  * debian/patches/ad435d95ca4b.patch:
+- Closes: #836686 (dataenc needs to be removed in next release,
+  upstream is aware of that)
 
  -- Gianfranco Costamagna   Tue, 19 Apr 2016 
13:18:42 +0200
 
diff --git a/debian/control b/debian/control
index 7f9a156..1cbc720 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: clang [hurd-i386 kfreebsd-amd64 kfreebsd-i386 
mips mipsel mips64e
imagemagick,
libavcodec-dev,
libavformat-dev,
-   libghc-dataenc-dev,
+   libghc-sandi-dev,
libghc-entropy-dev,
libghc-hslogger-dev,
libghc-mtl-dev,
diff --git a/debian/patches/ad435d95ca4b.patch 
b/debian/patches/ad435d95ca4b.patch
new file mode 100644
index 000..593c21a
--- /dev/null
+++ b/debian/patches/ad435d95ca4b.patch
@@ -0,0 +1,110 @@
+# HG changeset patch
+# User unc0rr
+# Date 1475346425 -10800
+# Node ID ad435d95ca4b5fbffb88a440ea28548d6784d8cf
+# Parent  0b8f2116aa26e68d262fb812e6d441c1a3dec145
+ - Use sandi instead of dataenc (bugs.debian.org/836686)
+ - Only try to import module from the package being tested
+   (sometimes packages have modules with equal names, so a test
+   for module presence could succeed when you have one package
+   installed instead of another)
+
+Index: hedgewars/cmake_modules/CheckHaskellModuleExists.cmake
+===
+--- hedgewars.orig/cmake_modules/CheckHaskellModuleExists.cmake
 hedgewars/cmake_modules/CheckHaskellModuleExists.cmake
+@@ -28,6 +28,9 @@
+ "-DMODULE=${MODULE}"
+ "-DFUNCTION=${FUNCTION}"
+ "-DPARAMETERS=${PARAMETERS}"
++-hide-all-packages
++-package ${LIBRARY}
++-package base
+ -cpp
+ -c "${CMAKE_MODULE_PATH}/checkModule.hs"
+ RESULT_VARIABLE COMMAND_RESULT
+Index: hedgewars/gameServer/CMakeLists.txt
+===
+--- hedgewars.orig/gameServer/CMakeLists.txt
 hedgewars/gameServer/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ check_haskell_module_exists("Network.BSD" getHostName 0 network)
+ check_haskell_module_exists("Data.Time" getCurrentTime 0 time)
+ check_haskell_module_exists("Control.Monad.State" fix 1 mtl)
+-check_haskell_module_exists("Codec.Binary.Base64" encode 1 dataenc)
++check_haskell_module_exists("Codec.Binary.Base64" encode 1 sandi)
+ check_haskell_module_exists("System.Log.Logger" warningM 1 hslogger)
+ check_haskell_module_exists("System.Process" createProcess 3 process)
+ check_haskell_module_exists("Data.ByteString.Lazy.UTF8" decode 1 utf8-string)
+Index: hedgewars/gameServer/EngineInteraction.hs
+===
+--- hedgewars.orig/gameServer/EngineInteraction.hs
 hedgewars/gameServer/EngineInteraction.hs
+@@ -59,7 +59,7 @@
+ #endif
+ 
+ toEngineMsg :: B.ByteString -> B.ByteString
+-toEngineMsg msg = B.pack $ Base64.encode (fromIntegral (BW.length msg) : 
BW.unpack msg)
++toEngineMsg msg = Base64.encode (fromIntegral (BW.length msg) `BW.cons` msg)
+ 
+ 
+ {-fromEngineMsg :: B.ByteString -> Maybe B.ByteString
+@@ -81,15 +81,15 @@
+ checkNetCmd :: B.ByteString -> (B.ByteString, B.ByteString, Maybe (Maybe 
B.ByteString))
+ checkNetCmd msg = check decoded
+ where
+-decoded = liftM (splitMessages . BW.pack) $ Base64.decode $ B.unpack 
msg
+-check Nothing = (B.empty, B.empty, Nothing)
+-check (Just msgs) = let (a, b) = (filter isLegal msgs, filter 
isNonEmpty a) in (encode a, encode b, lft a)
+-encode = B.pack . Base64.encode . BW.unpack . B.concat
++decoded = liftM splitMessages $ Base64.decode msg
++check (Left _) = (B.empty, B.empty, Nothing)
++check (Right

[hedgewars] 01/01: Upload to unstable, disabling patches

2015-01-07 Thread Gianfranco Costamagna 
This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 1bb73934e00035df7297d84901204a1a3b8fbf3b
Author: Gianfranco Costamagna costamagnagianfra...@yahoo.it
Date:   Wed Jan 7 11:11:12 2015 +0100

Upload to unstable, disabling patches
---
 debian/changelog  |  8 
 debian/patches/disable-fstack-protector.patch | 18 --
 debian/patches/series |  1 -
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9149d9..487e15d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hedgewars (0.9.21.1-3) unstable; urgency=medium
+
+  * Upload to unstable, with no patches at all.
+- the clang build failure seems probably clang-related (cfr: #754417).
+  leaving the arch enabled until some clang folk fixes this.
+
+ -- Gianfranco Costamagna costamagnagianfra...@yahoo.it  Wed, 07 Jan 2015 
11:02:36 +0100
+
 hedgewars (0.9.21.1-2) experimental; urgency=medium
 
   * Try to not use fstack-protector when BUILD_ENGINE_C, clang is
diff --git a/debian/patches/disable-fstack-protector.patch 
b/debian/patches/disable-fstack-protector.patch
deleted file mode 100644
index 087de2e..000
--- a/debian/patches/disable-fstack-protector.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/cmake_modules/compilerchecks.cmake 
b/cmake_modules/compilerchecks.cmake
-index 2029712..26a15e4 100644
 a/cmake_modules/compilerchecks.cmake
-+++ b/cmake_modules/compilerchecks.cmake
-@@ -17,9 +17,12 @@ if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES BSD.OS) OR 
(CMAKE_SYSTEM_NAME MATCHE
- #some bsd installations reported problems too
- #(see 822312 654424 on bugzilla.redhat.com)
- check_c_compiler_flag(-fstack-protector-all -fstack-protector 
HAVE_STACKPROTECTOR)
--if(HAVE_STACKPROTECTOR)
-+if(HAVE_STACKPROTECTOR AND NOT BUILD_ENGINE_C)
- add_flag_append(CMAKE_C_FLAGS -fstack-protector-all 
-fstack-protector)
- add_flag_append(CMAKE_CXX_FLAGS -fstack-protector-all 
-fstack-protector)
-+else()
-+add_flag_append(CMAKE_C_FLAGS -fnostack-protector)
-+add_flag_append(CMAKE_CXX_FLAGS -fnostack-protector)
- endif()
- endif()
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a03d01c..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable-fstack-protector.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/hedgewars.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[hedgewars] 01/01: Upload to unstable

2014-06-16 Thread Gianfranco Costamagna 
This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/0.9.20.5-6
in repository hedgewars.

commit c287f170e9ab2d904de2156fa3f1a34b2faccc37
Author: Gianfranco Costamagna costamagnagianfra...@yahoo.it
Date:   Mon Jun 16 10:52:23 2014 +0200

Upload to unstable
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf04bdb..6409185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hedgewars (0.9.20.5-6) unstable; urgency=low
+
+  * Release to unstable.
+
+ -- Gianfranco Costamagna costamagnagianfra...@yahoo.it  Mon, 16 Jun 2014 
10:51:04 +0200
+
 hedgewars (0.9.20.5-5) experimental; urgency=low
 
   * debian/patches/0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/collab-maint/hedgewars.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits