change : debian package list.

diff --git a/debian/changelog b/debian/changelog
index 0491df7..8b83975 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+valgrind-3.5 (3.5.0-2slp2) unstable; urgency=low
+
+  * change into git version.
+
+ -- HyungJong Shin <hj_shin@samsung.com>  Fri, 16 Jul 2010 15:56:34 +0900
+
+valgrind-3.5 (3.5.0-1slp2) unstable; urgency=low
+
+  * package list changes.
+
+ -- HyungJong Shin <hj_shin@samsung.com>  Thu, 15 Jul 2010 15:43:11 +0900
+
 valgrind (1.0.0-2slp2) unstable; urgency=low
 
   * Change version policy

diff --git a/debian/control b/debian/control
index c0628d8..6e8a22d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,18 @@
-Source: valgrind
+Source: valgrind-3.5
 Section: devel
 Priority: optional
-Maintainer: Mike McCormack <mj.mccormack@samsung.com>
-Uploaders: Sunghyun Kwon <sh0701.kwon@samsung.com>
-Build-Depends: debhelper (>> 3.0.0), libc6-dev (>> 2.3.0), autotools-dev, dpatch (>> 2.0.0), gdb, gcc-multilib [amd64] | gcc-4.1 (<< 4.1.2) [amd64]
-Standards-Version: 3.7.3.0
+Maintainer: HyungJong Shin <hj_shin@samsung.com>
+Build-Depends: debhelper (>= 5) 
+Standards-Version: 0.1.0
+
+Package: valgrind-dev
+Section: libs
+Architecture: i386
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Valgrind Development Headers & Documents
 
 Package: valgrind
-Architecture: i386 
-Depends: ${shlibs:Depends}
-Conflicts: valgrind-callgrind
-Provides: valgrind-callgrind
-Suggests: libc6-dbg, kcachegrind, alleyoop
-Recommends: gdb
-Description: A memory debugger and profiler
- Valgrind is a GPL'd tool to help you find memory-management problems in your
- programs. When a program is run under Valgrind's supervision, all reads and
- writes of memory are checked, and calls to malloc/new/free/delete are
- intercepted. 
- .
- Valgrind can debug more or less any dynamically-linked ELF x86/Linux, 
- amd64/Linux and ppc/Linux executables, without modification, recompilation, 
- or anything.
- .
- Valgrind provides a generic infrastructure for supervising the execution of
- programs called "tools". This is done by providing a way to instrument 
- programs in very precise ways, making it relatively easy to support 
- activities such as dynamic error detection and profiling. The Valgrind 
- distribution currently includes three tools: a memory error detectors, a 
- cache (time) profiler and a heap (space) profiler.
- 
+Section: utility
+Architecture: i386
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Valgrind Utility

diff --git a/debian/files b/debian/files
index 575b748..9cb94a3 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1 +1,2 @@
-valgrind_1.0.0-1_i386.deb devel optional
+valgrind-dev_3.5.0-1slp2_i386.deb libs optional
+valgrind_3.5.0-1slp2_i386.deb utility optional

diff --git a/debian/rules b/debian/rules
index 1c7034a..3a6c1f2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,17 @@
 
 include /usr/share/dpatch/dpatch.make
 
+TARGET = valgrind_install
+
+PREFIX ?= /usr
+
 config.sub config.guess: %: /usr/share/misc/%
        cp -a $< $@
 
 config.status: config.sub config.guess
        dh_testdir
        cat xfree-4.supp debian/debian.supp > debian.supp
-       ./configure --prefix=/usr \
+       ./configure --prefix=$(PREFIX) \
                --mandir=\$${prefix}/share/man
 
 build: build-stamp
@@ -16,24 +20,42 @@ build: build-stamp
 build-stamp:  config.status
        dh_testdir
        $(MAKE)
-       touch build-stamp
+       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
+               cat $$f > $${f%.in}; \
+               sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
+               sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
+       done
+
+       touch $@
 
 clean:  $(MAKE) clean
        dh_testdir
        dh_testroot
        rm -f build-stamp 
