merge with master

diff --git a/NOTICE b/NOTICE
deleted file mode 100644 (file)
index 2fbd41b..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-ALL ROOT CERTIFICATES CONTAINED IN certs/ DIRECTORY ARE PROVIDED "AS IS" WITHOUT ANY WARRANTY WHATSOEVER AND SHALL BE USED "AS IS" WITHOUT ANY MODIFICATIONS. Samsung Electronics Co., Ltd. HEREBY DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT OF THIRD PARTY RIGHTS. Samsung Electronics Co., Ltd. FURTHER DISCLAIMS ANY WARRANTY FOR ANY OUTDATED ROOTS THAT ARE REPLACED BY UPDATED ROOTS MADE AVAILABLE BY CERTIFICATE AUTHORITIES.

diff --git a/debian/changelog b/debian/changelog
index 59b71dc..e342bf1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,47 @@ ca-certificates (0.0.1-6) unstable; urgency=low
 
   * 11/12/21
   *  - remove unnecessary file
-  * Git: framework/security/ca-certificates
+  * Git: slp/pkgs/c/ca-certificates
   * Tag: ca-certificates_0.0.1-6
 
  -- Kidong Kim <kd0228.kim@samsung.com>  Wed, 21 Dec 2011 09:44:30 +0900
+
+ca-certificates (0.0.1-5) unstable; urgency=low
+
+  * remove COPYING and AUTHORS
+  * Git: 165.213.180.234:slp/pkgs/c/ca-certificates
+  * Tag: ca-certificates_0.0.1-5
+
+ -- Kidong Kim <kd0228.kim@samsung.com>  Sat, 16 Jul 2011 11:18:01 +0900
+
+ca-certificates (0.0.1-4) unstable; urgency=low
+
+  * add COPYING and AUTHORS
+  * Git: 165.213.180.234:slp/pkgs/c/ca-certificates
+  * Tag: ca-certificates_0.0.1-4
+
+ -- Kidong Kim <kd0228.kim@samsung.com>  Wed, 13 Jul 2011 10:34:12 +0900
+
+ca-certificates (0.0.1-3) unstable; urgency=low
+
+  * add symbolic link
+  * Git: 165.213.180.234:slp/pkgs/c/ca-certificates
+  * Tag: ca-certificates_0.0.1-3
+
+ -- Kidong Kim <kd0228.kim@samsung.com>  Fri, 27 May 2011 13:48:59 +0900
+
+ca-certificates (0.0.1-2) unstable; urgency=low
+
+  * add certificate for adobe DCTS authentication
+  * Git: 165.213.180.234:slp/pkgs/c/ca-certificates
+  * Tag: ca-certificates_0.0.1-2
+
+ -- Kidong Kim <kd0228.kim@samsung.com>  Thu, 21 Apr 2011 14:29:14 +0900
+
+ca-certificates (0.0.1-1) unstable; urgency=low
+
+  * Initial Release.
+  * Git: 165.213.180.234:/git/slp/pkgs/ca-certificates
+  * Tag: ca-certificates_0.0.1-1
+
+ -- Kidong Kim <kd0228.kim@samsung.com>  Tue, 02 Nov 2010 14:30:36 +0900