Author: tille
Date: 2011-04-10 21:03:04 +0000 (Sun, 10 Apr 2011)
New Revision: 6518

Added:
   trunk/packages/mgltools/utpackages/trunk/debian/patches/
   
trunk/packages/mgltools/utpackages/trunk/debian/patches/do_not_install_in_build.patch
   trunk/packages/mgltools/utpackages/trunk/debian/patches/series
   trunk/packages/mgltools/utpackages/trunk/debian/source/
   trunk/packages/mgltools/utpackages/trunk/debian/source/format
Removed:
   
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.postinst.debhelper
   
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.prerm.debhelper
   trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.substvars
   trunk/packages/mgltools/utpackages/trunk/debian/pycompat
Modified:
   trunk/packages/mgltools/utpackages/trunk/debian/changelog
   trunk/packages/mgltools/utpackages/trunk/debian/compat
   trunk/packages/mgltools/utpackages/trunk/debian/control
   trunk/packages/mgltools/utpackages/trunk/debian/rules
Log:
Remove useless debhelper files; apply patch from latest NMU as quilt patch; 
Build-Depends: freeglut3 (instead of glut3); dh_python2 instead of 
python-central; source format 3.0


Modified: trunk/packages/mgltools/utpackages/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/changelog   2011-04-10 
20:09:36 UTC (rev 6517)
+++ trunk/packages/mgltools/utpackages/trunk/debian/changelog   2011-04-10 
21:03:04 UTC (rev 6518)
@@ -1,3 +1,23 @@
+mgltools-utpackages (1.5.4.cvs.20100912-2) unstable; urgency=low
+
+  * debian/patches/do_not_install_in_build.patch: Do patch from NMU using
+    quilt
+  * debian/source/format: 3.0 (quilt)
+  * debian/control
+    - Standards-Version: 3.9.2 (no changes needed)
+    - Build-Depend: freeglut3-dev (instead of libglut3-dev)
+      Closes: #543698
+    - Build-Depends: python-all-dev (>= 2.6) (and dropped
+      python-central)
+    - Dropped Build-Depends cdbs
+    - Properly indentation of list in long description
+  * Debhelper 8.0 (control+contrib)
+  * debian/rules: switch to short dh syntax which makes
+    dh_python2 easy
+    Closes: #616903
+
+ -- Andreas Tille <[email protected]>  Sun, 10 Apr 2011 22:13:04 +0200
+
 mgltools-utpackages (1.5.4.cvs.20100912-1.1) unstable; urgency=low
 
   * Non-Maintainer Upload.  Closes: #605315.

Modified: trunk/packages/mgltools/utpackages/trunk/debian/compat
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/compat      2011-04-10 
20:09:36 UTC (rev 6517)
+++ trunk/packages/mgltools/utpackages/trunk/debian/compat      2011-04-10 
21:03:04 UTC (rev 6518)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/mgltools/utpackages/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/control     2011-04-10 
20:09:36 UTC (rev 6517)
+++ trunk/packages/mgltools/utpackages/trunk/debian/control     2011-04-10 
21:03:04 UTC (rev 6518)
@@ -6,8 +6,8 @@
 XS-Autobuild: yes
 Uploaders: Steffen Moeller <[email protected]>, Sargis Dallakyan 
<[email protected]>,
  Andreas Tille <[email protected]>
-Build-Depends: debhelper (>= 7), python-central (>= 0.5.6), cdbs (>= 0.4), 
python-all-dev (>= 2.5), swig, mesa-common-dev, libglu1-mesa-dev, libglut3-dev, 
python-numpy
-Standards-Version: 3.9.1.0
+Build-Depends: debhelper (>= 8), python-all-dev (>= 2.6), swig, 
mesa-common-dev, libglu1-mesa-dev, freeglut3-dev, python-numpy
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.5
 Vcs-Browser: 
http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/utpackages/trunk/?rev=0&sc=0
 Vcs-Svn: 
svn://svn.debian.org/svn/debian-med/trunk/packages/mgltools/utpackages/trunk/
@@ -25,7 +25,9 @@
  their docking of chemical compounds.
  .
  This distribution contains the following modules:
- - UTblurDIST(the blurring algorithm extracted  from  the PDB Blurring 
software);
- - UTisocontourDIST (the isocontouring library);
- - UTUTvolrendDIST  (volume rendering library);
- - UTmeshDIST (Level set Boundary Interior and Exterior Mesher - LBIEMesher).
+  - UTblurDIST(the blurring algorithm extracted  from  the PDB
+    Blurring software);
+  - UTisocontourDIST (the isocontouring library);
+  - UTUTvolrendDIST  (volume rendering library);
+  - UTmeshDIST (Level set Boundary Interior and Exterior Mesher -
+    LBIEMesher).

Deleted: 
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.postinst.debhelper
===================================================================
--- 
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.postinst.debhelper
   2011-04-10 20:09:36 UTC (rev 6517)
+++ 
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.postinst.debhelper
   2011-04-10 21:03:04 UTC (rev 6518)
@@ -1,5 +0,0 @@
-# Automatically added by dh_pycentral
-if which pycentral >/dev/null 2>&1; then
-       pycentral pkginstall mgltools-mslib
-fi
-# End automatically added section

Deleted: 
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.prerm.debhelper
===================================================================
--- 
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.prerm.debhelper  
    2011-04-10 20:09:36 UTC (rev 6517)
+++ 
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.prerm.debhelper  
    2011-04-10 21:03:04 UTC (rev 6518)
@@ -1,26 +0,0 @@
-# Automatically added by dh_pycentral
-if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
-       pycentral pkgremove mgltools-mslib
-else
-       flist=$(tempfile)
-       find /usr/share/pycentral/mgltools-mslib -depth -mindepth 2 \
-         \( -name '*.py' -printf 'p %P\n' -o -printf '%y %P\n' \) \
-         > $flist 2>/dev/null || true
-       if [ -s $flist ]; then
-           for d in /usr/lib/python[0-9].[0-9]; do
-               case "$d" in */python2.1|*/python2.2) continue; esac
-               while read t n; do
-                   case "$t" in
-                       p) rm -f $d/$n $d/${n}[co];;
-                       d) rmdir $d/$n 2>/dev/null || true;;
-                       *) rm -f $d/$n
-                   esac
-               done < $flist
-           done
-       fi
-       rm -f $flist
-       dpkg -L mgltools-mslib \
-            | awk '/\/usr\/share\/pycentral/ {next} /\.py$/ {print $0"c\n" 
$0"o"}' \
-           | xargs rm -f >&2
-fi
-# End automatically added section

Deleted: 
trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.substvars
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.substvars    
2011-04-10 20:09:36 UTC (rev 6517)
+++ trunk/packages/mgltools/utpackages/trunk/debian/mgltools-mslib.substvars    
2011-04-10 21:03:04 UTC (rev 6518)
@@ -1,3 +0,0 @@
-python:Versions=2.4
-python:Depends=python-central (>= 0.5.8), python (<< 2.5), python (>= 2.4)
-shlibs:Depends=libc6 (>= 2.7-1)

Added: 
trunk/packages/mgltools/utpackages/trunk/debian/patches/do_not_install_in_build.patch
===================================================================
--- 
trunk/packages/mgltools/utpackages/trunk/debian/patches/do_not_install_in_build.patch
                               (rev 0)
+++ 
trunk/packages/mgltools/utpackages/trunk/debian/patches/do_not_install_in_build.patch
       2011-04-10 21:03:04 UTC (rev 6518)
@@ -0,0 +1,31 @@
+Author: Tim Retout <[email protected]>
+Description: Do not install files in /build
+Closes: 592417
+
+--- mgltools-utpackages-1.5.4.cvs.20100912.orig/setup.py
++++ mgltools-utpackages-1.5.4.cvs.20100912/setup.py
+@@ -101,24 +101,7 @@
+ class modified_install(install):
+ 
+     def run(self):
+-        self.install_lib = self.install_platlib
+-        install_platlib =  path.abspath(self.install_platlib)
+-        install_purelib = install_platlib
+-        print  "install_platlib=", install_platlib
+-        print "install_purelib=", install_purelib
+         args = sys.argv
+-        bdist = 0
+-        for i, arg in enumerate(args[1:]):
+-            if string.find(arg, "--install-platlib") != -1:
+-                platlib_fl = 1
+-                args[i+1] = "--install-platlib="+install_platlib
+-            elif string.find(arg, "--install-purelib") != -1:
+-                purelib_fl = 1
+-                args[i+1] = "--install-purelib="+install_purelib
+-            elif string.find(arg, "bdist") != -1:
+-                bdist = 1
+-                args[i+1] = "install"
+-                args.append("--install-platlib="+install_platlib)
+         cmd = "%s"%sys.executable
+         for e in args:
+             cmd = cmd + " " + e

Added: trunk/packages/mgltools/utpackages/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/patches/series              
                (rev 0)
+++ trunk/packages/mgltools/utpackages/trunk/debian/patches/series      
2011-04-10 21:03:04 UTC (rev 6518)
@@ -0,0 +1 @@
+do_not_install_in_build.patch

Deleted: trunk/packages/mgltools/utpackages/trunk/debian/pycompat
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/pycompat    2011-04-10 
20:09:36 UTC (rev 6517)
+++ trunk/packages/mgltools/utpackages/trunk/debian/pycompat    2011-04-10 
21:03:04 UTC (rev 6518)
@@ -1 +0,0 @@
-2

Modified: trunk/packages/mgltools/utpackages/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/rules       2011-04-10 
20:09:36 UTC (rev 6517)
+++ trunk/packages/mgltools/utpackages/trunk/debian/rules       2011-04-10 
21:03:04 UTC (rev 6518)
@@ -1,22 +1,17 @@
 #!/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.
+# debian/rules for mgltools-utpackages
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_PYTHON_SYSTEM=pycentral
 export CFLAGS=-fpermissive
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+       dh $@ --with python2
 
-clean::
+override_dh_clean:
+       dh_clean
        rm -rf build build-stamp debian/Pmv
        find . -name *.o -o -name *.so | xargs -r rm
        find . -name "*.pdb" -exec chmod 644 {} \;

Added: trunk/packages/mgltools/utpackages/trunk/debian/source/format
===================================================================
--- trunk/packages/mgltools/utpackages/trunk/debian/source/format               
                (rev 0)
+++ trunk/packages/mgltools/utpackages/trunk/debian/source/format       
2011-04-10 21:03:04 UTC (rev 6518)
@@ -0,0 +1 @@
+3.0 (quilt)


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit

Reply via email to