The following commit has been merged in the cmake_migration branch:
commit 2a363fde86f461cd43c8788d79e33df8b7f1525d
Author: Anton Gladky <[email protected]>
Date: Thu Sep 20 21:19:37 2012 +0200
Remove old patches.
diff --git a/debian/patches/fix_FTBFS_on_KFreeBSD.patch
b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
deleted file mode 100644
index b8e7267..0000000
--- a/debian/patches/fix_FTBFS_on_KFreeBSD.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix FTBFS on KFreeBSD and hopefully on other platforms, where was
a problem with compiling qglviewer. Adding additional pathes for finding
necessary header-files.
-Author: Anton Gladky <[email protected]>
-Bug-Debian: http://bugs.debian.org/628376
-Last-Update: 2012-05-03
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -100,7 +100,7 @@
- ('chunkSize','Maximum files to compile in one translation unit when
building plugins. (unlimited if <= 0, per-file linkage is used if
1)',7,None,int),
- ('version','Yade version (if not specified, guess will be
attempted)',None),
- ('realVersion','Revision (usually bzr revision); guessed automatically
unless specified',None),
-- ('CPPPATH', 'Additional paths for the C preprocessor
(colon-separated)','/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/vtk-5.6:/usr/include/vtk-5.8:/usr/include/vtk'),
# hardy has vtk-5.0
-+ ('CPPPATH', 'Additional paths for the C preprocessor
(colon-separated)','/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/vtk-5.6:/usr/include/vtk-5.8:/usr/include/vtk:/usr/include/qt4/QtCore/:/usr/include/qt4/:/usr/include/qt4/QtXml:/usr/include/qt4/QtOpenGL:/usr/include/qt4/QtGui'),
# hardy has vtk-5.0
- ('LIBPATH','Additional paths for the linker (colon-separated)',None),
- ('libstdcxx','Specify libstdc++ location by hand (opened dynamically at
startup), usually not needed',None),
- ('QT4CXX','Specify a different compiler for files including qt4; this
is necessary for older qt version (<=4.7) which don\'t compile with
clang',None),
diff --git a/debian/patches/get_rid_off_suffix.patch
b/debian/patches/get_rid_off_suffix.patch
deleted file mode 100644
index 1db998c..0000000
--- a/debian/patches/get_rid_off_suffix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Delete the suffix
-Author: Anton Gladky <[email protected]>
-Last-Update: 2011-10-24
---- a/SConstruct
-+++ b/SConstruct
-@@ -189,7 +189,7 @@
- if not env.has_key('realVersion') or not env['realVersion']:
env['realVersion']=yadeSCons.getRealVersion() or 'unknown' # unknown if nothing
returned
- if not env.has_key('version'): env['version']=env['realVersion']
-
--env['SUFFIX']=('-'+env['version'] if len(env['version'])>0 else
'')+env['variant']
-+env['SUFFIX']=''
- env['SUFFIX_DBG']=env['SUFFIX']+('' if not env['debug'] else '/dbg')
- env['LIBDIR']='$PREFIX/lib/yade$SUFFIX_DBG'
- print "Yade version is `%s' (%s), installed files will be suffixed with
`%s'."%(env['version'],env['realVersion'],env['SUFFIX'])
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e6e8a48..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-get_rid_off_suffix.patch
-fix_FTBFS_on_KFreeBSD.patch
--
Yet Another Dynamic Engine. Platform for discrete element modeling.
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
