Advertisement
Guest User

Untitled

a guest
Mar 4th, 2013
33
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 3.85 KB | None | 0 0
  1. $ dquilt new fix-debian-target.patch
  2. Patch fix-debian-target.patch is now on top
  3. $ dquilt add src/Makefile
  4. File src/Makefile added to patch fix-debian-target.patch
  5. $ dquilt push
  6. File series fully applied, ends at patch fix-debian-target.patch
  7. $ dquilt refresh
  8. Refreshed patch fix-debian-target.patch
  9. $ dquilt new fix-bamboo-home.patch
  10. Patch fix-bamboo-home.patch is now on top
  11. $ dquilt add src/webapp/WEB-INF/classes/bamboo-init.properties
  12. File src/webapp/WEB-INF/classes/bamboo-init.properties added to patch fix-bamboo-home.patch
  13. $ nano src/webapp/WEB-INF/classes/bamboo-init.properties
  14. $ dquilt push
  15. File series fully applied, ends at patch fix-bamboo-home.patch
  16. $ dquilt refresh
  17. Refreshed patch fix-bamboo-home.patch
  18.  
  19.  
  20.  
  21. $ pdebuild --debbuildopts "-uc -us --source-option=--include-binaries"
  22. W: /home/foxx/.pbuilderrc does not exist
  23. dpkg-buildpackage: export CFLAGS from dpkg-buildflags (origin: vendor): -g -O2
  24. dpkg-buildpackage: export CPPFLAGS from dpkg-buildflags (origin: vendor):
  25. dpkg-buildpackage: export CXXFLAGS from dpkg-buildflags (origin: vendor): -g -O2
  26. dpkg-buildpackage: export FFLAGS from dpkg-buildflags (origin: vendor): -g -O2
  27. dpkg-buildpackage: export LDFLAGS from dpkg-buildflags (origin: vendor):
  28. dpkg-buildpackage: source package atlassian-bamboo
  29. dpkg-buildpackage: source version 4.4.4-1
  30. dpkg-buildpackage: source changed by Cal Leeming <cal.leeming@simplicitymedialtd.co.uk>
  31.  dpkg-source --include-binaries --before-build atlassian-bamboo-4.4.4
  32.  fakeroot debian/rules clean
  33. dh clean
  34.    dh_testdir
  35.    dh_auto_clean
  36.    dh_clean
  37.  dpkg-source --include-binaries -b atlassian-bamboo-4.4.4
  38. dpkg-source: info: using source format `3.0 (quilt)'
  39. dpkg-source: info: building atlassian-bamboo using existing ./atlassian-bamboo_4.4.4.orig.tar.gz
  40. patching file src/webapp/WEB-INF/classes/bamboo-init.properties
  41. Hunk #1 FAILED at 1.
  42. 1 out of 1 hunk FAILED -- saving rejects to file src/webapp/WEB-INF/classes/bamboo-init.properties.rej
  43. dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/fix-bamboo-home.patch/ < atlassian-bamboo-4.4.4.orig.kEFFk6/debian/patches/fix-bamboo-home.patch gave error exit status 1
  44. dpkg-buildpackage: error: dpkg-source --include-binaries -b atlassian-bamboo-4.4.4 gave error exit status 2
  45.  
  46.  
  47.  
  48. $ egrep -H "*" debian/patches/*
  49. debian/patches/fix-bamboo-home.patch:--- a/src/webapp/WEB-INF/classes/bamboo-init.properties
  50. debian/patches/fix-bamboo-home.patch:+++ b/src/webapp/WEB-INF/classes/bamboo-init.properties
  51. debian/patches/fix-bamboo-home.patch:@@ -1,3 +1,2 @@
  52. debian/patches/fix-bamboo-home.patch:-## You can specify your bamboo.home property here or in your system environment variables.
  53. debian/patches/fix-bamboo-home.patch:+bamboo.home=/opt/bamboo/data/
  54. debian/patches/fix-bamboo-home.patch:
  55. debian/patches/fix-bamboo-home.patch:-#bamboo.home=C:/bamboo/bamboo-home
  56. debian/patches/fix-debian-target.patch:--- /dev/null
  57. debian/patches/fix-debian-target.patch:+++ b/src/Makefile
  58. debian/patches/fix-debian-target.patch:@@ -0,0 +1,11 @@
  59. debian/patches/fix-debian-target.patch:+DESTDIR ?= /
  60. debian/patches/fix-debian-target.patch:+PREFIX ?= /opt
  61. debian/patches/fix-debian-target.patch:+INSTALLDIR = $(DESTDIR)$(PREFIX)/bamboo
  62. debian/patches/fix-debian-target.patch:+
  63. debian/patches/fix-debian-target.patch:+all:
  64. debian/patches/fix-debian-target.patch:+
  65. debian/patches/fix-debian-target.patch:+install:
  66. debian/patches/fix-debian-target.patch:+        install -d -m 0700 $(INSTALLDIR)
  67. debian/patches/fix-debian-target.patch:+        cp -Ra atlassian-bamboo/. $(INSTALLDIR)
  68. debian/patches/fix-debian-target.patch:+        install -d -m 0700 $(INSTALLDIR)/data
  69. debian/patches/fix-debian-target.patch:+        install -d -m 0700 $(INSTALLDIR)/logs
  70. debian/patches/fix-debian-target.patch:\ No newline at end of file
  71. debian/patches/series:fix-debian-target.patch
  72. debian/patches/series:fix-bamboo-home.patch
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement