[deng] 03/06: release 1.15.2-1

Michael Gilbert mgilbert at moszumanska.debian.org
Sat Sep 5 23:29:14 UTC 2015 

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

mgilbert pushed a commit to branch master
in repository deng.

commit 4ee35caeff29b3303d127fdeb7d4e5984c3034f5
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Aug 30 00:20:18 2015 +0000

    release 1.15.2-1
---
 debian/changelog                                   |  9 +++
 debian/clean                                       |  3 +-
 debian/control                                     | 12 ++--
 debian/doomsday-common.lintian-overrides           |  2 +
 ...n-overrides => doomsday-data.lintian-overrides} |  0
 ...overrides => doomsday-server.lintian-overrides} |  0
 debian/doomsday.lintian-overrides                  |  2 +
 debian/patches/packs.patch                         | 65 ++++++++++++++++++++++
 debian/patches/paths.patch                         |  2 +-
 debian/patches/perms.patch                         | 13 +++++
 debian/patches/rpath.patch                         |  4 +-
 debian/patches/series                              |  4 +-
 12 files changed, 104 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b0b982..035b0e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+doomsday (1.15.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop support for armel and armhf.
+  * Output data pack files into the build directory.
+  * Use consistent permissions for files included in pack files.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Tue, 07 Jul 2015 14:41:15 +0000
+
 doomsday (1.15.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/clean b/debian/clean
index c6fab09..97f83e7 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,2 @@
 doomsday/*.pk3
-doomsday/*client*pack
-doomsday/*stdlib*pack
+doomsday/build/*.pack
diff --git a/debian/control b/debian/control
index 299b51b..dd593b8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,9 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Michael Gilbert <mgilbert at debian.org>
 Build-Depends:
  debhelper (>= 9),
+ python,
+ qt4-qmake,
+ zlib1g-dev,
  libassimp-dev,
  libqt4-dev,
  libqt4-opengl-dev,
@@ -15,16 +18,13 @@ Build-Depends:
  libxxf86vm-dev,
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
- python,
- qt4-qmake,
- zlib1g-dev,
 Standards-Version: 3.9.6
 Homepage: http://www.dengine.net
 Vcs-Git: git://anonscm.debian.org/pkg-games/deng.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/deng.git
 
 Package: doomsday
-Architecture: any
+Architecture: amd64 arm64 i386 mips mipsel powerpc ppc64el s390x alpha hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 m68k mips64el powerpcspe ppc64 sh4 sparc64 x32
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -47,7 +47,7 @@ Description: enhanced version of the legendary DOOM game
  your commercial IWADs using game-data-packager.
 
 Package: doomsday-server
-Architecture: any
+Architecture: amd64 arm64 i386 mips mipsel powerpc ppc64el s390x alpha hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 m68k mips64el powerpcspe ppc64 sh4 sparc64 x32
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -66,7 +66,7 @@ Description: enhanced version of the legendary DOOM game - server
  This package contains the dedicated server.
 
 Package: doomsday-common
-Architecture: any
+Architecture: amd64 arm64 i386 mips mipsel powerpc ppc64el s390x alpha hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 m68k mips64el powerpcspe ppc64 sh4 sparc64 x32
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/debian/doomsday-common.lintian-overrides b/debian/doomsday-common.lintian-overrides
index 1563ba5..fd6c324 100644
--- a/debian/doomsday-common.lintian-overrides
+++ b/debian/doomsday-common.lintian-overrides
@@ -1,3 +1,5 @@
+# no upstream changelog provided
+no-upstream-changelog
 # debhelper bug causes these
 postrm-has-useless-call-to-ldconfig
 postinst-has-useless-call-to-ldconfig
diff --git a/debian/source/lintian-overrides b/debian/doomsday-data.lintian-overrides
similarity index 100%
copy from debian/source/lintian-overrides
copy to debian/doomsday-data.lintian-overrides
diff --git a/debian/source/lintian-overrides b/debian/doomsday-server.lintian-overrides
similarity index 100%
rename from debian/source/lintian-overrides
rename to debian/doomsday-server.lintian-overrides
diff --git a/debian/doomsday.lintian-overrides b/debian/doomsday.lintian-overrides
index a63395c..bdcad54 100644
--- a/debian/doomsday.lintian-overrides
+++ b/debian/doomsday.lintian-overrides
@@ -1,2 +1,4 @@
+# no upstream changelog provided
+no-upstream-changelog
 # macros that are flagged work correctly
 manpage-has-errors-from-man
diff --git a/debian/patches/packs.patch b/debian/patches/packs.patch
new file mode 100644
index 0000000..081920d
--- /dev/null
+++ b/debian/patches/packs.patch
@@ -0,0 +1,65 @@
+description: output all packs into the build directory
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/doomsday/libcore/libcore.pro
++++ b/doomsday/libcore/libcore.pro
+@@ -198,7 +198,7 @@ macx {
+     doPostLink("cp -fRp libdeng_core*dylib ../client/Doomsday.app/Contents/Frameworks")
+ }
+ 
+-buildPackage(net.dengine.stdlib, $$OUT_PWD/..)
++buildPackage(net.dengine.stdlib, $$OUT_PWD/../build)
+ deployLibrary()
+ 
+ deng_sdk {
+--- a/doomsday/client/client.pro
++++ b/doomsday/client/client.pro
+@@ -813,7 +813,7 @@ OTHER_FILES += \
+ 
+ # Resources ------------------------------------------------------------------
+ 
+-buildPackage(net.dengine.client, $$OUT_PWD/..)
++buildPackage(net.dengine.client, $$OUT_PWD/../build)
+ 
+ data.files = $$OUT_PWD/../doomsday.pk3
+ 
+@@ -891,7 +891,7 @@ macx {
+ 
+ DENG_PACKAGES += net.dengine.client.pack
+ 
+-deployPackages($$DENG_PACKAGES, $$OUT_PWD/..)
++deployPackages($$DENG_PACKAGES, $$OUT_PWD/../build)
+ deployTarget()
+ 
+ !macx {
+--- a/doomsday/libdoomsday/libdoomsday.pro
++++ b/doomsday/libdoomsday/libdoomsday.pro
+@@ -157,7 +157,7 @@ win32: SOURCES += \
+ 
+ # Resources ------------------------------------------------------------------
+ 
+-buildPackage(../net.dengine.base, $$OUT_PWD/..)
++buildPackage(../net.dengine.base, $$OUT_PWD/../build)
+ 
+ # Installation ---------------------------------------------------------------
+ 
+--- a/doomsday/libgui/libgui.pro
++++ b/doomsday/libgui/libgui.pro
+@@ -235,5 +235,5 @@ macx {
+     linkBinaryToBundledAssimp(libdeng_gui.1.dylib, ..)
+ }
+ 
+-buildPackage(net.dengine.stdlib.gui, $$OUT_PWD/..)
++buildPackage(net.dengine.stdlib.gui, $$OUT_PWD/../build)
+ deployLibrary()
+--- a/doomsday/server/server.pro
++++ b/doomsday/server/server.pro
+@@ -434,7 +434,7 @@ macx {
+ 
+ deng_noclient {
+     # Packages are usually deployed by the client project.
+-    deployPackages($$DENG_PACKAGES, $$OUT_PWD/..)
++    deployPackages($$DENG_PACKAGES, $$OUT_PWD/../build)
+ }
+ deployTarget()
+ 
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index 0ee2207..959d4db 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -23,7 +23,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
  # When installing libraries to a non-standard location, instruct
  # the linker where to find them.
- !contains(DENG_LIB_DIR, ^/usr/.*): QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
+ QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
  
 -DENG_BASE_DIR = $$PREFIX/share/doomsday
 +DENG_BASE_DIR = $$PREFIX/share/games/doomsday
diff --git a/debian/patches/perms.patch b/debian/patches/perms.patch
new file mode 100644
index 0000000..12b638f
--- /dev/null
+++ b/debian/patches/perms.patch
@@ -0,0 +1,13 @@
+description: use consistent permissions for files in zip packs
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/doomsday/build/scripts/buildpackage.py
++++ b/doomsday/build/scripts/buildpackage.py
+@@ -59,6 +59,7 @@ class Package:
+         
+         # Write entries in alphabetical order.
+         for full, internal in sorted(contents):
++            os.chmod(full, 0644)
+             pack.write(full, internal)
+             
+         # Write it out.
diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch
index a591eac..73fd6b0 100644
--- a/debian/patches/rpath.patch
+++ b/debian/patches/rpath.patch
@@ -3,12 +3,12 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/doomsday/config_unix.pri
 +++ b/doomsday/config_unix.pri
-@@ -38,7 +38,7 @@ DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/plu
+@@ -41,7 +41,7 @@ DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/doo
  
  # When installing libraries to a non-standard location, instruct
  # the linker where to find them.
 -!contains(DENG_LIB_DIR, ^/usr/.*): QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
 +QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
  
- DENG_BASE_DIR = $$PREFIX/share/games/doomsday
+ DENG_BASE_DIR = $$PREFIX/share/doomsday
  DENG_DATA_DIR = $$DENG_BASE_DIR/data
diff --git a/debian/patches/series b/debian/patches/series
index 17c1726..5b58267 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
-paths.patch
 rpath.patch
+paths.patch
+perms.patch
+packs.patch
 
 manpages.patch
 spelling.patch

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

More information about the Pkg-games-commits mailing list