[3depict] 02/04: * Update patches * Update changelog
D Haley
mycae-guest at moszumanska.debian.org
Sun May 3 13:53:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
mycae-guest pushed a commit to branch master
in repository 3depict.
commit cde7601cf7f8649418f01be9584a4fe55f584805
Author: D Haley <mycae at gmx.com>
Date: Fri May 1 23:59:11 2015 +0200
* Update patches
* Update changelog
---
debian/changelog | 6 ++
debian/patches/lowercase-textdomain.patch | 10 +-
debian/patches/series | 1 -
debian/patches/upstream.patch | 171 ------------------------------
4 files changed, 11 insertions(+), 177 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9b79e21..bec0a42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+3depict (0.0.18-1) unstable; urgency=medium
+
+ * Update to upstream 0.0.18
+
+ -- D Haley <mycae at gmx.com> Fri, 01 May 2015 23:59:48 +0200
+
3depict (0.0.17-1) unstable; urgency=medium
* Update to upstream 0.0.17
diff --git a/debian/patches/lowercase-textdomain.patch b/debian/patches/lowercase-textdomain.patch
index b8abe72..2c24b61 100644
--- a/debian/patches/lowercase-textdomain.patch
+++ b/debian/patches/lowercase-textdomain.patch
@@ -1,11 +1,11 @@
Description: Debian uses different text domain for the lang files
Forwarded: not-needed
Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.17/src/3Depict.cpp
+Index: 3depict-0.0.18/src/3Depict.cpp
===================================================================
---- 3depict-0.0.17.orig/src/3Depict.cpp 2014-09-28 17:06:04.671349700 +0200
-+++ 3depict-0.0.17/src/3Depict.cpp 2014-09-28 17:06:04.663349801 +0200
-@@ -166,7 +166,7 @@
+--- 3depict-0.0.18.orig/src/3Depict.cpp 2015-05-02 00:01:30.047635141 +0200
++++ 3depict-0.0.18/src/3Depict.cpp 2015-05-02 00:01:30.043635141 +0200
+@@ -157,7 +157,7 @@
else
{
//Set the gettext language
@@ -14,7 +14,7 @@ Index: 3depict-0.0.17/src/3Depict.cpp
setlocale (LC_ALL, "");
#ifdef __WXMAC__
bindtextdomain( PROGRAM_NAME, paths->GetResourcesDir().mb_str(wxConvUTF8) );
-@@ -198,8 +198,8 @@
+@@ -189,8 +189,8 @@
break;
}
#else
diff --git a/debian/patches/series b/debian/patches/series
index 9bc5f81..2b9da52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream.patch
debian-desktop-naming.patch
lowercase-textdomain.patch
desktop-category.patch
diff --git a/debian/patches/upstream.patch b/debian/patches/upstream.patch
deleted file mode 100644
index 95c809e..0000000
--- a/debian/patches/upstream.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff -r 7510fdcc8b8a -r 185ccbce5421 src/3Depict.cpp
---- 3Depict-0.0.17/src/3Depict.cpp Mon Aug 25 14:41:48 2014 +0100
-+++ 3Depict-0.0.17/src/3Depict.cpp Mon Aug 25 14:42:29 2014 +0100
-@@ -39,6 +39,12 @@
-
- class threeDepictApp: public wxApp {
- private:
-+#ifndef DEBUG
-+ //instance of this class suppresses internal wx error dialogs.
-+ // these are a nuisance in release code, as recovered errors often annoy the user
-+ wxLogNull nullifyLogs;
-+#endif
-+
- MainWindowFrame* MainFrame ;
- wxArrayString commandLineFiles;
- wxLocale* usrLocale;
-@@ -62,9 +68,6 @@
- void MacReopenFile(const wxString & fileName);
- #endif
-
--#ifdef DEBUG
-- void setEventloggerFile(const char *file);
--#endif
- };
-
- //Check version is in place because wxT is deprecated for wx 2.9
-diff -r 185ccbce5421 -r c8ff86119e58 src/backend/filters/clusterAnalysis.cpp
---- 3Depict-0.0.17/src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:42:29 2014 +0100
-+++ 3Depict-0.0.17/src/backend/filters/clusterAnalysis.cpp Mon Aug 25 14:43:10 2014 +0100
-@@ -264,7 +264,7 @@
-
- ClusterAnalysisFilter::ClusterAnalysisFilter() : algorithm(CLUSTER_LINK_ERODE),
- enableCoreClassify(false), coreDist(0.0f), coreKNN(1), linkDist(0.5f),
-- enableBulkLink(false), bulkLink(1), enableErosion(false), dErosion(0.25),
-+ enableBulkLink(false), bulkLink(0.25), enableErosion(false), dErosion(0.25),
- wantClusterID(false), wantCropSize(false), nMin(0),nMax(std::numeric_limits<size_t>::max()),
- wantClusterSizeDist(false),logClusterSize(false),
- wantClusterComposition(true),normaliseComposition(true),
-diff -r c8ff86119e58 -r 55ec5e056846 src/gui/mainFrame.cpp
---- 3Depict-0.0.17/src/gui/mainFrame.cpp Mon Aug 25 14:43:10 2014 +0100
-+++ 3Depict-0.0.17/src/gui/mainFrame.cpp Mon Aug 25 14:51:53 2014 +0100
-@@ -464,7 +464,7 @@
- fileExport->Append(ID_FILE_EXPORT_IMAGE, TRANS("&Image...\tCtrl+I"), TRANS("Export Current 3D View"), wxITEM_NORMAL);
- fileExport->Append(ID_FILE_EXPORT_IONS, TRANS("Ion&s...\tCtrl+N"), TRANS("Export Ion Data"), wxITEM_NORMAL);
- fileExport->Append(ID_FILE_EXPORT_RANGE, TRANS("Ran&ges...\tCtrl+G"), TRANS("Export Range Data"), wxITEM_NORMAL);
-- fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+A"), TRANS("Export Animated Filter"), wxITEM_NORMAL);
-+ fileExport->Append(ID_FILE_EXPORT_FILTER_ANIMATION, TRANS("&Animate Filters...\tCtrl+T"), TRANS("Export Animated Filter"), wxITEM_NORMAL);
- fileExport->Append(ID_FILE_EXPORT_ANIMATION, TRANS("Ani&mate Camera...\tCtrl+M"), TRANS("Export Animated Camera"), wxITEM_NORMAL);
- fileExport->Append(ID_FILE_EXPORT_PACKAGE, TRANS("Pac&kage...\tCtrl+K"), TRANS("Export analysis package"), wxITEM_NORMAL);
-
-diff -r 9d545342c3ad -r 3c853d1f5af7 src/backend/filters/externalProgram.cpp
---- 3Depict-0.0.17/src/backend/filters/externalProgram.cpp Mon Aug 25 14:52:42 2014 +0100
-+++ 3Depict-0.0.17/src/backend/filters/externalProgram.cpp Mon Aug 25 14:53:04 2014 +0100
-@@ -551,7 +551,7 @@
-
- p.name=TRANS("Work Dir");
- p.data= workingDir;
-- p.type=PROPERTY_TYPE_STRING;
-+ p.type=PROPERTY_TYPE_DIR;
- p.helpText=TRANS("Directory to run the command in");
- p.key=EXTERNALPROGRAM_KEY_WORKDIR;
- propertyList.addProperty(p,curGroup);
-diff -r 9d545342c3ad -r 3c853d1f5af7 src/common/constants.h
---- 3Depict-0.0.17/src/common/constants.h Mon Aug 25 14:52:42 2014 +0100
-+++ 3Depict-0.0.17/src/common/constants.h Mon Aug 25 14:53:04 2014 +0100
-@@ -57,6 +57,7 @@
- PROPERTY_TYPE_POINT3D,
- PROPERTY_TYPE_CHOICE,
- PROPERTY_TYPE_FILE,
-+ PROPERTY_TYPE_DIR,
- PROPERTY_TYPE_ENUM_END //Not a prop, just end of enum
- };
-
-diff -r 9d545342c3ad -r 3c853d1f5af7 src/wx/propertyGridUpdater.cpp
---- 3Depict-0.0.17/src/wx/propertyGridUpdater.cpp Mon Aug 25 14:52:42 2014 +0100
-+++ 3Depict-0.0.17/src/wx/propertyGridUpdater.cpp Mon Aug 25 14:53:04 2014 +0100
-@@ -61,7 +61,7 @@
- g->Append(new wxPropertyCategory(string("") + title,title));
-
-
-- //Set the children of thies property
-+ //Set the children of this property
- for(size_t uj=0;uj<propGrouping.size();uj++)
- {
- FilterProperty fp;
-@@ -83,6 +83,7 @@
- boolVal);
- break;
- };
-+ //TODO: we need a PROPERTY_TYPE_UINT
- case PROPERTY_TYPE_INTEGER:
- {
- long long iV;
-@@ -145,16 +146,24 @@
-
- break;
- }
-+ case PROPERTY_TYPE_DIR:
-+ {
-+ pgp = new wxDirProperty(fp.name,keyStr,fp.data);
-+ break;
-+ }
- }
-
-+ //Set the tooltip
- pgp->SetHelpString(fp.helpText);
-
-+ //add the property to the grid
- g->Append(pgp);
-
- switch(fp.type)
- {
- case PROPERTY_TYPE_BOOL:
- {
-+ //if a bool property, use a checkbox to edit
- g->SetPropertyEditor(pgp,wxPGEditor_CheckBox);
- break;
- }
-diff -r 7372047ee6f9 src/common/basics.cpp
---- 3Depict-0.0.17/src/common/basics.cpp Sun Aug 03 16:58:06 2014 -0400
-+++ 3Depict-0.0.17/src/common/basics.cpp Sun Aug 03 17:01:04 2014 -0400
-@@ -1471,6 +1471,21 @@
- return 0;
- }
-
-+bool isNotDirectory(const char *filename)
-+{
-+ struct stat statbuf;
-+
-+ if(stat(filename,&statbuf) == -1)
-+ return false;
-+
-+ return (statbuf.st_mode !=S_IFDIR);
-+}
-+
-+bool rmFile(const std::string &filename)
-+{
-+ return remove(filename.c_str()) == 0;
-+}
-+
- #ifdef DEBUG
- bool isValidXML(const char *filename)
- {
-@@ -1503,27 +1518,6 @@
- return true;
- }
-
--#if !defined(__WIN32__) && !defined(__WIN64)
-
--bool isNotDirectory(const char *filename)
--{
-- struct stat statbuf;
--
-- if(stat(filename,&statbuf) == -1)
-- return false;
--
-- return (statbuf.st_mode !=S_IFDIR);
--}
--
--bool rmFile(const std::string &filename)
--{
-- return remove(filename.c_str()) == 0;
--}
--#elif defined(__WIN32) || defined(__WIN64)
--bool rmFile(const std::string &filename)
--{
-- return DeleteFile((const wchar_t*)filename.c_str()) == 0;
--}
--#endif
-
- #endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git
More information about the debian-science-commits
mailing list