Advertisement
Guest User

Untitled

a guest
May 8th, 2014
152
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.02 KB | None | 0 0
  1. diff -Nru gitg-0.3.2/debian/control gitg-0.3.2/debian/control
  2. --- gitg-0.3.2/debian/control 2014-05-08 16:41:54.000000000 +1000
  3. +++ gitg-0.3.2/debian/control 2014-05-08 19:23:23.000000000 +1000
  4. @@ -30,6 +30,7 @@
  5.  
  6. Package: gitg
  7. Architecture: any
  8. +Multi-Arch: foreign
  9. Depends: ${shlibs:Depends},
  10. ${misc:Depends},
  11. dbus-x11,
  12. @@ -52,8 +53,10 @@
  13. Package: libgitg0
  14. Architecture: any
  15. Section: libs
  16. +Multi-Arch: same
  17. Depends: ${shlibs:Depends},
  18. - ${misc:Depends}
  19. + ${misc:Depends},
  20. + gir1.2-gitg-1.0 (= ${binary:Version}),
  21. Description: git repository viewer
  22. gitg is a fast git repository browser.
  23. It currently features:
  24. @@ -88,3 +91,21 @@
  25. .
  26. This package contains the development files needed to
  27. build plugins
  28. +
  29. +Package: gir1.2-gitg-1.0
  30. +Section: introspection
  31. +Architecture: any
  32. +Depends: ${gir:Depends},
  33. + ${shlibs:Depends},
  34. + ${misc:Depends}
  35. +Description: GObject introspection data for gitg
  36. + gitg is a fast git repository browser.
  37. + It currently features:
  38. + .
  39. + * Loading large repositories very fast
  40. + * Show/browse repository history
  41. + * Show highlighted revision diff
  42. + * Browse file tree of a revision and export by drag and drop
  43. + * Search in the revision history on subject, author or hash
  44. + * Switch between history view of branches easily
  45. + * Commit view providing per hunk stage/unstage and commit
  46. diff -Nru gitg-0.3.2/debian/gir1.2-gitg-1.0.install gitg-0.3.2/debian/gir1.2-gitg-1.0.install
  47. --- gitg-0.3.2/debian/gir1.2-gitg-1.0.install 1970-01-01 10:00:00.000000000 +1000
  48. +++ gitg-0.3.2/debian/gir1.2-gitg-1.0.install 2014-05-08 19:19:22.000000000 +1000
  49. @@ -0,0 +1,2 @@
  50. +usr/lib/girepository-1.0
  51. +usr/lib/python*/site-packages/gi/overrides/*.py usr/lib/python3/dist-packages/gi/overrides
  52. diff -Nru gitg-0.3.2/debian/gitg-dev.install gitg-0.3.2/debian/gitg-dev.install
  53. --- gitg-0.3.2/debian/gitg-dev.install 2014-05-08 09:52:38.000000000 +1000
  54. +++ gitg-0.3.2/debian/gitg-dev.install 2014-05-08 17:12:34.000000000 +1000
  55. @@ -1,5 +1,5 @@
  56. usr/include
  57. -usr/lib/gitg/*.so
  58. -usr/lib/gitg/pkgconfig
  59. +usr/lib/*/gitg/*.so
  60. +usr/lib/*/gitg/pkgconfig
  61. usr/share/gir-1.0
  62. usr/share/vala
  63. diff -Nru gitg-0.3.2/debian/gitg.install gitg-0.3.2/debian/gitg.install
  64. --- gitg-0.3.2/debian/gitg.install 2014-05-08 16:42:15.000000000 +1000
  65. +++ gitg-0.3.2/debian/gitg.install 2014-05-08 19:13:09.000000000 +1000
  66. @@ -1,7 +1,5 @@
  67. usr/bin
  68. -usr/lib/girepository-1.0
  69. -usr/lib/gitg/gitg
  70. -usr/lib/python3.4/site-packages/gi/overrides/*.py
  71. +usr/lib/*/gitg/gitg
  72. usr/share/appdata
  73. usr/share/applications
  74. usr/share/icons
  75. diff -Nru gitg-0.3.2/debian/libgitg0.install gitg-0.3.2/debian/libgitg0.install
  76. --- gitg-0.3.2/debian/libgitg0.install 2014-05-08 16:42:28.000000000 +1000
  77. +++ gitg-0.3.2/debian/libgitg0.install 2014-05-08 17:12:15.000000000 +1000
  78. @@ -1 +1 @@
  79. -usr/lib/gitg/*.so*
  80. +usr/lib/*/gitg/*.so*
  81. diff -Nru gitg-0.3.2/debian/rules gitg-0.3.2/debian/rules
  82. --- gitg-0.3.2/debian/rules 2014-05-08 10:26:26.000000000 +1000
  83. +++ gitg-0.3.2/debian/rules 2014-05-08 17:14:52.000000000 +1000
  84. @@ -2,6 +2,7 @@
  85.  
  86. DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  87. DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  88. +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH).
  89.  
  90. export DEB_BUILD_MAINT_OPTIONS=hardening=+all
  91.  
  92. @@ -9,7 +10,7 @@
  93. export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed
  94.  
  95. %:
  96. - dh $@ --with autoreconf
  97. + dh $@ --with autoreconf,gir,python3
  98.  
  99. # use --as-needed only if supported by dh-autoreconf (to simplify backporting)
  100. DH_AS_NEEDED=$(shell dpkg --compare-versions $$(dpkg --status dh-autoreconf | grep Version | cut -d' ' -f2) ge 6 && echo --as-needed)
  101. @@ -21,7 +22,7 @@
  102. override_dh_auto_configure:
  103. dh_auto_configure -- \
  104. --prefix=/usr \
  105. - --libdir=/usr/lib/gitg \
  106. + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gitg \
  107. --sysconfdir=/usr/share \
  108. --build=$(DEB_BUILD_GNU_TYPE) \
  109. --disable-silent-rules
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement