[pkg-java] r14912 - in trunk/velocity/debian: . patches

Thu Sep 15 15:33:22 UTC 2011

Author: twerner
Date: 2011-09-15 15:33:22 +0000 (Thu, 15 Sep 2011)
New Revision: 14912

Added:
   trunk/velocity/debian/patches/0001-fix-example-scripts.patch
Removed:
   trunk/velocity/debian/patches/fix_example_scripts.patch
Modified:
   trunk/velocity/debian/changelog
   trunk/velocity/debian/patches/series
Log:
Refresh remaining patch.

Modified: trunk/velocity/debian/changelog
===================================================================

--- trunk/velocity/debian/changelog	2011-09-15 12:44:33 UTC (rev 14911)
+++ trunk/velocity/debian/changelog	2011-09-15 15:33:22 UTC (rev 14912)
@@ -12,8 +12,9 @@
   * Document copyright and license of xmleb.jar.
   * Use Maven to build the package. Parts of the documentation that require the
     maven-site-plugin do not build yet.
+  * Refresh remaining patch.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 15 Sep 2011 11:20:00 +0200
+ -- Torsten Werner <twerner at debian.org>  Thu, 15 Sep 2011 17:30:37 +0200
 
 velocity (1.6.2-4) unstable; urgency=low
 

Copied: trunk/velocity/debian/patches/0001-fix-example-scripts.patch (from rev 14904, trunk/velocity/debian/patches/fix_example_scripts.patch)
===================================================================
--- trunk/velocity/debian/patches/0001-fix-example-scripts.patch	                        (rev 0)
+++ trunk/velocity/debian/patches/0001-fix-example-scripts.patch	2011-09-15 15:33:22 UTC (rev 14912)
@@ -0,0 +1,63 @@
+From: Onkar Shinde <onkarshinde at ubuntu.com>
+Date: Thu, 15 Sep 2011 17:18:35 +0200
+Subject: fix example scripts
+
+---
+ examples/app_example1/example.sh          |    2 +-
+ examples/app_example2/example2.sh         |    2 +-
+ examples/context_example/dbcontexttest.sh |    2 +-
+ examples/logger_example/logger_example.sh |    2 +-
+ examples/xmlapp_example/xmlapp_example.sh |    2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/examples/app_example1/example.sh b/examples/app_example1/example.sh
+index 777224b..45c50f9 100755
+--- a/examples/app_example1/example.sh
++++ b/examples/app_example1/example.sh
+@@ -1,4 +1,4 @@
+-# !/bin/sh
++#!/bin/sh
+ 
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+diff --git a/examples/app_example2/example2.sh b/examples/app_example2/example2.sh
+index 8c154d9..e12694d 100755
+--- a/examples/app_example2/example2.sh
++++ b/examples/app_example2/example2.sh
+@@ -1,4 +1,4 @@
+-# !/bin/sh
++#!/bin/sh
+ 
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+diff --git a/examples/context_example/dbcontexttest.sh b/examples/context_example/dbcontexttest.sh
+index ab2e43a..cf9146f 100755
+--- a/examples/context_example/dbcontexttest.sh
++++ b/examples/context_example/dbcontexttest.sh
+@@ -1,4 +1,4 @@
+-# !/bin/sh
++#!/bin/sh
+ 
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+diff --git a/examples/logger_example/logger_example.sh b/examples/logger_example/logger_example.sh
+index 4cf2cf5..3a4c1d8 100755
+--- a/examples/logger_example/logger_example.sh
++++ b/examples/logger_example/logger_example.sh
+@@ -1,4 +1,4 @@
+-# !/bin/sh
++#!/bin/sh
+ 
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+diff --git a/examples/xmlapp_example/xmlapp_example.sh b/examples/xmlapp_example/xmlapp_example.sh
+index 5bacf41..8108237 100755
+--- a/examples/xmlapp_example/xmlapp_example.sh
++++ b/examples/xmlapp_example/xmlapp_example.sh
+@@ -1,4 +1,4 @@
+-# !/bin/sh
++#!/bin/sh
+ 
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+-- 

Deleted: trunk/velocity/debian/patches/fix_example_scripts.patch
===================================================================
--- trunk/velocity/debian/patches/fix_example_scripts.patch	2011-09-15 12:44:33 UTC (rev 14911)
+++ trunk/velocity/debian/patches/fix_example_scripts.patch	2011-09-15 15:33:22 UTC (rev 14912)
@@ -1,50 +0,0 @@
-Index: velocity-1.6.2/examples/app_example1/example.sh
-===================================================================
---- velocity-1.6.2.orig/examples/app_example1/example.sh	2010-03-17 12:11:15.000000000 +0530
-+++ velocity-1.6.2/examples/app_example1/example.sh	2010-03-17 12:11:50.000000000 +0530
-@@ -1,4 +1,4 @@
--# !/bin/sh
-+#!/bin/sh
- 
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
-Index: velocity-1.6.2/examples/app_example2/example2.sh
-===================================================================
---- velocity-1.6.2.orig/examples/app_example2/example2.sh	2010-03-17 12:11:15.000000000 +0530
-+++ velocity-1.6.2/examples/app_example2/example2.sh	2010-03-17 12:11:59.000000000 +0530
-@@ -1,4 +1,4 @@
--# !/bin/sh
-+#!/bin/sh
- 
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
-Index: velocity-1.6.2/examples/context_example/dbcontexttest.sh
-===================================================================
---- velocity-1.6.2.orig/examples/context_example/dbcontexttest.sh	2010-03-17 12:11:14.000000000 +0530
-+++ velocity-1.6.2/examples/context_example/dbcontexttest.sh	2010-03-17 12:11:31.000000000 +0530
-@@ -1,4 +1,4 @@
--# !/bin/sh
-+#!/bin/sh
- 
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
-Index: velocity-1.6.2/examples/logger_example/logger_example.sh
-===================================================================
---- velocity-1.6.2.orig/examples/logger_example/logger_example.sh	2010-03-17 12:11:14.000000000 +0530
-+++ velocity-1.6.2/examples/logger_example/logger_example.sh	2010-03-17 12:11:42.000000000 +0530
-@@ -1,4 +1,4 @@
--# !/bin/sh
-+#!/bin/sh
- 
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
-Index: velocity-1.6.2/examples/xmlapp_example/xmlapp_example.sh
-===================================================================
---- velocity-1.6.2.orig/examples/xmlapp_example/xmlapp_example.sh	2010-03-17 12:11:15.000000000 +0530
-+++ velocity-1.6.2/examples/xmlapp_example/xmlapp_example.sh	2010-03-17 12:12:09.000000000 +0530
-@@ -1,4 +1,4 @@
--# !/bin/sh
-+#!/bin/sh
- 
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file

Modified: trunk/velocity/debian/patches/series
===================================================================
--- trunk/velocity/debian/patches/series	2011-09-15 12:44:33 UTC (rev 14911)
+++ trunk/velocity/debian/patches/series	2011-09-15 15:33:22 UTC (rev 14912)
@@ -1 +1 @@
-fix_example_scripts.patch
+0001-fix-example-scripts.patch


