[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-42-g6eacaac

2012-04-25 Thread Michael Gilbert
The following commit has been merged in the master branch:
commit 6eacaac30a1d650f748f1cf2a76bbe1a7c9e7432
Author: Michael Gilbert mgilb...@debian.org
Date:   Wed Apr 25 16:32:21 2012 -0400

add a breaks minetest  0.3.1+dfsg-3

diff --git a/debian/changelog b/debian/changelog
index 388dd4f..d928ce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+minetest (0.3.1+dfsg-4) unstable; urgency=low
+
+  * add a breaks minetest  0.3.1+dfsg-3 to appropriately handle upgrades
+after the package split (closes: #670208)
+
+ -- Michael Gilbert mgilb...@debian.org  Wed, 25 Apr 2012 16:04:01 -0400
+
+minetest (0.3.1+dfsg-3) unstable; urgency=low
+
+  * use debhelper 9 and simplify build hardening
+  * update my email address
+  * bump standards to 3.9.3
+  * build-depend on libpng-dev instead of libpng12-dev (closes: #662432)
+  * fix gcc 4.7 build failure (closes: #667280)
+  * split the server into its own package (closes: #668004)
+  * move binaries to /usr/games in install files
+
+ -- Michael Gilbert mgilb...@debian.org  Sat, 21 Apr 2012 15:52:14 -0400
+
 minetest (0.3.1+dfsg-2) unstable; urgency=low
 
   * Fix freedesktop menu Type entry.
diff --git a/debian/control b/debian/control
index d66e768..f2f7a24 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,8 @@ Package: minetest-common
 Architecture: all
 Depends:
  ${misc:Depends},
+Breaks:
+ minetest ( 0.3.1+dfsg-3),
 Description: InfiniMiner/Minecraft-inspired open game world common files
  minetest-c55 is a minecraft-inspired game written from scratch and licensed
  under the GPL (version 2 or later). It supports both survival and creative

-- 
InfiniMiner/Minecraft-inspired open game world

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


[SCM] InfiniMiner/Minecraft-inspired open game world tag, debian/0.3.1+dfsg-4, created. upstream/0.2.20110731.3-42-g6eacaac

2012-04-25 Thread Michael Gilbert
The tag, debian/0.3.1+dfsg-4 has been created
at  6eacaac30a1d650f748f1cf2a76bbe1a7c9e7432 (commit)

- Shortlog 
commit 6eacaac30a1d650f748f1cf2a76bbe1a7c9e7432
Author: Michael Gilbert mgilb...@debian.org
Date:   Wed Apr 25 16:32:21 2012 -0400

add a breaks minetest  0.3.1+dfsg-3
---

-- 
InfiniMiner/Minecraft-inspired open game world

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


[SCM] Debian packaging of allegro4.4 branch, master, updated. upstream/4.4.2-123-g98d4bd8

2012-04-25 Thread Andreas Rönnquist
The following commit has been merged in the master branch:
commit a6e1f87086d19bff2e75bb9a57755ac8721f94d8
Author: Andreas Rönnquist gus...@gusnan.se
Date:   Wed Apr 25 22:26:34 2012 +0200

Build and install the tools too

diff --git a/debian/liballegro4.4-dev.install b/debian/liballegro4.4-dev.install
index d19c249..6cad401 100644
--- a/debian/liballegro4.4-dev.install
+++ b/debian/liballegro4.4-dev.install
@@ -90,4 +90,13 @@ usr/lib/*/pkgconfig/allegro.pc
 usr/lib/*/pkgconfig/allegrogl.pc
 usr/lib/*/pkgconfig/logg.pc
 usr/lib/*/liballeg.so
-
+usr/bin/colormap
+usr/bin/dat
+usr/bin/dat2c
+usr/bin/dat2s
+usr/bin/exedat
+usr/bin/grabber
+usr/bin/pack
+usr/bin/pat2dat
+usr/bin/rgbmap
+usr/bin/textconv
diff --git a/debian/rules b/debian/rules
index 135f521..5a3c527 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWANT_LOADPNG=ON \
-DWANT_LOGG=OFF \
-DWANT_JPGALLEG=ON \
-   -DWANT_TOOLS=OFF \
+   -DWANT_TOOLS=ON \
-DWANT_EXAMPLES=ON \
-DWANT_TESTS=ON
 

-- 
Debian packaging of allegro4.4

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

[SCM] Debian packaging of allegro4.4 branch, master, updated. upstream/4.4.2-123-g98d4bd8

2012-04-25 Thread Andreas Rönnquist
The following commit has been merged in the master branch:
commit 98d4bd8bb15a93e39ca684f31d30e6e86206c2f7
Author: Andreas Rönnquist gus...@gusnan.se
Date:   Wed Apr 25 22:39:59 2012 +0200

Fix missing-dependency-on-libc

diff --git a/debian/control b/debian/control
index 2eba673..10a2d16 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Package: liballegro4.4-dev
 Section: libdevel
 Architecture: any
 Pre-Depends: multiarch-support
-Depends: ${misc:Depends}, liballegro4.4 (= ${binary:Version}), libxext-dev, 
libx11-dev, libxpm-dev, libxxf86vm-dev, libxcursor-dev
+Depends: ${misc:Depends}, ${shlibs:Depends}, liballegro4.4 (= 
${binary:Version}), libxext-dev, libx11-dev, libxpm-dev, libxxf86vm-dev, 
libxcursor-dev
 Provides: liballegro4-dev, liballegro-dev-common, liballegro-dev
 Conflicts: liballegro-dev-common, liballegro4a ( 2:4.0.3-5), liballegro-dev 
( 2:4.4), liballegro5-dev
 Replaces: liballegro-dev-common, liballegro4a ( 2:4.0.3-5), liballegro-dev 
( 2:4.4.0-0rc2-1)

-- 
Debian packaging of allegro4.4

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

[SCM] Debian packaging of wesnoth branch, squeeze-backports, updated. debian/1.10.2-1-4-g97d59f6

2012-04-25 Thread Gerfried Fuchs
The following commit has been merged in the squeeze-backports branch:
commit 6089dd6183288b3834dc0dd17ea9169b9b323362
Merge: 00d8569c6e856bf5ba848d816297b9a8a12ba2ea 
2b5c6c052c593b0904bca8e99315dbe104b5087c
Author: Gerfried Fuchs rho...@debian.org
Date:   Wed Apr 25 18:19:15 2012 +0200

Merge tag 'debian/1.10.2-1' into squeeze-backports

Uploading 1:1.10.2-1 to unstable

Conflicts:
debian/changelog

diff --combined debian/changelog
index 240e239,17232a1..9b48d84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ wesnoth-1.10 (1:1.10.2-1) unstable; urgency=low
+ 
+   * New upstream stable release.
+   * Also install wesnoth-help translations into -data package, thanks to Petr
+ Gajdůšek for noticing (closes: #664164)
+   * Bump to Standards-Version 3.9.3.
+ 
+  -- Gerfried Fuchs rho...@debian.org  Sun, 08 Apr 2012 16:16:17 +0200
+ 
+ wesnoth-1.10 (1:1.10.1-1) unstable; urgency=low
+ 
+   * New upstream stable release, making fix-xdg-path patch obsolete.
+   * Use proper name for the nolog alternative. Thanks to Paul Wise for
+ noticing (closes: #658078)
+ 
+  -- Gerfried Fuchs rho...@debian.org  Tue, 28 Feb 2012 00:44:18 +0100
+ 
 +wesnoth-1.10 (1:1.10-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- Gerfried Fuchs rho...@debian.org  Wed, 08 Feb 2012 11:45:25 +0100
 +
  wesnoth-1.10 (1:1.10-1) unstable; urgency=low
  
* New upstream stable release!  \o/

-- 
Debian packaging of wesnoth

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

[SCM] Debian packaging of wesnoth branch, squeeze-backports, updated. debian/1.10.2-1-4-g97d59f6

2012-04-25 Thread Gerfried Fuchs
The following commit has been merged in the squeeze-backports branch:
commit 97d59f62bd6e40ef5de596480909c9f384b19db5
Author: Gerfried Fuchs rho...@debian.org
Date:   Wed Apr 25 18:20:27 2012 +0200

backports changelog stub

diff --git a/debian/changelog b/debian/changelog
index 9b48d84..2fcbfa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wesnoth-1.10 (1:1.10.2-1~bpo60+1) squeeze-backports; urgency=low
+
+  * Rebuild for squeeze-backports.
+
+ -- Gerfried Fuchs rho...@debian.org  Wed, 25 Apr 2012 18:19:45 +0200
+
 wesnoth-1.10 (1:1.10.2-1) unstable; urgency=low
 
   * New upstream stable release.

-- 
Debian packaging of wesnoth

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


[SCM] Debian packaging of allegro4.4 branch, master, updated. upstream/4.4.2-124-g2e4768e

2012-04-25 Thread Andreas Rönnquist
The following commit has been merged in the master branch:
commit 2e4768e46627585e2d009d9e7d8ee73340180aae
Author: Andreas Rönnquist gus...@gusnan.se
Date:   Thu Apr 26 01:18:07 2012 +0200

Add manpages and fix links to them

diff --git a/debian/allegro-dev-tools.1 b/debian/allegro-dev-tools.1
new file mode 100644
index 000..b8ea835
--- /dev/null
+++ b/debian/allegro-dev-tools.1
@@ -0,0 +1,52 @@
+.TH ALLEGRO 1 8 June 2003 Version 4.0.3
+.SH NAME
+allegro-dev-tools - collection of useful tools for Allegro developers
+.SH SYNOPSIS
+.B colormap
+[OPTIONS]
+.br
+.B dat
+[OPTIONS]
+.br
+.B dat2s
+[OPTIONS]
+.br
+.B exedat
+[OPTIONS]
+.br
+.B grabber
+[OPTIONS]
+.br
+.B pack
+[OPTIONS]
+.br
+.B pat2dat
+[OPTIONS]
+.br
+.B rgbmap
+[OPTIONS]
+.br
+.B textconv
+[OPTIONS]
+.br
+
+.SH DESCRIPTION
+.PP
+
+The listed tools are distributed with the Allegro package to help
+developers on their work. They are intended to prepare some data
+(pat2dat, rgbmap, textconf) or create and manage data files that are
+used by the Allegro library (dat, dat2s, exedat, grabber, pack). Call
+this programs from the command line to print some help about their
+usage.
+.SH SEE ALSO
+.BR allegro-config (1)
+.br
+The
+.BR allegro
+info entry
+.br
+Additional documentation and example files are contained in the liballegro-doc 
package on Debian systems.
+.SH COPYRIGHT
+This manual page was   written   by   Eduard   Bloch bl...@debian.org,
+for the Debian GNU/Linux  system  (but may be used by others).
diff --git a/debian/liballegro4.4-dev.links b/debian/liballegro4.4-dev.links
new file mode 100644
index 000..b550951
--- /dev/null
+++ b/debian/liballegro4.4-dev.links
@@ -0,0 +1,10 @@
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/colormap.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/dat.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/dat2c.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/dat2s.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/exedat.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/grabber.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/pack.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/pat2dat.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/rgbmap.1
+usr/share/man/man1/allegro-dev-tools.1 usr/share/man/man1/textconv.1
\ No newline at end of file
diff --git a/debian/liballegro4.4-dev.manpages 
b/debian/liballegro4.4-dev.manpages
index c7dd944..77366bd 100644
--- a/debian/liballegro4.4-dev.manpages
+++ b/debian/liballegro4.4-dev.manpages
@@ -1,2 +1,3 @@
 debian/allegro-config.1
+debian/allegro-dev-tools.1
 

-- 
Debian packaging of allegro4.4

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