+
+       # Add here commands to clean up after the build process.
        -$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+       cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+       cp -f /usr/share/misc/config.guess config.guess
+endif
+
+       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
+               rm -f $${f%.in}; \
+       done
+
        dh_clean
 
-target=$(CURDIR)/debian/valgrind
+target=$(CURDIR)/debian/$(TARGET)
 install: build
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs 
 
-       $(MAKE) install prefix=$(CURDIR)/debian/valgrind/usr
-
+       $(MAKE) DESTDIR=$(target) install
        # Debian stuff
        cp -f debian/debian-libc6-dbg.supp $(target)/usr/lib/valgrind
        mv -f $(target)/usr/bin/valgrind $(target)/usr/bin/valgrind.bin
@@ -54,12 +76,13 @@ binary-arch: build install
        dh_testroot
        dh_installdocs
        dh_installexamples
-       dh_installmenu
        dh_installchangelogs NEWS
+       dh_install --list-missing --sourcedir=debian/$(TARGET)
        dh_link
-       #dh_strip
+       dh_strip
        dh_compress
        dh_fixperms
+       dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol

diff --git a/debian/valgrind-dev.install.in b/debian/valgrind-dev.install.in
new file mode 100644 (file)
index 0000000..37cb2a3
--- /dev/null
+++ b/debian/valgrind-dev.install.in
@@ -0,0 +1,2 @@
+@PREFIX@/include/*
+@PREFIX@/share/*

diff --git a/debian/valgrind.install.in b/debian/valgrind.install.in
new file mode 100644 (file)
index 0000000..cd9fbc8
--- /dev/null
+++ b/debian/valgrind.install.in
@@ -0,0 +1,2 @@
+@PREFIX@/bin/*
+@PREFIX@/lib/*

diff --git a/debian/valgrind/DEBIAN/control b/debian/valgrind/DEBIAN/control
index ccd1ee3..95ad192 100644 (file)
--- a/debian/valgrind/DEBIAN/control
+++ b/debian/valgrind/DEBIAN/control
@@ -1,27 +1,9 @@
 Package: valgrind
-Version: 1.0.0-1
+Source: valgrind-3.5
+Version: 3.5.0-1slp2
 Architecture: i386
-Maintainer: Mike McCormack <mj.mccormack@samsung.com>
-Installed-Size: 56136
-Recommends: gdb
-Suggests: libc6-dbg, kcachegrind, alleyoop
-Conflicts: valgrind-callgrind
-Provides: valgrind-callgrind
-Section: devel
+Maintainer: HyungJong Shin <hj_shin@samsung.com>
+Installed-Size: 21116
+Section: utility
 Priority: optional
-Description: A memory debugger and profiler
- Valgrind is a GPL'd tool to help you find memory-management problems in your
- programs. When a program is run under Valgrind's supervision, all reads and
- writes of memory are checked, and calls to malloc/new/free/delete are
- intercepted.
- .
- Valgrind can debug more or less any dynamically-linked ELF x86/Linux,
- amd64/Linux and ppc/Linux executables, without modification, recompilation,
- or anything.
- .
- Valgrind provides a generic infrastructure for supervising the execution of
- programs called "tools". This is done by providing a way to instrument
- programs in very precise ways, making it relatively easy to support
- activities such as dynamic error detection and profiling. The Valgrind
- distribution currently includes three tools: a memory error detectors, a
- cache (time) profiler and a heap (space) profiler.
+Description: Valgrind Utility

diff --git a/debian/valgrind/DEBIAN/md5sums b/debian/valgrind/DEBIAN/md5sums
index b930008..ec26b6a 100644 (file)
--- a/debian/valgrind/DEBIAN/md5sums
+++ b/debian/valgrind/DEBIAN/md5sums
@@ -1,110 +1,35 @@
-4ae6e4f917a160ad4485384c464ffe8a  usr/include/valgrind/pub_tool_clreq.h
-22e6d34b4d51455872b4bc1c041d5561  usr/include/valgrind/pub_tool_xarray.h
-359cc0a78af71ec69d02508cbe897f58  usr/include/valgrind/pub_tool_threadstate.h
-e70c525679f8edd0a074905028d01986  usr/include/valgrind/libvex_guest_ppc32.h
-15427eadf6667d3504bb4a3e9c149bee  usr/include/valgrind/pub_tool_oset.h
-9290e85a737bf052598334941719d888  usr/include/valgrind/pub_tool_libcsignal.h
-70f7717a93645dae31d8d146d2bd1169  usr/include/valgrind/pub_tool_clientstate.h
-1de2b24de02604efba4c446d3c14179e  usr/include/valgrind/libvex_trc_values.h
-161fbc379878c24aea299d4514339f10  usr/include/valgrind/pub_tool_options.h
-6ac06d0fef5d95c614b73a78f02dbb24  usr/include/valgrind/libvex_guest_offsets.h
-09fe4dd629189ca1fc506a1f0c95822a  usr/include/valgrind/pub_tool_tooliface.h
-4ecf208eea211774d1bbd9864cdf7743  usr/include/valgrind/pub_tool_aspacemgr.h
-1ebb7959df267b9676e00001c24ee8fb  usr/include/valgrind/pub_tool_machine.h
-98d950ed66b67627ac30dd56e13a1e0b  usr/include/valgrind/pub_tool_wordfm.h
-a890d7fde1a23df7b8aa28409444e7c8  usr/include/valgrind/pub_tool_libcbase.h
-4687b51e0b623a5218f13b2a462b5915  usr/include/valgrind/pub_tool_vkiscnums_asm.h
-514b83cf57f4319e5a98fe84b66f9c44  usr/include/valgrind/pub_tool_signals.h
-4fe4a7cd225872742d97c6bc19863b3c  usr/include/valgrind/helgrind.h
-cbb925fc4ff346359eadcd74c4857585  usr/include/valgrind/drd.h
-4eacc8278e9b398362453516b458410c  usr/include/valgrind/pub_tool_basics.h
-f29569356b78d03aaddf3225d1d5d1ac  usr/include/valgrind/pub_tool_basics_asm.h
-a637428acd6298024b89bdddeacb4071  usr/include/valgrind/pub_tool_replacemalloc.h
-ce5ac6ea51d50380074fec6c54355314  usr/include/valgrind/libvex_emwarn.h
-e9135d164900fc029fbc2f1c7191af92  usr/include/valgrind/pub_tool_errormgr.h
-e527dad02f04fc93db02388361a92c0e  usr/include/valgrind/pub_tool_sparsewa.h
-08dae949870506b2f467ea4f777245d4  usr/include/valgrind/libvex_guest_ppc64.h
-4119440435d428ceb7d81804c3dfb99a  usr/include/valgrind/pub_tool_mallocfree.h
-430e4f4cf32b5433a7bc53b5ddd0fa99  usr/include/valgrind/memcheck.h
-ae01d82f2171cef05f5a02a5728448f3  usr/include/valgrind/pub_tool_stacktrace.h
-1bbbe347bdd5d727ad49a00bdb03808d  usr/include/valgrind/libvex_ir.h
-44340a7ee527423a7d7f170b576c23a7  usr/include/valgrind/pub_tool_libcproc.h
-68cb51339fff6ae251041c6b94fcc3b3  usr/include/valgrind/vki/vki-posixtypes-x86-linux.h
-4421ab85803370f4a419a9e0bd0bac49  usr/include/valgrind/vki/vki-scnums-ppc32-linux.h
-65d331bb7845e77d4448302090235ce6  usr/include/valgrind/vki/vki-posixtypes-ppc32-linux.h
-57010ab5e278dd645227a8e46b8d4fd6  usr/include/valgrind/vki/vki-linux.h
-93c4d26452f90bc8ca575c097a39c9b7  usr/include/valgrind/vki/vki-amd64-linux.h
-4968f8ecb8de473a98e3878ff2f1c18f  usr/include/valgrind/vki/vki-scnums-amd64-linux.h
-1e3fa1ae36570a9faf0a9b3ae0789fea  usr/include/valgrind/vki/vki-x86-linux.h
-072f05c2829817579a0b84ed9df3cebf  usr/include/valgrind/vki/vki-posixtypes-ppc64-linux.h
-6246829035b6d887b8b4105b1b95ade1  usr/include/valgrind/vki/vki-scnums-x86-linux.h
-d3381add35d6a991c287afaffe692ead  usr/include/valgrind/vki/vki-darwin.h
-b5b559bbd70b96774f4d0982caf2e675  usr/include/valgrind/vki/vki-ppc32-linux.h
-2ac2e786cf84cebd0efd4056a4ae5981  usr/include/valgrind/vki/vki-scnums-darwin.h
-f4ca4f2113d65b04f488556416ce9981  usr/include/valgrind/vki/vki-posixtypes-amd64-linux.h
-b3005e4d46272a4f58f3343f6fd33aee  usr/include/valgrind/vki/vki-ppc64-linux.h
-3f23272affb4003cc966476c62c3c507  usr/include/valgrind/vki/vki-scnums-ppc64-linux.h
-318bf167510eec9ab7fc250b80f40018  usr/include/valgrind/libvex_guest_x86.h
-db7510f874ce3c32593d5a226a347c9f  usr/include/valgrind/libvex_guest_amd64.h
-da5eaa67e017d557fae3c47fc9af62d3  usr/include/valgrind/callgrind.h
-b5f4eed0320ee5682727fa6c640e858c  usr/include/valgrind/pub_tool_cpuid.h
-af98981a66395d7d506c9653aa6b8c1f  usr/include/valgrind/libvex_basictypes.h
-c5b176f66f83374640d736f23200d781  usr/include/valgrind/pub_tool_debuginfo.h
-332d7493d341e110b6b23fac8ae4d58b  usr/include/valgrind/pub_tool_vkiscnums.h
-e94cc82ce4897d5e2bceb81ff026fec5  usr/include/valgrind/pub_tool_libcprint.h
-a0f0198b9c54f1a415a006930b5a59b1  usr/include/valgrind/libvex_guest_arm.h
-1e3fe23124eaf4349954d590d3b669cd  usr/include/valgrind/pub_tool_hashtable.h
-78e8098e5359b1ed5c8d3f4be519a506  usr/include/valgrind/pub_tool_vki.h
-b09d1c31e53a2dc52fe2da8821645b4c  usr/include/valgrind/pub_tool_libcfile.h
-d65d5859175e57e7eff56c383b5e431a  usr/include/valgrind/pub_tool_libcassert.h
-5a309679da464fd5130e1e0e1d1d233d  usr/include/valgrind/pub_tool_aspacehl.h
-a1fdefb9099c43ee9b20e00d64f199ff  usr/include/valgrind/pub_tool_redir.h
-2bdb1c23f24375f69d4cde5cd46edc39  usr/include/valgrind/pub_tool_execontext.h
-4d9283faf4350f2fb2f8541d1863e6cd  usr/include/valgrind/pub_tool_seqmatch.h
-1481e7893fd451ad0e465f4769127dc6  usr/include/valgrind/libvex.h
-800c3a879a88f315a35f80b4261f72d0  usr/include/valgrind/valgrind.h
-513d7a069a75e630d61e7cb8b5f1aa30  usr/lib/valgrind/vgpreload_helgrind-x86-linux.so
-bb88f94e235e1fcfbf9993f9fff59b76  usr/lib/valgrind/debian.supp
-90ea71f56f932c77398935eaa64f7937  usr/lib/valgrind/memcheck-x86-linux
-98183ef6b47e4837aa08e437e2d7a5fa  usr/lib/valgrind/drd-x86-linux
-c160c2ed5899844322d59e35203d9fc1  usr/lib/valgrind/vgpreload_memcheck-x86-linux.so
-944c1a4153f8333727adbd2fc998c8c5  usr/lib/valgrind/helgrind-x86-linux
-dc986496b345d67a05eb89b22f202bb3  usr/lib/valgrind/callgrind-x86-linux
-270476421fb464c339418cca6f0db3b1  usr/lib/valgrind/exp-ptrcheck-x86-linux
-c8deb51759fd8da5b11d0214c94f5bd5  usr/lib/valgrind/massif-x86-linux
-9a0c1a9845cfbf08058c8b09969e63ef  usr/lib/valgrind/vgpreload_core-x86-linux.so
-b9659fec2997200a2a827796861bd099  usr/lib/valgrind/vgpreload_exp-ptrcheck-x86-linux.so
+60250d2d058b62ab4b8543ace044912f  usr/share/doc/valgrind/changelog.Debian.gz
+3e8e98666f52ac6d188481b74c476cce  usr/share/doc/valgrind/changelog.gz
+9ceb71e9885a7a299113e426f1e3dd45  usr/share/doc/valgrind/copyright
+df5401306317c8fda9e7b7659853760c  usr/lib/pkgconfig/valgrind.pc
+99bc53b91b105320f309a88f481d3a69  usr/lib/valgrind/lackey-x86-linux
 1bc9c0b67ac65b620a510227c69eb529  usr/lib/valgrind/debian-libc6-dbg.supp
+3fe3f1b7ed73294d842d1c82c501e46b  usr/lib/valgrind/vgpreload_memcheck-x86-linux.so
+6be07fa78578809ce5d157ddb565414a  usr/lib/valgrind/massif-x86-linux
+686e9479c65dc5eab3e78ecdd27ca849  usr/lib/valgrind/vgpreload_drd-x86-linux.so
+a4d4d5e08f56e2aee8f864b11c9360ba  usr/lib/valgrind/libreplacemalloc_toolpreload-x86-linux.a
 7e8efde93b81d116bb0d769a1223dc6d  usr/lib/valgrind/default.supp
-b6807f73748fe12bded9243967ac90a2  usr/lib/valgrind/libcoregrind-x86-linux.a
-f595be4f33231f500ef759eb896c66b0  usr/lib/valgrind/cachegrind-x86-linux
-552bff9b0e989fef86b5240b04e201a6  usr/lib/valgrind/libreplacemalloc_toolpreload-x86-linux.a
-f4eccc736c1cc9d12f4274397af6d6f2  usr/lib/valgrind/exp-bbv-x86-linux
-e217174dcbf7b6a856936d1998f658e3  usr/lib/valgrind/vgpreload_drd-x86-linux.so
-5a80333d5231ff5da2c15f9b268ca665  usr/lib/valgrind/none-x86-linux
-bce1897f260ec6472c5e3482d4c87b6f  usr/lib/valgrind/libvex-x86-linux.a
-002d6ab99b2badc7c10364e72d3f6588  usr/lib/valgrind/lackey-x86-linux
-88f2329975f704128e66cef9d215eda9  usr/lib/valgrind/vgpreload_massif-x86-linux.so
-df5401306317c8fda9e7b7659853760c  usr/lib/pkgconfig/valgrind.pc
-ff2a777b5d54d65d80c840a50dd4910e  usr/share/lintian/overrides/valgrind
-5a48702de7f9c6298923c3f7c07ea62b  usr/share/doc/valgrind/AUTHORS
-d50b41bcb59aa8b5d0568bdeae711e24  usr/share/doc/valgrind/README_MISSING_SYSCALL_OR_IOCTL.gz
-e4ccb8a7d0991fda971ba89b5989856a  usr/share/doc/valgrind/README
-805d0c4c312ece8964de8ee652872544  usr/share/doc/valgrind/valgrind_manual.ps.gz
-bd13243b9897b0b45ee675ca36201d64  usr/share/doc/valgrind/ACKNOWLEDGEMENTS
-4d8eea15aa714f6932f9ae0f619b0465  usr/share/doc/valgrind/valgrind_manual.pdf.gz
-745868561a74f95ad006d4a354c070ea  usr/share/doc/valgrind/changelog.gz
-358cfd52891f626c41ccf6a78edbf368  usr/share/doc/valgrind/NEWS.gz
-c4feaa9e57a3ba636e54607f9d1ec463  usr/share/doc/valgrind/changelog.Debian.gz
-c0219603eabcbebfe0d872b73fcd55a5  usr/share/doc/valgrind/README.Debian
-9ceb71e9885a7a299113e426f1e3dd45  usr/share/doc/valgrind/copyright
-08b39d422d170f2a8ff465fc8f8e55e4  usr/share/doc/valgrind/FAQ.txt.gz
-af66683c8b428aecf197636f9a3ddd60  usr/bin/valgrind-listener
-75e484884c5083f307c8f3e00f2b02fd  usr/bin/cg_annotate
+2d3f2ea3fcb055bf0017ba1ba21ee20d  usr/lib/valgrind/memcheck-x86-linux
+b84210609fcf94a00805825a65592ddb  usr/lib/valgrind/none-x86-linux
+83cdb23038309a64102b89060cfd6948  usr/lib/valgrind/drd-x86-linux
+4bc47d4ad8a6a4620d5b8425fe41102c  usr/lib/valgrind/helgrind-x86-linux
+e57e1974a0587e65867c0c7f1e611ae8  usr/lib/valgrind/cachegrind-x86-linux
+4530d80e1952c9337a200958db30dca6  usr/lib/valgrind/vgpreload_core-x86-linux.so
+8c31e3f531b12e69555b569345d729ff  usr/lib/valgrind/callgrind-x86-linux
+b58cff6dd62b551eef854a52e266e068  usr/lib/valgrind/vgpreload_exp-ptrcheck-x86-linux.so
+144b30250906a637802d7fe68cb64662  usr/lib/valgrind/vgpreload_massif-x86-linux.so
+bb88f94e235e1fcfbf9993f9fff59b76  usr/lib/valgrind/debian.supp
+e8ac2869947bb9a5c4389fc4b9955c8c  usr/lib/valgrind/vgpreload_helgrind-x86-linux.so
+af21dcad87d40f49127332587426eae0  usr/lib/valgrind/exp-bbv-x86-linux
+a47338e1ef75764b1903caf60c435847  usr/lib/valgrind/libvex-x86-linux.a
+78f198626fd3c8d75a5df89c2e3fca78  usr/lib/valgrind/libcoregrind-x86-linux.a
+2eb1a017987c3752da3250354b350347  usr/lib/valgrind/exp-ptrcheck-x86-linux
 9e886878e3f379a30ac7e1d8ca9a25ad  usr/bin/ms_print
+467298f24acdf2ea169da6247c27ab07  usr/bin/valgrind-listener
+29174aabcea42548f91a89bf4c128d81  usr/bin/cg_merge
 03168075be3d79359977ed6921dd53b4  usr/bin/callgrind_control
-cc064c88a9ffcae57983a9b19f93bafb  usr/bin/no_op_client_for_valgrind
 2f89db0a2d173a6578a864fb77e39b2c  usr/bin/callgrind_annotate
+75e484884c5083f307c8f3e00f2b02fd  usr/bin/cg_annotate
+af6216013db54ab2d5d93c41c3f19253  usr/bin/no_op_client_for_valgrind
+2bb1b03016c3b431b54ae3f1ae34beab  usr/bin/valgrind.bin
 fe064e3725bf5d395630fc5bd1f7fbb8  usr/bin/valgrind
-92a32c8f599a298ca49ef2a34638bbd7  usr/bin/cg_merge
-887ce4693e8f0ea6bd61f7cd59203ad5  usr/bin/valgrind.bin