[Pkg-freeipa-devel] pki: Changes to 'debian-unstable'

Wed Mar 21 21:45:42 UTC 2012

debian/README.source                  |   15 +++++++++++++++
 debian/changelog                      |    2 +-
 debian/copyright                      |   24 ++++++++++++++++++++++--
 debian/patches/debian-support.diff    |    3 +++
 debian/patches/fix-include-paths.diff |    3 +++
 debian/rules                          |    2 ++
 debian/watch                          |    2 --
 dev/null                              |binary
 8 files changed, 46 insertions(+), 5 deletions(-)

New commits:
commit 57f6f186c505a2dd1eced6f17b989f23f422eed2
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Mar 21 22:38:11 2012 +0200

    drop debian/watch, the tarball is built from git

diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 3eada7b..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://pki.fedoraproject.org/pki/sources/pki-core/pki-core-(.*)\.tar\.gz

commit 6ce027523e7aee7a096656fe9b7e7e609c4ecd72
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Mar 21 22:21:04 2012 +0200

    rules: make sure the scripts dir exists early enough

diff --git a/debian/rules b/debian/rules
index 13ff03b..af77428 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,6 +132,8 @@ override_dh_installinit:
 
 override_dh_install:
 	dh_install
+
+	mkdir -p $(CURDIR)/debian/pki-setup/usr/share/pki/scripts
 	install -m 755 $(CURDIR)/debian/local/pki_apache_initscript \
 		$(CURDIR)/debian/pki-setup/usr/share/pki/scripts
 

commit 6a1a069f15b9ab6292af700dc22f98d36cfeb029
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Mar 21 19:40:05 2012 +0200

    dfsg tarball

diff --git a/debian/changelog b/debian/changelog
index a2092d7..608ed07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pki (9.0+git20120312-1) UNRELEASED; urgency=low
+pki (9.0+git20120312+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #653606)
   * Snapshot from the stable DOGTAG_9_BRANCH, includes these subsystem

commit dc58b7e8ba7725c84db546bdf0893095f04bfd61
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Mar 21 19:30:05 2012 +0200

    add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..dcc3366
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,15 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit" 
+   (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to 
+debian/patches and add the name of the patch to debian/patches/series.

commit 724d4d94b3ce1fd95b03b9730177c741fd33f567
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Mar 21 19:27:03 2012 +0200

    add patch headers

diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 0afce2b..844b48b 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -1,3 +1,6 @@
+Author: Timo Aaltonen <tjaalton at ubuntu.com>
+Description: fix various hardcoded values to match debian & ubuntu
+
 --- a/pki/base/setup/pkicommon.pm
 +++ b/pki/base/setup/pkicommon.pm
 @@ -49,7 +49,7 @@
diff --git a/debian/patches/fix-include-paths.diff b/debian/patches/fix-include-paths.diff
index 979fd70..9de51b7 100644
--- a/debian/patches/fix-include-paths.diff
+++ b/debian/patches/fix-include-paths.diff
@@ -1,3 +1,6 @@
+Author: Timo Aaltonen <tjaalton at ubuntu.com>
+Description: fix include paths for debian & ubuntu
+
 --- a/pki/base/tps/src/engine/RA.cpp
 +++ b/pki/base/tps/src/engine/RA.cpp
 @@ -29,7 +29,7 @@

commit 4eea552b52eb52cfb92fa5757ca3788a5e0bb269
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Mar 21 19:09:20 2012 +0200

    update the copyright

diff --git a/debian/copyright b/debian/copyright
index d0946ff..cd0c7ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -432,8 +432,28 @@ License: MIT
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 License: BSD
- On Debian systems, the complete text of the BSD License can be
- found in "/usr/share/common-licenses/BSD".
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: LGPL-2.1
  On Debian systems, the complete text of the GNU Lesser General Public

commit a7e7ec68731952aed98d4811ea3a8ef62dfd34ba
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Mar 21 18:48:47 2012 +0200

    remove xenroll.dll

diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll b/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
deleted file mode 100644
index 9375e98..0000000
Binary files a/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll and /dev/null differ

