Ebrahim Mohammadi avatar Ebrahim Mohammadi committed 7e43afc

* Switch to dpkg-source 3.0 (quilt) format

Comments (0)

Files changed (12)

+drraw (2.2b2-2) unstable; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Mohammad Ebrahim Mohammadi Panah <ebrahim@mohammadi.ir>  Tue, 04 May 2010 03:48:11 +0430
+
 drraw (2.2b2-1) unstable; urgency=low
 
   * Upgrade to newer upstream version 2.2b2 (Closes: #579991)
 Section: web
 Priority: extra
 Maintainer: Mohammad Ebrahim Mohammadi Panah <ebrahim@mohammadi.ir>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.4
 Homepage: http://web.taranis.org/drraw/
 
 Package: drraw
 Architecture: all
-Source: drraw
 Depends: librrds-perl, ${misc:Depends}
 Suggests: collectd
 Recommends: httpd | apache2, librcs-perl

debian/patches/00list

-01_drraw_cgi
-02_drraw_conf

debian/patches/01_drraw_cgi.diff

+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_drraw_cgi.dpatch by Mohammad Ebrahim Mohammadi Panah <ebrahim@mohammadi.ir>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for drraw.cgi
+## DP: Changes config file path from its own directory to /etc/drraw/drraw.conf
+
+@DPATCH@
+
+--- drraw.upstream/drraw.cgi	2008-12-15 23:57:22.000000000 +0330
++++ drraw/drraw.cgi	2008-12-15 23:31:06.000000000 +0330
+@@ -49,7 +49,7 @@
+ 
+ # The configuration file is expected to be found in the same directory
+ # as drraw itself.  You may customize this to be elsewhere.
+-my $config = (dirname($0) =~ /(.*)/)[0] . "/drraw.conf"; # Untaint
++my $config = "/etc/drraw/drraw.conf"; # Untaint
+ 
+ # This needs to be manually set for stupid stupid File::Find to work
+ # in tainted mode.

debian/patches/01_drraw_cgi.dpatch

-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_drraw_cgi.dpatch by Mohammad Ebrahim Mohammadi Panah <ebrahim@mohammadi.ir>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for drraw.cgi
-## DP: Changes config file path from its own directory to /etc/drraw/drraw.conf
-
-@DPATCH@
-
---- drraw.upstream/drraw.cgi	2008-12-15 23:57:22.000000000 +0330
-+++ drraw/drraw.cgi	2008-12-15 23:31:06.000000000 +0330
-@@ -49,7 +49,7 @@
- 
- # The configuration file is expected to be found in the same directory
- # as drraw itself.  You may customize this to be elsewhere.
--my $config = (dirname($0) =~ /(.*)/)[0] . "/drraw.conf"; # Untaint
-+my $config = "/etc/drraw/drraw.conf"; # Untaint
- 
-# This needs to be manually set for stupid stupid File::Find to work
-# in tainted mode.

debian/patches/02_drraw_conf.diff

+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_drraw_conf.dpatch by Mohammad Ebrahim Mohammadi Panah <ebrahim@mohammadi.ir>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for drraw.conf
+## DP: Sets correct data and cache directories for the Debian package
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drraw~/drraw.conf drraw/drraw.conf
+--- drraw~/drraw.conf	2010-05-04 01:20:09.000000000 +0430
++++ drraw/drraw.conf	2010-05-04 01:23:46.882422843 +0430
+@@ -33,7 +33,8 @@
+ 
+ # This function is used to sort *.rrd and *.evt filenames before displaying
+ # them for the user to choose from.  It is passed the two arguments that
+-# need to be compared.#sub mydatafnsort { return $_[0] cmp $_[1]; }
++# need to be compared.
++#sub mydatafnsort { return $_[0] cmp $_[1]; }
+ 
+ # Default DS filter when adding graph data sources from RRD files
+ #$dsfilter_def = '';
+@@ -75,8 +76,8 @@
+ # These directories MUST EXIST and the user running CGI scripts must have
+ # read AND write access to them.  It is entirely safe to delete any content
+ # found in the temporary directory.
+-$saved_dir = '/somewhere/drraw/saved';
+-$tmp_dir = '/somewhere/drraw/tmp';
++$saved_dir = '/var/lib/drraw';
++$tmp_dir = '/var/cache/drraw';
+ # By default, critical errors are shown in the produced HTML pages produced
+ # and sent to standard error (which web servers typically write to some
+ # logfile).  If the following is defined, such errors will be written to

debian/patches/02_drraw_conf.dpatch

-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_drraw_conf.dpatch by Mohammad Ebrahim Mohammadi Panah <ebrahim@mohammadi.ir>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for drraw.conf
-## DP: Sets correct data and cache directories for the Debian package
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drraw~/drraw.conf drraw/drraw.conf
---- drraw~/drraw.conf	2010-05-04 01:20:09.000000000 +0430
-+++ drraw/drraw.conf	2010-05-04 01:23:46.882422843 +0430
-@@ -33,7 +33,8 @@
- 
- # This function is used to sort *.rrd and *.evt filenames before displaying
- # them for the user to choose from.  It is passed the two arguments that
--# need to be compared.#sub mydatafnsort { return $_[0] cmp $_[1]; }
-+# need to be compared.
-+#sub mydatafnsort { return $_[0] cmp $_[1]; }
- 
- # Default DS filter when adding graph data sources from RRD files
- #$dsfilter_def = '';
-@@ -75,8 +76,8 @@
- # These directories MUST EXIST and the user running CGI scripts must have
- # read AND write access to them.  It is entirely safe to delete any content
- # found in the temporary directory.
--$saved_dir = '/somewhere/drraw/saved';
--$tmp_dir = '/somewhere/drraw/tmp';
-+$saved_dir = '/var/lib/drraw';
-+$tmp_dir = '/var/cache/drraw';
- # By default, critical errors are shown in the produced HTML pages produced
- # and sent to standard error (which web servers typically write to some
- # logfile).  If the following is defined, such errors will be written to

debian/patches/series

+02_drraw_conf.diff
+01_drraw_cgi.diff
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 build: patch
 
 clean: unpatch

debian/source/format

+3.0 (quilt)
 
 # The configuration file is expected to be found in the same directory
 # as drraw itself.  You may customize this to be elsewhere.
-my $config = (dirname($0) =~ /(.*)/)[0] . "/drraw.conf"; # Untaint
+my $config = "/etc/drraw/drraw.conf"; # Untaint
 
 # This needs to be manually set for stupid stupid File::Find to work
 # in tainted mode.
 
 # This function is used to sort *.rrd and *.evt filenames before displaying
 # them for the user to choose from.  It is passed the two arguments that
-# need to be compared.#sub mydatafnsort { return $_[0] cmp $_[1]; }
+# need to be compared.
+#sub mydatafnsort { return $_[0] cmp $_[1]; }
 
 # Default DS filter when adding graph data sources from RRD files
 #$dsfilter_def = '';
 # These directories MUST EXIST and the user running CGI scripts must have
 # read AND write access to them.  It is entirely safe to delete any content
 # found in the temporary directory.
-$saved_dir = '/somewhere/drraw/saved';
-$tmp_dir = '/somewhere/drraw/tmp';
+$saved_dir = '/var/lib/drraw';
+$tmp_dir = '/var/cache/drraw';
 # By default, critical errors are shown in the produced HTML pages produced
 # and sent to standard error (which web servers typically write to some
 # logfile).  If the following is defined, such errors will be written to
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.