[DRE-commits] r4670 - in trunk/redmine/debian: . source

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-02-14 17:16:43 +0000 (Sun, 14 Feb 2010)
New Revision: 4670

Added:
   trunk/redmine/debian/source/
   trunk/redmine/debian/source/format
Modified:
   trunk/redmine/debian/README.source
   trunk/redmine/debian/changelog
   trunk/redmine/debian/control
   trunk/redmine/debian/copyright
   trunk/redmine/debian/rules
Log:
Switch to quilt 3.0 source format, remove get-orig-source code.

Moved to new format : quilt dependency dropped, cdbs helper for quilt dropped,
and README.source corrected.
It's time for uscan !
get-orig-source downloaded redmine without rails,
but redmine official contains it : hence a copyright notice is added.
Still, the vendor/rails folder is not installed at all.

Modified: trunk/redmine/debian/README.source
===================================================================
--- trunk/redmine/debian/README.source	2010-02-14 17:16:35 UTC (rev 4669)
+++ trunk/redmine/debian/README.source	2010-02-14 17:16:43 UTC (rev 4670)
@@ -6,17 +6,6 @@
 All upstream revisions concerning rails 2.3 will be either ignored or patched to
 work with rails 2.2
 
-Please note the diff from the pristine source contains only the debian/ folder.
-
-Updating the package with redmine 0.9-stable branch:
-  * to get a "pristine" svn tar package :
-    ./debian/rules get-orig-source
-
-Then build the package :
-	cd redmine-0.9.x/
-	debuild
-
-
 * RAKE TEST
 1. dpkg-reconfigure redmine, add a "test" sqlite3 instance
 2. edit /etc/redmine/test/database.yml, copy 'production' section and rename it 'test'

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2010-02-14 17:16:35 UTC (rev 4669)
+++ trunk/redmine/debian/changelog	2010-02-14 17:16:43 UTC (rev 4670)
@@ -1,5 +1,7 @@
 redmine (0.9.2-2) unstable; urgency=low
 
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Drop get-orig-source, use uscan only, add copyright for rails
   * Fix forms select helper, another rails 2.2 incompatibility.
     (Closes: #569080)
   * Correctly declare generate_session_store task. (Closes: #569555)

Modified: trunk/redmine/debian/control
===================================================================
--- trunk/redmine/debian/control	2010-02-14 17:16:35 UTC (rev 4669)
+++ trunk/redmine/debian/control	2010-02-14 17:16:43 UTC (rev 4670)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Jérémy Lal <kapouer at melix.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), cdbs, quilt
+Build-Depends: debhelper (>= 7), cdbs
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/redmine/

Modified: trunk/redmine/debian/copyright
===================================================================
--- trunk/redmine/debian/copyright	2010-02-14 17:16:35 UTC (rev 4669)
+++ trunk/redmine/debian/copyright	2010-02-14 17:16:43 UTC (rev 4670)
@@ -15,7 +15,7 @@
     On Debian systems, the complete text of the GNU General
     Public License can be found in '/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is copyright 2009, Richard Hurt <rnhurt at kangaroobox.com>,
+The Debian packaging is copyright 2009, 2010 Richard Hurt <rnhurt at kangaroobox.com>,
 Jérémy Lal <jeremy.lal at m4x.org> and is licensed under the GPL-2, see `/usr/share/common-licenses/GPL-2'.
 
 
@@ -157,3 +157,7 @@
 Files: config/initializers/action_group.rb
 Copyright: (c) 2004 David Heinemeier Hansson
 License: MIT
+
+Files: vendor/rails
+Copyright: (c) 2004-2009 David Heinemeier Hansson <david at loudthinking.com>
+License: MIT

Modified: trunk/redmine/debian/rules
===================================================================
--- trunk/redmine/debian/rules	2010-02-14 17:16:35 UTC (rev 4669)
+++ trunk/redmine/debian/rules	2010-02-14 17:16:43 UTC (rev 4670)
@@ -2,7 +2,6 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # Get original source, used only because 0.9.0 is not released yet, so we package 0.9.0~svnXXXX
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1 )
@@ -71,15 +70,3 @@
 	#chmod a+x debian/redmine/usr/share/redmine/script/process/spinner
 	#chmod a+x debian/redmine/usr/share/redmine/script/runner
 	#chmod a+x debian/redmine/usr/share/redmine/script/server
-
-	
-get-orig-source:
-	rm -rf get-orig-source $(TARBALL)
-	mkdir get-orig-source
-	svn export $(SVN_URL) get-orig-source/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-	GZIP=--best tar czf $(TARBALL) -C get-orig-source $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-	rm -rf get-orig-source
-	mv $(TARBALL) ..
-	echo "  "$(TARBALL)" created and moved to the parent directory"
-
-.PHONY: get-orig-source

Added: trunk/redmine/debian/source/format
===================================================================
--- trunk/redmine/debian/source/format	                        (rev 0)
+++ trunk/redmine/debian/source/format	2010-02-14 17:16:43 UTC (rev 4670)
@@ -0,0 +1 @@
+3.0 (quilt)