r14341 - in packages/trunk/gnujump/debian: . patches

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:10:20 + (Thu, 27 Jun 2013)
New Revision: 14341

Added:
   packages/trunk/gnujump/debian/patches/06_link_against_-lm_.patch
Modified:
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/patches/series
Log:
link against -lm to fix underlinking FTBFS



Modified: packages/trunk/gnujump/debian/changelog
===
--- packages/trunk/gnujump/debian/changelog 2013-06-27 02:40:33 UTC (rev 
14340)
+++ packages/trunk/gnujump/debian/changelog 2013-06-27 06:10:20 UTC (rev 
14341)
@@ -1,3 +1,11 @@
+gnujump (1.0.6-5) UNRELEASED; urgency=low
+
+  * link against -lm to fix underlinking FTBFS
+Thanks: Logan Rosen lo...@ubuntu.com
+Closes: #704699
+
+ -- Evgeni Golov evg...@debian.org  Thu, 27 Jun 2013 08:07:45 +0200
+
 gnujump (1.0.6-4) unstable; urgency=low
 
   * Remove README.source, because quilt is no longer being used.

Added: packages/trunk/gnujump/debian/patches/06_link_against_-lm_.patch
===
--- packages/trunk/gnujump/debian/patches/06_link_against_-lm_.patch
(rev 0)
+++ packages/trunk/gnujump/debian/patches/06_link_against_-lm_.patch
2013-06-27 06:10:20 UTC (rev 14341)
@@ -0,0 +1,13 @@
+Description: link against -lm to fix underlinking FTBFS
+Author: Logan Rosen lo...@ubuntu.com
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -5,7 +5,7 @@
+ 
+ # the library search path.
+ gnujump_LDFLAGS = -Wl,--as-needed
+-gnujump_LDADD = $(all_libraries) 
++gnujump_LDADD = $(all_libraries) -lm 
+ 
+ gnujump_SOURCES = \
+   game.h\

Modified: packages/trunk/gnujump/debian/patches/series
===
--- packages/trunk/gnujump/debian/patches/series2013-06-27 02:40:33 UTC 
(rev 14340)
+++ packages/trunk/gnujump/debian/patches/series2013-06-27 06:10:20 UTC 
(rev 14341)
@@ -3,3 +3,4 @@
 03_main_c_include_locale_h.patch
 04_linker_arguments.patch
 05_full_build.patch
+06_link_against_-lm_.patch


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


r14342 - in packages/trunk/gnujump/debian: . patches

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:27:19 + (Thu, 27 Jun 2013)
New Revision: 14342

Added:
   packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch
Modified:
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/patches/series
Log:
fix a crash when $HOME is not set



Modified: packages/trunk/gnujump/debian/changelog
===
--- packages/trunk/gnujump/debian/changelog 2013-06-27 06:10:20 UTC (rev 
14341)
+++ packages/trunk/gnujump/debian/changelog 2013-06-27 06:27:19 UTC (rev 
14342)
@@ -3,6 +3,9 @@
   * link against -lm to fix underlinking FTBFS
 Thanks: Logan Rosen lo...@ubuntu.com
 Closes: #704699
+  * fix a crash when $HOME is not set
+Thanks: Alexandre Rebert alexan...@cmu.edu and the whole
+The Mayhem Team at Cylab, Carnegie Mellon University
 
  -- Evgeni Golov evg...@debian.org  Thu, 27 Jun 2013 08:07:45 +0200
 

Added: packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch
===
--- packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch  
(rev 0)
+++ packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch  2013-06-27 
06:27:19 UTC (rev 14342)
@@ -0,0 +1,30 @@
+Index: gnujump-1.0.6/src/main.c
+===
+--- gnujump-1.0.6.orig/src/main.c  2013-06-26 21:14:47.0 +0200
 gnujump-1.0.6/src/main.c   2013-06-26 21:30:18.764096468 +0200
+@@ -54,6 +54,10 @@
+   /* Get the config file name */
+ #ifndef WIN32
+   homeDir = getenv (HOME);
++  if (homeDir == NULL) {
++homeDir = malloc (sizeof (char) * 2);
++strcpy(homeDir, /);
++  }
+   cfgFile =
+ malloc (sizeof (char) *
+   (strlen (homeDir) + strlen (CONFDIR) + strlen (CFGFILE) + 3));
+Index: gnujump-1.0.6/src/setup.c
+===
+--- gnujump-1.0.6.orig/src/setup.c 2008-09-23 16:17:29.0 +0200
 gnujump-1.0.6/src/setup.c  2013-06-26 21:30:43.089779756 +0200
