![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eab965e)
raw | patch | inline | side by side (parent: eab965e)
| author | Sebastian Harl <sh@tokkee.org> | |
| Fri, 3 Jun 2011 17:40:40 +0000 (19:40 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Fri, 3 Jun 2011 17:40:40 +0000 (19:40 +0200) |
This patch adjusts the path to CSS and JavaScript files.
| debian/README.source | [new file with mode: 0644] | patch | blob |
| debian/changelog | patch | blob | history | |
| debian/control | patch | blob | history | |
| debian/patches/css-js-path.dpatch | [new file with mode: 0644] | patch | blob |
| debian/patches/series | [new file with mode: 0644] | patch | blob |
| debian/rules | patch | blob | history |
diff --git a/debian/README.source b/debian/README.source
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+This package uses quilt to manage all modifications to the upstream source.
+See /usr/share/doc/quilt/README.source for instructions how to generate the
+patched source, add a new modification, and remove an existing one.
+
diff --git a/debian/changelog b/debian/changelog
index e840671d24a7908ab9c198e06849fca187e9a12d..a6698d2bb09d299676166de17ba3e617dc055f5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
* Uploading to experimental, since this is still an alpha release and work-
in-progress.
* Install into /usr/{share,lib}/collection4/.
+ * debian/patches:
+ - Added css-js-path.dpatch to adjust the path to CSS and JavaScript files.
- -- Sebastian Harl <tokkee@debian.org> Fri, 03 Jun 2011 17:32:48 +0200
+ -- Sebastian Harl <tokkee@debian.org> Fri, 03 Jun 2011 19:39:53 +0200
diff --git a/debian/control b/debian/control
index e7b073e859ddbbc3f6975cbb61107dc8c963ac95..36ba351836a4af5135509afad636d5f973f8a462 100644 (file)
--- a/debian/control
+++ b/debian/control
Section: web
Priority: optional
Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, libfcgi-dev, librrd-dev, libyajl-dev, bison
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, libfcgi-dev, librrd-dev, libyajl-dev, bison
Standards-Version: 3.9.1
Homepage: http://octo.it/c4/
Vcs-Git: git://git.tokkee.org/pkg-collection4.git
diff --git a/debian/patches/css-js-path.dpatch b/debian/patches/css-js-path.dpatch
--- /dev/null
@@ -0,0 +1,29 @@
+Description: Adjust path to CSS and JavaScript files.
+Author: Sebastian Harl <tokkee@debian.org>
+Forwarded: not-needed
+
+--- a/src/utils_cgi.c
++++ b/src/utils_cgi.c
+@@ -687,16 +687,16 @@
+ printf ("<html>\n"
+ " <head>\n"
+ " <title>%s</title>\n"
+- " <link rel=\"stylesheet\" type=\"text/css\" href=\"../share/style.css\" />\n"
+- " <script type=\"text/javascript\" src=\"../share/jquery-1.4.2.min.js\">\n"
++ " <link rel=\"stylesheet\" type=\"text/css\" href=\"css/style.css\" />\n"
++ " <script type=\"text/javascript\" src=\"js/jquery-1.4.2.min.js\">\n"
+ " </script>\n"
+- " <script type=\"text/javascript\" src=\"../share/raphael-min.js\">\n"
++ " <script type=\"text/javascript\" src=\"js/raphael-min.js\">\n"
+ " </script>\n"
+- " <script type=\"text/javascript\" src=\"../share/g.raphael-min.js\">\n"
++ " <script type=\"text/javascript\" src=\"js/g.raphael-min.js\">\n"
+ " </script>\n"
+- " <script type=\"text/javascript\" src=\"../share/g.line-min.js\">\n"
++ " <script type=\"text/javascript\" src=\"js/g.line-min.js\">\n"
+ " </script>\n"
+- " <script type=\"text/javascript\" src=\"../share/collection.js\">\n"
++ " <script type=\"text/javascript\" src=\"js/collection.js\">\n"
+ " </script>\n"
+ " </head>\n",
+ title_html);
diff --git a/debian/patches/series b/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+css-js-path.dpatch
diff --git a/debian/rules b/debian/rules
index f06402fe26d8866fe6cd421b8f1a522bbb388eb3..69e4d3cb3e668b80a440a07fa1a8775b8a91ea97 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
#
# Written by Sebastian Harl <tokkee@debian.org>
+include /usr/share/quilt/quilt.make
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
build: build-stamp
-build-stamp: config.status
+build-stamp: $(QUILT_STAMPFN) config.status
dh_testdir
$(MAKE)
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp