r36440 - in /packages/qtiplot/trunk/debian: build.conf changelog patches/01_build_system.diff patches/series rules

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Fri Apr 30 06:35:38 UTC 2010 

Author: gudjon-guest
Date: Fri Apr 30 06:35:20 2010
New Revision: 36440

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36440
Log:
Version 0.9.7.14-1 is ready for upload

Modified:
    packages/qtiplot/trunk/debian/build.conf
    packages/qtiplot/trunk/debian/changelog
    packages/qtiplot/trunk/debian/patches/01_build_system.diff
    packages/qtiplot/trunk/debian/patches/series
    packages/qtiplot/trunk/debian/rules

Modified: packages/qtiplot/trunk/debian/build.conf
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/build.conf?rev=36440&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/build.conf (original)
+++ packages/qtiplot/trunk/debian/build.conf Fri Apr 30 06:35:20 2010
@@ -59,6 +59,17 @@
 QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
 
 ##########################################################
+## QwtPlot3D - use local copy till upstream catches up
+# http://qwtplot3d.sourceforge.net/
+##########################################################
+
+# include path.
+QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
+# link locally against a copy in 3rdparty/
+win32:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/qwtplot3d.dll
+unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+
+##########################################################
 ## libpng - optional. you don't have to set these variables
 ##########################################################
 

Modified: packages/qtiplot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/changelog?rev=36440&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/changelog (original)
+++ packages/qtiplot/trunk/debian/changelog Fri Apr 30 06:35:20 2010
@@ -1,3 +1,26 @@
+qtiplot (0.9.7.14-1) unstable; urgency=low
+
+  * New upstream release
+  * Build QTeXEngine into program
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Fri, 30 Apr 2010 08:33:40 +0200
+
+qtiplot (0.9.7.13-1) unstable; urgency=low
+
+  * New upstream release
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Minor fix to patch 01_build_system.diff
+  * Add qwtplot3d to build.conf
+  * Bump standards version to 3.8.4
+  * Fix spelling errors in description
+  * Add misc depends in qtiplot-doc
+  * Remove patch 02_docbook_stylesheet and
+    04_add_includes.diff
+  * Rename 03_fix_qti_wordlist.txt_path to
+    02_fix_paths.diff
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 28 Apr 2010 08:50:00 +0200
+
 qtiplot (0.9.7.10+r1453-1) unstable; urgency=low
 
   [ Gudjon I. Gudjonsson ]

Modified: packages/qtiplot/trunk/debian/patches/01_build_system.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/patches/01_build_system.diff?rev=36440&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/patches/01_build_system.diff (original)
+++ packages/qtiplot/trunk/debian/patches/01_build_system.diff Fri Apr 30 06:35:20 2010
@@ -1,20 +1,29 @@
-Changes the build system according to the Debian packages and
-fixes possible errors in the project files
+--- a/qtiplot.pro
++++ b/qtiplot.pro
+@@ -1,7 +1,5 @@
+ TEMPLATE = subdirs
+ 
+-SUBDIRS = fitPlugins \
+-	    manual \
+-	    3rdparty/qwt \
++SUBDIRS = 3rdparty/qwt \
+ 		3rdparty/qwtplot3d \
+         qtiplot
 --- a/qtiplot/qtiplot.pro
 +++ b/qtiplot/qtiplot.pro
-@@ -10,9 +10,7 @@
+@@ -9,8 +9,8 @@
+ #############################################################################
  
  # local copy included
- INCLUDEPATH       += ../3rdparty/qwtplot3d/include
 -INCLUDEPATH       += ../3rdparty/liborigin
 -INCLUDEPATH       += ../3rdparty/zlib
--INCLUDEPATH 	  += ../3rdparty/QTeXEngine/src
-+#INCLUDEPATH 	  += ../3rdparty/QTeXEngine/src
++#INCLUDEPATH       += ../3rdparty/liborigin
++#INCLUDEPATH       += ../3rdparty/zlib
+ INCLUDEPATH 	  += ../3rdparty/QTeXEngine/src
  
  # configurable
- INCLUDEPATH       += $$MUPARSER_INCLUDEPATH
-@@ -103,17 +101,16 @@
-                   translations/qtiplot_sv.qm
+@@ -109,17 +109,16 @@
+ 					translations/qtiplot_sv.qm
  
  isEmpty(LUPDATE): LUPDATE = lupdate
 -#system($$LUPDATE -verbose qtiplot.pro)