+@@ -55,6 +55,10 @@
+ 
+ #ifndef WIN32
+   homeDir = getenv (HOME);
++  if (homeDir == NULL) {
++homeDir = malloc (sizeof (char) * 2);
++strcpy(homeDir, /);
++  }
+   cfgDir = malloc (sizeof (char) * (strlen (homeDir) + strlen (CONFDIR) + 2));
+   sprintf (cfgDir, %s/ CONFDIR, homeDir);
+   if (access (cfgDir, F_OK)  0)

Modified: packages/trunk/gnujump/debian/patches/series
===
--- packages/trunk/gnujump/debian/patches/series2013-06-27 06:10:20 UTC 
(rev 14341)
+++ packages/trunk/gnujump/debian/patches/series2013-06-27 06:27:19 UTC 
(rev 14342)
@@ -4,3 +4,4 @@
 04_linker_arguments.patch
 05_full_build.patch
 06_link_against_-lm_.patch
+07_getenv_NULL.patch


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


r14343 - packages/trunk/gnujump/debian

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:29:01 + (Thu, 27 Jun 2013)
New Revision: 14343

Modified:
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/control
Log:
Update my email address



Modified: packages/trunk/gnujump/debian/changelog
===
--- packages/trunk/gnujump/debian/changelog 2013-06-27 06:27:19 UTC (rev 
14342)
+++ packages/trunk/gnujump/debian/changelog 2013-06-27 06:29:01 UTC (rev 
14343)
@@ -6,6 +6,7 @@
   * fix a crash when $HOME is not set
 Thanks: Alexandre Rebert alexan...@cmu.edu and the whole
 The Mayhem Team at Cylab, Carnegie Mellon University
+  * Update my email address.
 
  -- Evgeni Golov evg...@debian.org  Thu, 27 Jun 2013 08:07:45 +0200
 

Modified: packages/trunk/gnujump/debian/control
===
--- packages/trunk/gnujump/debian/control   2013-06-27 06:27:19 UTC (rev 
14342)
+++ packages/trunk/gnujump/debian/control   2013-06-27 06:29:01 UTC (rev 
14343)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Group pkg-games-de...@lists.alioth.debian.org
-Uploaders: Bas Wijnen wij...@debian.org, Evgeni Golov sarge...@die-welt.net
+Uploaders: Bas Wijnen wij...@debian.org, Evgeni Golov evg...@debian.org
 Build-Depends: debhelper (= 8), libsdl1.2-dev, libsdl-image1.2-dev,
  libsdl-mixer1.2-dev, automake, libtool, imagemagick
 Homepage: http://gnujump.es.gnu.org/


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


r14344 - packages/trunk/gnujump/debian

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:30:35 + (Thu, 27 Jun 2013)
New Revision: 14344

Modified:
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/control
Log:
Use canonical URLs for the SVN repository


Modified: packages/trunk/gnujump/debian/changelog
===
--- packages/trunk/gnujump/debian/changelog 2013-06-27 06:29:01 UTC (rev 
14343)
+++ packages/trunk/gnujump/debian/changelog 2013-06-27 06:30:35 UTC (rev 
14344)
@@ -7,6 +7,7 @@
 Thanks: Alexandre Rebert alexan...@cmu.edu and the whole
 The Mayhem Team at Cylab, Carnegie Mellon University
   * Update my email address.
+  * Use canonical URLs for the SVN repository.
 
  -- Evgeni Golov evg...@debian.org  Thu, 27 Jun 2013 08:07:45 +0200
 

Modified: packages/trunk/gnujump/debian/control
===
--- packages/trunk/gnujump/debian/control   2013-06-27 06:29:01 UTC (rev 
14343)
+++ packages/trunk/gnujump/debian/control   2013-06-27 06:30:35 UTC (rev 
14344)
@@ -6,8 +6,8 @@
 Build-Depends: debhelper (= 8), libsdl1.2-dev, libsdl-image1.2-dev,
  libsdl-mixer1.2-dev, automake, libtool, imagemagick
 Homepage: http://gnujump.es.gnu.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gnujump/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gnujump/
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/gnujump/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/gnujump/
 Standards-Version: 3.9.2
 
 Package: gnujump


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


r14345 - packages/trunk/gnujump/debian/patches

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:32:09 + (Thu, 27 Jun 2013)
New Revision: 14345

Modified:
   packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch
Log:
add patch header


Modified: packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch
===
--- packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch  2013-06-27 
06:30:35 UTC (rev 14344)
+++ packages/trunk/gnujump/debian/patches/07_getenv_NULL.patch  2013-06-27 
06:32:09 UTC (rev 14345)
@@ -1,3 +1,7 @@
+From: Evgeni Golov evg...@debian.org
+Subject: fix crash when HOME is unset and getenv() returns NULL
+Last-Update: 2013-06-26
+
 Index: gnujump-1.0.6/src/main.c
 ===
 --- gnujump-1.0.6.orig/src/main.c  2013-06-26 21:14:47.0 +0200


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


