From 9de1a05d5d0880cdecced03e19b301df9d948a4a Mon Sep 17 00:00:00 2001
From: chris2511 <chris2511>
Date: Tue, 5 Aug 2003 19:57:00 +0000
Subject: [PATCH] - new files added to xca.dsp, - return a value in
 load_obj.cpp - kick Version to 0.4.3

---
 Makefile.in      |  4 +--
 configure.ac     |  2 +-
 debian/changelog | 14 ++++++++++
 lib/load_obj.cpp |  2 +-
 xca.dsp          | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3cbf4f99..b113013b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,8 +50,8 @@ distclean: clean
 
 dist: 
 	test ! -z "$(TVERSION)"
-	#rm -rf $(TARGET) 
-	#cvs export -r $(TAG) -d $(TARGET) xca && 
+	rm -rf $(TARGET) 
+	cvs export -r $(TAG) -d $(TARGET) xca && \
 	(cd $(TARGET) &&  autoconf && \
 	./mkxcapro.sh && lrelease xca.pro && \
 	cat rpm/xca.spec |sed s/VERSION/$(TVERSION)/g >rpm/$(TARGET)-1.spec && \
diff --git a/configure.ac b/configure.ac
index 894b63dc..5e66cbcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(xca, 0.4.2)
+AC_INIT(xca, 0.4.3)
 AC_CONFIG_SRCDIR([view/main.cpp])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/debian/changelog b/debian/changelog
index 9a5c8b9a..3de8a1ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xca (0.4.3) unstable; urgency=low
+
+  * remove Certificate creation bug (AuthKeyId)
+  * always take the right cert for signing
+  * critical flag in key usage and extended key usage works now
+  * Import of Multiple items is done and works
+    [ 739726 ] extend description of -p option
+    [ 775529 ] Import of PKCS#7 item not shown
+  * made the details dialogs internal name read only
+  * some segmentation faults removed 
+  * VPN OIDs added to Ext. Keyusage
+
+ -- Christian Hohnstädt <chris@trinity.local>  Tue,  5 Aug 2003 21:51:20 +0200
+
 xca (0.4.2) unstable; urgency=low
 
   * Memory leak removed
diff --git a/lib/load_obj.cpp b/lib/load_obj.cpp
index 2308c3db..55efe765 100644
--- a/lib/load_obj.cpp
+++ b/lib/load_obj.cpp
@@ -67,7 +67,7 @@ load_base::load_base()
 
 pki_base * load_base::loadItem(QString s)
 {
-
+	return NULL;
 }		
 
 load_base::~load_base()
diff --git a/xca.dsp b/xca.dsp
index 46dd10c9..5880d9dc 100644
--- a/xca.dsp
+++ b/xca.dsp
@@ -371,6 +371,19 @@ SOURCE=.\lib\func.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\widgets\ImportMulti.cpp
+
+!IF  "$(CFG)" == "xca - Win32 Release"
+
+# ADD CPP /I "."
+
+!ELSEIF  "$(CFG)" == "xca - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\widgets\KeyDetail.cpp
 
 !IF  "$(CFG)" == "xca - Win32 Release"
@@ -399,6 +412,19 @@ SOURCE=.\view\KeyView.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\lib\load_obj.cpp
+
+!IF  "$(CFG)" == "xca - Win32 Release"
+
+# ADD CPP /I "."
+
+!ELSEIF  "$(CFG)" == "xca - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\view\main.cpp
 
 !IF  "$(CFG)" == "xca - Win32 Release"
@@ -1384,6 +1410,27 @@ InputName=func
 # End Source File
 # Begin Source File
 
+SOURCE=.\widgets\ImportMulti.h
+
+!IF  "$(CFG)" == "xca - Win32 Release"
+
+# Begin Custom Build - MOC ing $(InputPath)
+InputDir=.\widgets
+InputPath=.\widgets\ImportMulti.h
+InputName=ImportMulti
+
+"$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "xca - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\widgets\KeyDetail.h
 
 !IF  "$(CFG)" == "xca - Win32 Release"
@@ -1436,6 +1483,10 @@ InputName=KeyView
 # End Source File
 # Begin Source File
 
+SOURCE=.\lib\load_obj.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\widgets\MainWindow.h
 
 !IF  "$(CFG)" == "xca - Win32 Release"
@@ -3159,6 +3210,19 @@ SOURCE=.\lib\moc_func.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\widgets\moc_ImportMulti.cpp
+
+!IF  "$(CFG)" == "xca - Win32 Release"
+
+# ADD CPP /I "."
+
+!ELSEIF  "$(CFG)" == "xca - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\widgets\moc_KeyDetail.cpp
 
 !IF  "$(CFG)" == "xca - Win32 Release"
@@ -3549,6 +3613,10 @@ SOURCE=.\ui\ui_ExportTinyCA.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\ui\ui_ImportMulti.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\ui\ui_KeyDetail.cpp
 
 !IF  "$(CFG)" == "xca - Win32 Release"
@@ -3653,6 +3721,10 @@ SOURCE=.\ui\ui_moc_ExportTinyCA.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\ui\ui_moc_ImportMulti.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\ui\ui_moc_KeyDetail.cpp
 
 !IF  "$(CFG)" == "xca - Win32 Release"