@@ -30,11 +39,11 @@
  
 -documentation.files += ../README.html \
 -                       ../gpl_licence.txt
-+documentation.files += ../README.html 
++documentation.files += ../README.html
  
  unix: man.files += ../qtiplot.1
  
-@@ -121,7 +118,7 @@
+@@ -127,7 +126,7 @@
  ##################### Compression (zlib-1.2.3) ################
  ###############################################################
  
@@ -43,16 +52,14 @@
  
  ###############################################################
  ################# Default Modules #############################
-@@ -158,18 +155,19 @@
+@@ -163,18 +162,18 @@
    				    qtiUtil.py \
    				    qti_wordlist.txt \
  
 -  	unix: pythonconfig.path = /usr/local/qtiplot
 +  	unix: pythonconfig.path = /usr/share/qtiplot
    	win32: pythonconfig.path = $$INSTALLBASE
--  	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
-+	PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
-+  	DEFINES += PYTHON_CONFIG_PATH
+   	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
    }
  
    unix {
@@ -60,7 +67,7 @@
 -    INCLUDEPATH += $$system($$PYTHON python-includepath.py)
 -    LIBS        += $$system($$PYTHON -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
 +    INCLUDEPATH += /usr/include/python2.5
-+    LIBS        += -lpython2.5 
++    LIBS        += -lpython2.5
      LIBS        += -lm
      system(mkdir -p $${SIP_DIR})
 -    system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
@@ -75,7 +82,7 @@
  ################# Origin Import (liborigin) ###################
  ###############################################################
 -INCLUDEPATH += src/origin/
-+INCLUDEPATH += src/origin/ /usr/include/liborigin2/
++INCLUDEPATH += src/origin/ /usr/include/liborigin2
  
  HEADERS += src/origin/importOPJ.h
 -HEADERS += ../3rdparty/liborigin/OriginObj.h
@@ -100,14 +107,3 @@
 +#SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
 +
 +LIBS += -lorigin2
---- a/qtiplot.pro
-+++ b/qtiplot.pro
-@@ -1,6 +1,5 @@
- TEMPLATE = subdirs
- 
--SUBDIRS = fitPlugins \
--	    manual \
--	    3rdparty/qwt \
-+SUBDIRS = 3rdparty/qwt \ 
-+          3rdparty/qwtplot3d \
-           qtiplot

Modified: packages/qtiplot/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/patches/series?rev=36440&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/patches/series (original)
+++ packages/qtiplot/trunk/debian/patches/series Fri Apr 30 06:35:20 2010
@@ -1,3 +1,2 @@
 01_build_system.diff
-03_fix_qti_wordlist.txt_path.diff
-#05_gcc44_fix.diff
+02_fix_paths.diff

Modified: packages/qtiplot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/rules?rev=36440&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/rules (original)
+++ packages/qtiplot/trunk/debian/rules Fri Apr 30 06:35:20 2010
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
-include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -18,7 +16,7 @@
 endif
 
 configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
+configure-stamp:
 	dh_testdir
 
 	/bin/gunzip -c /usr/share/doc/zlib1g-dev/examples/minigzip.c.gz > minigzip.c
@@ -50,12 +48,11 @@
 
 	touch $@
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
 
 	[ ! -f Makefile ] || $(MAKE) clean
 	find -type f -name 'Makefile' -exec rm -f {} \;
@@ -128,10 +125,11 @@
 get-orig-source:
 	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+~]+).*,\1,p'); \
 	uscan --force-download --rename --download-version=$$VER --destdir=. && (\
-	tar -xj --exclude 3rdparty/liborigin  --exclude 3rdparty/zlib 3rdparty/QTeXEngine/ -f qtiplot_$$VER.orig.tar.bz2 ; \
+	tar -xj --exclude 3rdparty/liborigin  --exclude 3rdparty/zlib -f qtiplot_$$VER.orig.tar.bz2 ; \
 	chmod -R o-w qtiplot-$$VER ; \
-	dos2unix `find qtiplot-$$VER -type f |grep -v .png`; \
+	fromdos `find qtiplot-$$VER -type f |grep -v .png`; \
 	find qtiplot-$$VER -type f -exec chmod a-x {} \; ;\
+	rm -f .gitignore ;\
 	tar -czf qtiplot_$$VER.orig.tar.gz qtiplot-$$VER; \
 	rm -rf qtiplot-$$VER; \
 	rm -f qtiplot_$$VER.orig.tar.bz2);

More information about the debian-science-commits mailing list