r14346 - packages/trunk/gnujump/debian

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:35:45 + (Thu, 27 Jun 2013)
New Revision: 14346

Modified:
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/compat
   packages/trunk/gnujump/debian/control
Log:
Use debhelper 9 and get hardening for free


Modified: packages/trunk/gnujump/debian/changelog
===
--- packages/trunk/gnujump/debian/changelog 2013-06-27 06:32:09 UTC (rev 
14345)
+++ packages/trunk/gnujump/debian/changelog 2013-06-27 06:35:45 UTC (rev 
14346)
@@ -8,6 +8,7 @@
 The Mayhem Team at Cylab, Carnegie Mellon University
   * Update my email address.
   * Use canonical URLs for the SVN repository.
+  * Use debhelper 9 and get hardening for free.
 
  -- Evgeni Golov evg...@debian.org  Thu, 27 Jun 2013 08:07:45 +0200
 

Modified: packages/trunk/gnujump/debian/compat
===
--- packages/trunk/gnujump/debian/compat2013-06-27 06:32:09 UTC (rev 
14345)
+++ packages/trunk/gnujump/debian/compat2013-06-27 06:35:45 UTC (rev 
14346)
@@ -1 +1 @@
-8
+9

Modified: packages/trunk/gnujump/debian/control
===
--- packages/trunk/gnujump/debian/control   2013-06-27 06:32:09 UTC (rev 
14345)
+++ packages/trunk/gnujump/debian/control   2013-06-27 06:35:45 UTC (rev 
14346)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Group pkg-games-de...@lists.alioth.debian.org
 Uploaders: Bas Wijnen wij...@debian.org, Evgeni Golov evg...@debian.org
-Build-Depends: debhelper (= 8), libsdl1.2-dev, libsdl-image1.2-dev,
+Build-Depends: debhelper (= 9), libsdl1.2-dev, libsdl-image1.2-dev,
  libsdl-mixer1.2-dev, automake, libtool, imagemagick
 Homepage: http://gnujump.es.gnu.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/gnujump/


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


r14347 - packages/trunk/gnujump/debian

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:44:42 + (Thu, 27 Jun 2013)
New Revision: 14347

Modified:
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/copyright
Log:
Update debian/copyright to follow copyright-format/1.0


Modified: packages/trunk/gnujump/debian/changelog
===
--- packages/trunk/gnujump/debian/changelog 2013-06-27 06:35:45 UTC (rev 
14346)
+++ packages/trunk/gnujump/debian/changelog 2013-06-27 06:44:42 UTC (rev 
14347)
@@ -9,6 +9,7 @@
   * Update my email address.
   * Use canonical URLs for the SVN repository.
   * Use debhelper 9 and get hardening for free.
+  * Update debian/copyright to follow copyright-format/1.0.
 
  -- Evgeni Golov evg...@debian.org  Thu, 27 Jun 2013 08:07:45 +0200
 

Modified: packages/trunk/gnujump/debian/copyright
===
--- packages/trunk/gnujump/debian/copyright 2013-06-27 06:35:45 UTC (rev 
14346)
+++ packages/trunk/gnujump/debian/copyright 2013-06-27 06:44:42 UTC (rev 
14347)
@@ -1,38 +1,41 @@
-Format-Specification:
-http://wiki.debian.org/Proposals/CopyrightFormat?action=recallrev=228
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GNUjump
-Upstream-Maintainer: Juan Pedro Bolívar Puente magnic...@gmail.com
-Upstream-Source: http://www.gnu.org/software/gnujump/
+Upstream-Contact: Juan Pedro Bolívar Puente magnic...@gmail.com
+Source: http://www.gnu.org/software/gnujump/
 
 Files: *
-Copyright: © 2005-2008 Juan Pedro Bolívar Puente magnic...@gmail.com
-Licence: GPL-3+
+Copyright: 2005-2008 Juan Pedro Bolívar Puente magnic...@gmail.com
+License: GPL-3+
 
 Files: src/gettext.h
-Copyright: © 1995-2006 Free Software Foundation, Inc
-Licence: LGPL-2+
+Copyright: 1995-2006 Free Software Foundation, Inc
+License: LGPL-2+
 
 Files: src/SDL_rotozoom.[ch]
-Copyright: © 2001 A. Schiffler aschiff...@sympatico.ca
-2004-2008 Juan Pedro Bolívar Puente magnic...@gmail.com
-Licence: LGPL-2.1
+Copyright: 2001 A. Schiffler aschiff...@sympatico.ca
+   2004-2008 Juan Pedro Bolívar Puente magnic...@gmail.com
+License: LGPL-2.1
 
 Files: src/SFont.[ch]
