makehuman: 1.0.0-1~getdeb2

  * Add missing files.
  * Remove dependency
  * Fix license
  * use build script

makehuman/changelog

@@ -1,3 +1,12 @@
+makehuman (1.0.0-1~getdeb2) precise; urgency=low
+
+  * Add missing files.
+  * Remove dependency
+  * Fix license
+  * use build script
+
+ -- Christoph Korn <christoph.korn@getdeb.net>  Sat, 22 Mar 2014 03:27:37 +0100
+
 makehuman (1.0.0-1~getdeb1) precise; urgency=low
 
   * New upstream version (LP: #1293106)

makehuman/control

@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: GetDeb Package Ninjas <package.ninjas@getdeb.net>
 XSBC-Original-Maintainer: Muammar El Khatib <muammar@debian.org>
 Build-Depends: debhelper (>= 9),
-               python-all-dev (>= 2.7.3~rc2)
+               python-all-dev (>= 2.7.3~rc2),
+               python-numpy
 XS-Python-Version: current
 Standards-Version: 3.9.3
 Homepage: http://www.makehuman.org/
@@ -19,7 +20,6 @@ Depends: ${misc:Depends},
          python-numpy,
          python-qt4-gl,
          makehuman-data (= ${source:Version})
-Recommends: aqsis
 Suggests: blender
 Description: Modelling of 3-Dimensional humanoid characters
  MakeHuman is a 3-Dimensional humanoid characters modelling software. Features

makehuman/copyright

@@ -19,8 +19,20 @@ License: LGPL
  Public License can be found in `/usr/share/common-licenses/LGPL'
 
 Files: *
-Copyright: 2001-2011, The MakeHuman Team
-License: GPL-3
+Copyright: 2001-2014, MakeHuman Team (makehuman.org)
+License: AGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+ .
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Files: debian/*
 Copyright:

makehuman/makehuman-data.install

@@ -1 +1 @@
-makehuman/data		usr/share/makehuman
+debian/tmp/makehuman/data		usr/share/makehuman

makehuman/makehuman.install

@@ -1,11 +1,11 @@
-makehuman/makehuman		usr/bin
-makehuman/apps			usr/share/makehuman
-makehuman/core			usr/share/makehuman
-makehuman/icons			usr/share/makehuman
-makehuman/lib			usr/share/makehuman
-makehuman/plugins		usr/share/makehuman
-makehuman/shared		usr/share/makehuman
-makehuman/makehuman.py		usr/share/makehuman
-blendertools			usr/share/makehuman
-debian/makehuman.svg		usr/share/pixmaps
-debian/makehuman.desktop	usr/share/applications
+debian/tmp/makehuman/makehuman		usr/bin
+debian/tmp/makehuman/apps		usr/share/makehuman
+debian/tmp/makehuman/core		usr/share/makehuman
+debian/tmp/makehuman/icons		usr/share/makehuman
+debian/tmp/makehuman/lib		usr/share/makehuman
+debian/tmp/makehuman/plugins		usr/share/makehuman
+debian/tmp/makehuman/shared		usr/share/makehuman
+debian/tmp/makehuman/makehuman.py	usr/share/makehuman
+debian/tmp/blendertools			usr/share/makehuman
+debian/makehuman.svg			usr/share/pixmaps
+debian/makehuman.desktop		usr/share/applications

makehuman/patches/build_config.patch

@@ -0,0 +1,10 @@
+# create build config file required by build_prepare.py
+Index: makehuman-1.0.0/buildscripts/build.conf
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ makehuman-1.0.0/buildscripts/build.conf	2014-03-22 00:42:44.048123810 +0100
+@@ -0,0 +1,4 @@
++[BuildPrepare]
++hgRev = 220:ca26a926e754
++isRelease = True
++skipHg = True

makehuman/patches/build_prepare.patch

@@ -0,0 +1,87 @@
+# do not check for root folder by .hg because we use a tarball
+# disable the subdir check. but giving the troubles it may be better to place all dirs in one subdir
+# do not rearrange the dirs. the install files handle it.
+# do not use hg for copying files. we may include too many files here though.
+# try not to copy the debian dir. excluding it does not seem to work.
+Index: makehuman-1.0.0/buildscripts/build_prepare.py
+===================================================================
+--- makehuman-1.0.0.orig/buildscripts/build_prepare.py	2014-03-10 10:31:36.000000000 +0100
++++ makehuman-1.0.0/buildscripts/build_prepare.py	2014-03-22 03:16:54.992044831 +0100
+@@ -30,7 +30,7 @@
+ HG_PATH = "hg"
+
+ # Filter of files from source folder to exclude (glob syntax)
+-EXCLUDES = ['.hgignore', '.hgeol', '*.target', '*.obj', '*.pyc', '*.pyd', 'maketarget-standalone', 'plugins/4_rendering_mitsuba', 'plugins/4_rendering_povray', 'plugins/4_rendering_aqsis.py', 'plugins/0_modeling_5_editing.py', 'plugins/0_modeling_8_random.py', 'plugins/3_libraries_animation.py', 'compile_*.py', 'build_prepare.py', 'download_assets.py', '*~', '*.bak', 'setup.nsi', 'clean*.sh', 'makehuman.sh', 'clean*.bat', 'makehuman/docs', 'makehuman/icons/*psd', 'makehuman/icons/*bmp', 'makehuman/icons/*ico', 'makehuman/icons/*icns', 'makehuman/icons/*xcf', 'makehuman/icons/makehuman.svg', 'makehuman.rc', '*_contents.txt', 'buildscripts']
++EXCLUDES = ['debian', '.hgignore', '.hgeol', '*.target', '*.obj', '*.pyc', '*.pyd', 'maketarget-standalone', 'plugins/4_rendering_mitsuba', 'plugins/4_rendering_povray', 'plugins/4_rendering_aqsis.py', 'plugins/0_modeling_5_editing.py', 'plugins/0_modeling_8_random.py', 'plugins/3_libraries_animation.py', 'compile_*.py', 'build_prepare.py', 'download_assets.py', '*~', '*.bak', 'setup.nsi', 'clean*.sh', 'makehuman.sh', 'clean*.bat', 'makehuman/docs', 'makehuman/icons/*psd', 'makehuman/icons/*bmp', 'makehuman/icons/*ico', 'makehuman/icons/*icns', 'makehuman/icons/*xcf', 'makehuman/icons/makehuman.svg', 'makehuman.rc', '*_contents.txt', 'buildscripts']
+ # Same as above, but applies to release mode only
+ EXCLUDES_RELEASE = ['testsuite']
+
+@@ -148,10 +148,10 @@
+
+     def export(self):
+         # Sanity checks
+-        if not os.path.isdir(self.sourceFile('.hg')):
++        if not os.path.isdir(self.sourceFile('buildscripts')):
+             raise RuntimeError("The export folder %s is not found, the source folder argument should be the root of the hg repository." % self.sourceFile('.hg'))
+-        if self.isSubPath(self.targetFile(), self.sourceFile()):
+-            raise RuntimeError("The export folder is a subfolder of the source folder, this is not allowed.")
++        #if self.isSubPath(self.targetFile(), self.sourceFile()):
++        #    raise RuntimeError("The export folder is a subfolder of the source folder, this is not allowed.")
+         if os.path.exists(self.targetFile()):
+             raise RuntimeError("An export folder called %s already exists" % self.targetFile())
+         if not os.path.exists(self.sourceFile()):
+@@ -248,14 +248,14 @@
+             print '\n'
+
+         # Re-arrange folders
+-        for f in os.listdir( self.targetFile() ):
+-            if f == REARRANGE_ROOT_FOLDER:
+-                continue
+-            path = self.targetFile(f)
+-            if os.path.isdir(path):
+-                # Move folder in new root folder
+-                print "Moving folder %s into new root %s" % (f, REARRANGE_ROOT_FOLDER)
+-                shutil.move(path, self.targetFile(os.path.join(REARRANGE_ROOT_FOLDER, f)))
++        #for f in os.listdir( self.targetFile() ):
++        #    if f == REARRANGE_ROOT_FOLDER:
++        #        continue
++        #    path = self.targetFile(f)
++        #    if os.path.isdir(path):
++        #        # Move folder in new root folder
++        #        print "Moving folder %s into new root %s" % (f, REARRANGE_ROOT_FOLDER)
++        #        shutil.move(path, self.targetFile(os.path.join(REARRANGE_ROOT_FOLDER, f)))
+         '''
+         # Move all contents of new root folder into dist root (overwrite if needed)
+         _fixOnFinish = []
+@@ -350,14 +350,16 @@
+
+     def exportHGFiles(self):
+         print "Exporting files from hg repo (hg archive)"
+-        excludes = self.getExcludes()
+-        exclarg = [item for pair in zip(len(excludes)*['--exclude'], excludes) for item in pair]
++        #excludes = self.getExcludes()
++        #exclarg = [item for pair in zip(len(excludes)*['--exclude'], excludes) for item in pair]
+
+-        try:
+-            self.runProcess( [HG_PATH, "archive"] + exclarg + [self.targetFile()])
+-        except Exception as e:
+-            print "An error happened attempting to run 'hg archive'. Is Mercurial (commandline-tools) installed?"
+-            raise e
++        for f in ["blendertools", "makehuman"]:
++            _recursive_cp(self.sourceFile(f), self.targetFile(f))
++        #try:
++        #    self.runProcess( [HG_PATH, "archive"] + exclarg + [self.targetFile()])
++        #except Exception as e:
++        #    print "An error happened attempting to run 'hg archive'. Is Mercurial (commandline-tools) installed?"
++        #    raise e
+
+         # Because the --excludes option does not appear to be working all too well (at least not with wildcards):
+         # Gather files
+@@ -382,6 +384,7 @@
+
+         # Copy them
+         for f in files:
++            if "debian" in f: continue
+             targetDir = os.path.dirname(self.targetFile(f))
+             if not os.path.isdir(targetDir):
+                 os.makedirs(targetDir)

makehuman/patches/series

@@ -1,2 +1,3 @@
 exe.patch
-version.patch
+build_config.patch
+build_prepare.patch

makehuman/rules

@@ -2,6 +2,9 @@
 %:
 	dh $@ --with python2
 
+override_dh_auto_install:
+	cd buildscripts ; python ./build_prepare.py --skiphg $(CURDIR) $(CURDIR)/debian/tmp
+
 override_dh_install:
 	dh_install
 	rm -f debian/makehuman/usr/share/makehuman/blendertools/copy2blender.bat