-Copyright: © 2003 Karl Bartel ka...@gmx.net
-Licence: GPL-2+
+Copyright: 2003 Karl Bartel ka...@gmx.net
+License: GPL-2+
 
 Files: debian/*
-Copyright: © 2006-2011 Bas Wijnen wij...@debian.org
-Copyright: © 2008 Evgeni Golov sarge...@die-welt.net
-Licence: GPL-3+
+Copyright: 2006-2012 Bas Wijnen wij...@debian.org
+   2008-2013 Evgeni Golov evg...@debian.org
+License: GPL-3+
 
-License: GPL-2+ | GPL-3+
- On Debian systems, the latest version of the GPL can be found in
- /usr/share/common-licenses/GPL.
+License: GPL-2+
+ On Debian systems, version 2 of the GPL can be found in
+ /usr/share/common-licenses/GPL-2.
 
+License: GPL-3+
+ On Debian systems, version 3 of the GPL can be found in
+ /usr/share/common-licenses/GPL-3.
+
 License: LGPL-2+
- On Debian systems, the latest version of the LGPL can be found in
- /usr/share/common-licenses/LGPL.
+ On Debian systems, version 2 of the LGPL can be found in
+ /usr/share/common-licenses/LGPL-2.
 
 License: LGPL-2.1
  On Debian systems, version 2.1 of the LGPL can be found in


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

r14348 - packages/trunk/gnujump/debian

2013-06-27 Thread Evgeni Golov
Author: evgeni
Date: 2013-06-27 06:45:12 + (Thu, 27 Jun 2013)
New Revision: 14348

Modified:
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/control
Log:
Standards-Version: 3.9.4



Modified: packages/trunk/gnujump/debian/changelog
===
--- packages/trunk/gnujump/debian/changelog 2013-06-27 06:44:42 UTC (rev 
14347)
+++ packages/trunk/gnujump/debian/changelog 2013-06-27 06:45:12 UTC (rev 
14348)
@@ -10,6 +10,7 @@
   * Use canonical URLs for the SVN repository.
   * Use debhelper 9 and get hardening for free.
   * Update debian/copyright to follow copyright-format/1.0.
+  * Standards-Version: 3.9.4.
 
  -- Evgeni Golov evg...@debian.org  Thu, 27 Jun 2013 08:07:45 +0200
 

Modified: packages/trunk/gnujump/debian/control
===
--- packages/trunk/gnujump/debian/control   2013-06-27 06:44:42 UTC (rev 
14347)
+++ packages/trunk/gnujump/debian/control   2013-06-27 06:45:12 UTC (rev 
14348)
@@ -8,7 +8,7 @@
 Homepage: http://gnujump.es.gnu.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/gnujump/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/gnujump/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 
 Package: gnujump
 Architecture: any


___
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] Worms style game branch, master, updated. debian/0.9.19.3-1-1-g09f5a68

2013-06-27 Thread Gianfranco Costamagna
The following commit has been merged in the master branch:
commit 09f5a68e54adcf0c37647aa2832d46e72df88096
Author: Gianfranco Costamagna costamagnagianfra...@yahoo.it
Date:   Wed Jun 12 19:38:20 2013 +0200

Simplified debian/rules and changed libpng12-dev to libpng-dev

diff --git a/debian/changelog b/debian/changelog
index b7f52ae..1075f43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hedgewars (0.9.19.3-2) UNRELEASED; urgency=low
+
+  * Simplified debian/rules, no linking of libgcc_s.so.1
+needed anymore
+  * Changed build-dep libpng12-dev to libpng-dev.
+
+ -- Gianfranco Costamagna costamagnagianfra...@yahoo.it  Thu, 27 Jun 2013 
15:59:59 +0200
+
 hedgewars (0.9.19.3-1) unstable; urgency=low
 
   * New upstream tarball.
diff --git a/debian/control b/debian/control
index 2421fc6..1d37990 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (= 9), cmake, cdbs, dpkg-dev (= 
1.16.1~),
  imagemagick,
  libghc-bytestring-show-dev,
  fpc,
- libpng12-dev,
+ libpng-dev,
  libavcodec-dev,
  libavformat-dev,
  freeglut3-dev,
diff --git a/debian/rules b/debian/rules
index bd00305..1c5e6b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,22 +2,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-#Helping libc = 2.17, see launchpad bug #1179850
-TYPE_FLAGS = -DFPFLAGS=-k/lib/$(DEB_HOST_MULTIARCH)/libgcc_s.so.1
-
 DEB_CMAKE_INSTALL_PREFIX := /usr/lib/hedgewars
 DEB_CMAKE_EXTRA_FLAGS  := -DNOSERVER=0 \
-   -DDATA_INSTALL_DIR=/usr/share/games/hedgewars $(TYPE_FLAGS)
-
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog \
-   |grep ^Version|awk '{print $$2}'|sed 's/-[[:digit:]]\+$$//' \
-)
+   -DDATA_INSTALL_DIR=/usr/share/games/hedgewars
 
 clean::
rm -fr tmp-icon stamp-icon
@@ -34,11 +21,3 @@ stamp-icon:
mkdir -p tmp-icon/$$dirname/apps; \
convert $$icon tmp-icon/$$dirname/apps/$$basename.png; \
done
-
-tarball:
-   cd ..  \
-   tar --exclude=debian \
-   --exclude=.git \
-   -czf hedgewars_$(UPSTREAM_VERSION).orig.tar.gz \
-   hedgewars-$(UPSTREAM_VERSION)
-

-- 
Worms style game

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


r14349 - in packages/trunk/gimp-dds/debian: . patches

2013-06-27 Thread Vincent Fourmond
Author: fourmond
Date: 2013-06-27 22:19:36 + (Thu, 27 Jun 2013)
New Revision: 14349

Modified:
   packages/trunk/gimp-dds/debian/changelog
   packages/trunk/gimp-dds/debian/control
   packages/trunk/gimp-dds/debian/patches/makefile.diff
   packages/trunk/gimp-dds/debian/rules
Log:
[gimp-dds] new upstream version

Modified: packages/trunk/gimp-dds/debian/changelog
===
--- packages/trunk/gimp-dds/debian/changelog2013-06-27 06:45:12 UTC (rev 
14348)
+++ packages/trunk/gimp-dds/debian/changelog2013-06-27 22:19:36 UTC (rev 
14349)
@@ -1,3 +1,14 @@
+gimp-dds (2.2.1-1) unstable; urgency=low
+
+  * New upstream release, which fixes a FTBS (closes: #713553)
+  * Fix small typo in package description, thanks to Erik Esterer
+erik.este...@gmail.com (closes: #626917)
+  * Switch to dh debian/rules
+  * Refresh the patch on upstream makefile to make sure that debian global 
+flags are used
+
+ -- Vincent Fourmond fourm...@debian.org  Fri, 28 Jun 2013 00:15:15 +0200
+
 gimp-dds (2.0.9-3) unstable; urgency=low
 
   * Update to the new home for gimp-dds

Modified: packages/trunk/gimp-dds/debian/control
===
--- packages/trunk/gimp-dds/debian/control  2013-06-27 06:45:12 UTC (rev 
14348)
+++ packages/trunk/gimp-dds/debian/control  2013-06-27 22:19:36 UTC (rev 
14349)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Vincent Fourmond fourm...@debian.org
-Build-Depends: debhelper (= 5), libgimp2.0-dev (=2.6), pkg-config,
+Build-Depends: debhelper (= 8), libgimp2.0-dev (=2.6), pkg-config,
  libgtk2.0-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.4
 Homepage: http://code.google.com/p/gimp-dds/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gimp-dds
 Vcs-Browser: 
http://svn.debian.org/wsvn/pkg-games/packages/trunk/gimp-dds/?op=log
@@ -13,7 +13,7 @@
 Package: gimp-dds
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: DDS (DirectDraw Surface) plugin for the gimp
- gimp-dds is a plugin for the gimp that lets you manipulate Microsoft
+Description: DDS (DirectDraw Surface) plugin for GIMP
+ gimp-dds is a plugin for GIMP that lets you manipulate Microsoft
  DirectDraw surfaces. These kind of files are widely used in 3D games for
  textures and the like.

Modified: packages/trunk/gimp-dds/debian/patches/makefile.diff
===
--- packages/trunk/gimp-dds/debian/patches/makefile.diff2013-06-27 
06:45:12 UTC (rev 14348)
+++ packages/trunk/gimp-dds/debian/patches/makefile.diff2013-06-27 
22:19:36 UTC (rev 14349)
@@ -1,16 +1,25 @@
 Add the --as-needed flag to take down the number of libraries linked
 against this package
 
-Index: gimp-dds-2.0.7/Makefile.linux
+Index: gimp-dds-2.2.1/Makefile
 ===
 gimp-dds-2.0.7.orig/Makefile.linux 2008-12-10 19:07:18.0 +0100
-+++ gimp-dds-2.0.7/Makefile.linux  2010-02-16 00:39:50.128690353 +0100
-@@ -4,7 +4,7 @@
+--- gimp-dds-2.2.1.orig/Makefile   2012-07-26 09:25:36.0 +0200
 gimp-dds-2.2.1/Makefile2013-06-28 00:15:00.137132290 +0200
+@@ -2,7 +2,7 @@
+ GIMPTOOL=gimptool-2.0
+ 
  CC=gcc
- CFLAGS=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0)
- LD=gcc
--LDFLAGS=
-+LDFLAGS=-Wl,--as-needed
+-CFLAGS=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0)
++CFLAGS+=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0)
  
- TARGET=dds
+ OS=$(shell uname -s)
+ ifeq (,$(findstring Windows,$(OS)))
+@@ -11,6 +11,8 @@
+ EXT=.exe
+ endif
  
++LDFLAGS+=-Wl,--as-needed
++
+ TARGET=dds$(EXT)
+ 
+ SRCS=color.c dds.c ddsread.c ddswrite.c dxt.c mipmap.c misc.c

Modified: packages/trunk/gimp-dds/debian/rules
===
--- packages/trunk/gimp-dds/debian/rules2013-06-27 06:45:12 UTC (rev 
14348)
+++ packages/trunk/gimp-dds/debian/rules2013-06-27 22:19:36 UTC (rev 
14349)
@@ -1,62 +1,5 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+   dh $@
 
-# We use the Makefile.linux as else it defaults to using the win32 one
-# on freebsd.
-MAKEFILE = -f Makefile.linux
-
-configure: configure-stamp
-
-configure-stamp:
-#  QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-   touch $@
-
-build: build-stamp
-
-build-stamp: configure-stamp
-   dh_testdir
-   $(MAKE) 

r14350 - in packages/tags/gimp-dds: . 2.2.1-1/debian 2.2.1-1/debian/patches

2013-06-27 Thread Vincent Fourmond
Author: fourmond
Date: 2013-06-27 22:20:15 + (Thu, 27 Jun 2013)
New Revision: 14350

Added:
   packages/tags/gimp-dds/2.2.1-1/
   packages/tags/gimp-dds/2.2.1-1/debian/changelog
   packages/tags/gimp-dds/2.2.1-1/debian/control
   packages/tags/gimp-dds/2.2.1-1/debian/patches/makefile.diff
   packages/tags/gimp-dds/2.2.1-1/debian/rules
Removed:
   packages/tags/gimp-dds/2.2.1-1/debian/changelog
   packages/tags/gimp-dds/2.2.1-1/debian/control
   packages/tags/gimp-dds/2.2.1-1/debian/patches/makefile.diff
   packages/tags/gimp-dds/2.2.1-1/debian/rules
Log:
[svn-buildpackage] Tagging gimp-dds 2.2.1-1

Deleted: packages/tags/gimp-dds/2.2.1-1/debian/changelog
===
--- packages/trunk/gimp-dds/debian/changelog2013-06-27 06:45:12 UTC (rev 
14348)
+++ packages/tags/gimp-dds/2.2.1-1/debian/changelog 2013-06-27 22:20:15 UTC 
(rev 14350)
@@ -1,61 +0,0 @@
-gimp-dds (2.0.9-3) unstable; urgency=low
-
-  * Update to the new home for gimp-dds
-  * Added a watchfile now it is possible
-  * Already conforms to standards 3.9.0
-
- -- Vincent Fourmond fourm...@debian.org  Sun, 18 Jul 2010 23:30:51 +0200
-
-gimp-dds (2.0.9-2) unstable; urgency=low
-
-  * Modify debian/rules to use Makefile.linux on all arches, to avoid
-FTBSes on the non-linux arches (closes: 573773)
-
- -- Vincent Fourmond fourm...@debian.org  Sun, 14 Mar 2010 01:46:45 +0100
-
-gimp-dds (2.0.9-1) unstable; urgency=low
-
-  * Drop dependency on quilt, unneeded for 3.0 (quilt)
-  * New upstream release:
-- fix the off-by-one mistake in mipmap generation (closes: #564111,
-#564113). Thanks to Michalis Kamburelis for spotting and Shawn Kirst
-for fixing !
-
- -- Vincent Fourmond fourm...@debian.org  Thu, 11 Mar 2010 20:25:24 +0100
-
-gimp-dds (2.0.7-2) unstable; urgency=medium
-
-  * Converted to source format 3.0 (quilt)
-  * Refreshed makefile.diff
-  * Removed debian/README.source, obsoleted by the use of format 3.0 (quilt)
-  * Add build-depend on libgtk2.0-dev, now necessary (closes: #569383)
-  * Urgency medium to fix RC bug in testing
-  * Conforms to standards 3.8.4
-
- -- Vincent Fourmond fourm...@debian.org  Tue, 16 Feb 2010 00:47:59 +0100
-
-gimp-dds (2.0.7-1) unstable; urgency=low
-
-  * New upstream release.
-  * Build-depends on gimp 2.6 development files
-  * Add a debian/README.source file to document the patching system.
-  * Now conforms to standards 3.8.1
-
- -- Vincent Fourmond fourm...@debian.org  Tue, 05 May 2009 20:43:12 +0200
-
-gimp-dds (2.0.6-1) unstable; urgency=low
-
-  * New upstream release (closes: #488083)
-  * Adding provided PDF documentation
-
- -- Vincent Fourmond fourm...@debian.org  Fri, 27 Jun 2008 23:35:29 +0200
-
-gimp-dds (2.0.3-1) unstable; urgency=low
-
-  * Initial release (Closes: #476189)
-  * No watch file, as it does not seem easy to guess the upstream
-version number from the download link (well, impossible, that is)
-  * makefile.diff to pass the -Wl,--as-needed flag to gcc to drastically
-reduce the number of dependencies
-
- -- Vincent Fourmond fourm...@debian.org  Thu, 17 Apr 2008 21:22:59 +0200

Copied: packages/tags/gimp-dds/2.2.1-1/debian/changelog (from rev 14349, 
packages/trunk/gimp-dds/debian/changelog)
===
--- packages/tags/gimp-dds/2.2.1-1/debian/changelog 
(rev 0)
+++ packages/tags/gimp-dds/2.2.1-1/debian/changelog 2013-06-27 22:20:15 UTC 
(rev 14350)
@@ -0,0 +1,72 @@
+gimp-dds (2.2.1-1) unstable; urgency=low
+
+  * New upstream release, which fixes a FTBS (closes: #713553)
+  * Fix small typo in package description, thanks to Erik Esterer
+erik.este...@gmail.com (closes: #626917)
+  * Switch to dh debian/rules
+  * Refresh the patch on upstream makefile to make sure that debian global 
+flags are used
+
+ -- Vincent Fourmond fourm...@debian.org  Fri, 28 Jun 2013 00:15:15 +0200
+
+gimp-dds (2.0.9-3) unstable; urgency=low
+
+  * Update to the new home for gimp-dds
+  * Added a watchfile now it is possible
+  * Already conforms to standards 3.9.0
+
+ -- Vincent Fourmond fourm...@debian.org  Sun, 18 Jul 2010 23:30:51 +0200
+
+gimp-dds (2.0.9-2) unstable; urgency=low
+
+  * Modify debian/rules to use Makefile.linux on all arches, to avoid
+FTBSes on the non-linux arches (closes: 573773)
+
+ -- Vincent Fourmond fourm...@debian.org  Sun, 14 Mar 2010 01:46:45 +0100
+
+gimp-dds (2.0.9-1) unstable; urgency=low
+
+  * Drop dependency on quilt, unneeded for 3.0 (quilt)
+  * New upstream release:
+- fix the off-by-one mistake in mipmap generation (closes: #564111,
+#564113). Thanks to Michalis Kamburelis for spotting and Shawn Kirst
+for fixing !
+
+ -- Vincent Fourmond fourm...@debian.org  Thu, 11 Mar 2010 20:25:24 +0100
+
+gimp-dds (2.0.7-2) unstable; urgency=medium
+
+  * Converted to source format 3.0 (quilt)
+  * Refreshed makefile.diff
+  * Removed debian/README.source, obsoleted by the use 

r14351 - in packages/trunk/kanatest/debian: . patches source

2013-06-27 Thread Barry deFreese
Author: bdefreese
Date: 2013-06-28 02:48:19 + (Fri, 28 Jun 2013)
New Revision: 14351

Added:
   packages/trunk/kanatest/debian/kanatest.docs
   packages/trunk/kanatest/debian/kanatest.install
   packages/trunk/kanatest/debian/kanatest.manpages
   packages/trunk/kanatest/debian/patches/004_enable_deprecated.patch
Modified:
   packages/trunk/kanatest/debian/changelog
   packages/trunk/kanatest/debian/compat
   packages/trunk/kanatest/debian/control
   packages/trunk/kanatest/debian/patches/series
   packages/trunk/kanatest/debian/source/format
Log:
Update to dh 9. Patch to enable deprecated GTK. Move to dh style rules.

Modified: packages/trunk/kanatest/debian/changelog
===
--- packages/trunk/kanatest/debian/changelog2013-06-27 22:20:15 UTC (rev 
14350)
+++ packages/trunk/kanatest/debian/changelog2013-06-28 02:48:19 UTC (rev 
14351)
@@ -1,8 +1,12 @@
 kanatest (0.4.8-3) UNRELEASED; urgency=low
 
+  * Add patch to drop GTK_DISABLE_DEPRECATED. (Closes: #634350).
++ Thanks to Colin Watson for the patch.
+  * Update 003_gtk_ftbfs_fix.patch to fix string format error.
   * Move to source format 3.0 (quilt).
 + Drop build-dep on quilt.
   * Update to dh style rules.
++ Bump debhelper build-dep and compat to 9.
   * Update VCS tags.
   * Bump Standards Version to 3.9.4.
 

Modified: packages/trunk/kanatest/debian/compat
===
--- packages/trunk/kanatest/debian/compat   2013-06-27 22:20:15 UTC (rev 
14350)
+++ packages/trunk/kanatest/debian/compat   2013-06-28 02:48:19 UTC (rev 
14351)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/kanatest/debian/control
===
--- packages/trunk/kanatest/debian/control  2013-06-27 22:20:15 UTC (rev 
14350)
+++ packages/trunk/kanatest/debian/control  2013-06-28 02:48:19 UTC (rev 
14351)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sam Hocevar s...@debian.org, Barry deFreese 
bdefre...@debian.org,
  Evgeni Golov evg...@debian.org
-Build-Depends: debhelper (= 5.0), quilt, libgtk2.0-dev (= 2.0), libxml2-dev, 
gettext, autotools-dev
+Build-Depends: debhelper (= 9), libgtk2.0-dev (= 2.0), libxml2-dev, gettext, 
autotools-dev
 Standards-Version: 3.9.4
 Homepage: http://clayo.org/kanatest/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/kanatest/

Added: packages/trunk/kanatest/debian/kanatest.docs
===
--- packages/trunk/kanatest/debian/kanatest.docs
(rev 0)
+++ packages/trunk/kanatest/debian/kanatest.docs2013-06-28 02:48:19 UTC 
(rev 14351)
@@ -0,0 +1 @@
+README

Added: packages/trunk/kanatest/debian/kanatest.install
===
--- packages/trunk/kanatest/debian/kanatest.install 
(rev 0)
+++ packages/trunk/kanatest/debian/kanatest.install 2013-06-28 02:48:19 UTC 
(rev 14351)
@@ -0,0 +1,2 @@
+debian/kanatest.xpm usr/share/pixmaps
+debian/kanatest.desktop usr/share/applications

Added: packages/trunk/kanatest/debian/kanatest.manpages
===
--- packages/trunk/kanatest/debian/kanatest.manpages
(rev 0)
+++ packages/trunk/kanatest/debian/kanatest.manpages2013-06-28 02:48:19 UTC 
(rev 14351)
@@ -0,0 +1 @@
+debian/kanatest.1

Added: packages/trunk/kanatest/debian/patches/004_enable_deprecated.patch
===
--- packages/trunk/kanatest/debian/patches/004_enable_deprecated.patch  
(rev 0)
+++ packages/trunk/kanatest/debian/patches/004_enable_deprecated.patch  
2013-06-28 02:48:19 UTC (rev 14351)
@@ -0,0 +1,31 @@
+Description: Drop -DGTK_DISABLE_DEPRECATED for now
+Author: Colin Watson cjwat...@ubuntu.com
+Bug-Debian: http://bugs.debian.org/632604
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/770736
+Forwarded: no
+Last-Update: 2011-09-12
+Index: kanatest-0.4.8/src/Makefile.am
+===
+--- kanatest-0.4.8.orig/src/Makefile.am2009-04-12 15:10:45.0 
-0400
 kanatest-0.4.8/src/Makefile.am 2013-06-27 12:20:22.0 -0400
+@@ -1,6 +1,6 @@
+ REVISION := $(shell if test -e .svn; then echo -DREV=\`LC_ALL=C svn info | 
sed -n '/^Rev/p'| sed -e 's/^Revision:\ //'`\; fi;)
+ AM_CPPFLAGS = -Wall -DLOCALEDIR=\$(datadir)/locale\ $(REVISION) \
+--DGDK_PIXBUF_DISABLE_DEPRECATED 
-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++-DGDK_PIXBUF_DISABLE_DEPRECATED 
-DGDK_DISABLE_DEPRECATED
+ bin_PROGRAMS = kanatest
+ kanatest_SOURCES = about.c about.h \
+  chart.c chart.h \
+Index: 

r14352 - packages/trunk/kanatest/debian

2013-06-27 Thread Barry deFreese
Author: bdefreese
Date: 2013-06-28 02:59:43 + (Fri, 28 Jun 2013)
New Revision: 14352

Modified:
   packages/trunk/kanatest/debian/changelog
Log:
Update to unstable for upload

Modified: packages/trunk/kanatest/debian/changelog
===
--- packages/trunk/kanatest/debian/changelog2013-06-28 02:48:19 UTC (rev 
14351)
+++ packages/trunk/kanatest/debian/changelog2013-06-28 02:59:43 UTC (rev 
14352)
@@ -1,4 +1,4 @@
-kanatest (0.4.8-3) UNRELEASED; urgency=low
+kanatest (0.4.8-3) unstable; urgency=low
 
   * Add patch to drop GTK_DISABLE_DEPRECATED. (Closes: #634350).
 + Thanks to Colin Watson for the patch.


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