Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update smem to 1.5-3 #1

Merged
merged 1 commit into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .hg_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
repo: b766f49fbebce8e19fda80b963afcec64b47e75c
node: 98273ce331bb8b8e19835a77a207ab4fb9424731
branch: default
tag: 1.5
7 changes: 7 additions & 0 deletions .hgtags
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
f168a8d93ec6e3f89229008f5b3f4d7d3f5e169a 0.1
708dd2e1b91a40cdd6b490141ed75be84a524773 0.9
4f6b9d5b28e8e7baf5ba28a24d511dd86f7bc09d 1.0
26f344c53f557da07dacb6fc5cb7ffc525b95e7e 1.1
43b2990040791b5ed445ed769d680556a595ac92 1.2
ee281c13f31d4609706b106f6fbec3ba4f7f7870 1.3
e143c8fdb6f55d779bbc34f427c9f8eaee1286a8 1.4
339 changes: 339 additions & 0 deletions COPYING

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion README.md

This file was deleted.

141 changes: 138 additions & 3 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,140 @@
template-repository (1.0-1) unstable; urgency=medium
smem (1.5-3) unstable; urgency=medium

* Initial release
* Team Upload
* Set DPT as Maintainer per new Team Policy
* Use new dh-sequence-python3
* Set Rules-Requires-Root: no

-- Tsic404 <liuheng@deepin.org> Sat, 28 Jan 2023 13:46:49 +0800
[ Debian Janitor ]
* Remove constraints unnecessary since buster:
+ Build-Depends: Drop versioned constraint on dpkg-dev.
+ smem: Drop versioned constraint on secure-delete in Conflicts.
+ smemcap: Drop versioned constraint on smem in Replaces.
+ smemcap: Drop versioned constraint on smem in Breaks.
* Use secure URI in Homepage field.
* Bump debhelper from deprecated 9 to 13.
* Apply multi-arch hints. + smem: Add Multi-Arch: foreign.

-- Alexandre Detiste <tchet@debian.org> Thu, 22 Aug 2024 18:24:43 +0200

smem (1.5-2) unstable; urgency=medium

[ Ondřej Nový ]
* d/control: Update Vcs-* fields with new Debian Python Team Salsa
layout.

[ Sandro Tosi ]
* Use the new Debian Python Team contact name and address

-- Sandro Tosi <morph@debian.org> Sun, 17 Apr 2022 22:58:17 -0400

smem (1.5-1.1) unstable; urgency=medium

* Non-maintainer upload.
* Add patch from Marco Paganini for Python 3 incompatibility
in "smem --bar". (Closes: #958129)

-- Adrian Bunk <bunk@debian.org> Sat, 17 Jul 2021 22:47:50 +0300

smem (1.5-1) unstable; urgency=medium

[ Ondřej Nový ]
* d/control: Deprecating priority extra as per policy 4.0.1
* d/changelog: Remove trailing whitespaces
* d/control: Remove trailing whitespaces
* d/control: Remove ancient X-Python-Version field
* Use debhelper-compat instead of debian/compat.

[ Sandro Tosi ]
* New upstream release; Closes: #888098, #931119
* Switch to python3; Closes: #938505

-- Sandro Tosi <morph@debian.org> Sat, 04 Jan 2020 22:57:10 -0500

smem (1.4-2) unstable; urgency=medium

* Adjust Vcs-Svn URL.
* Bump standards to 3.9.6.

-- Michal Čihař <nijel@debian.org> Mon, 06 Oct 2014 09:32:59 +0200

smem (1.4-1) unstable; urgency=low

* New upstream release.
* Bump standards to 3.9.5.

-- Michal Čihař <nijel@debian.org> Mon, 09 Dec 2013 18:44:41 +0100

smem (1.3-3) unstable; urgency=low

* Add missing conflicts after package split (Closes: #717291).

-- Michal Čihař <nijel@debian.org> Wed, 24 Jul 2013 16:01:41 +0200

smem (1.3-2) unstable; urgency=low

* Bump standards to 3.9.4.
* Use debhelper 9.
* Properly use CPPFLAGS while compiling helper.
* Split smemcap utility to separate package (to allow installation on
embedded systems).
* Adjust manpage to reference smemcap package (LP: #1079856).

-- Michal Čihař <nijel@debian.org> Mon, 17 Jun 2013 09:57:12 +0200

smem (1.3-1) unstable; urgency=low

[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.

[ Michal Čihař ]
* New upstream release.
- Fixes -S (Closes: #701007).

-- Michal Čihař <nijel@debian.org> Tue, 07 May 2013 11:05:04 +0200

smem (1.2-1) unstable; urgency=low

* New upstream release (Closes: #692021).
* Build and install smemcap (Closes: #692020).
* Bump standards to 3.9.3.
* Fix - used in manpages.

-- Michal Čihař <nijel@debian.org> Thu, 01 Nov 2012 14:17:11 +0100

smem (1.0-1) unstable; urgency=low

* New upstream version.
* All patches intergrated upstream.
* Switch to dh_python2.

-- Michal Čihař <nijel@debian.org> Mon, 21 Feb 2011 11:07:59 +0100

smem (0.9-4) unstable; urgency=low

* Build depend on Python (Closes: #611589).
* Bump standards to 3.9.1.

-- Michal Čihař <nijel@debian.org> Mon, 31 Jan 2011 09:33:56 +0100

smem (0.9-3) unstable; urgency=low

* Relax conflict with secure-delete to older versions as 3.1-5 has renamed
smem binary.

-- Michal Čihař <nijel@debian.org> Wed, 06 Jan 2010 09:58:42 +0100

smem (0.9-2) unstable; urgency=low

* Use bash for capture example, it uses bashisms which are not easy to
avoid.
* Add conflict with secure-delete which also provides smem binary
(Closes: #562228).

-- Michal Čihař <nijel@debian.org> Sat, 02 Jan 2010 12:33:45 +0100

smem (0.9-1) unstable; urgency=low

* Initial release (Closes: #562179).

-- Michal Čihař <nijel@debian.org> Wed, 23 Dec 2009 15:23:41 +0100
1 change: 0 additions & 1 deletion debian/compat

This file was deleted.

51 changes: 39 additions & 12 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,15 +1,42 @@
Source: template-repository
Section: unknown
Source: smem
Section: utils
Priority: optional
Maintainer: Tsic404 <liuheng@deepin.org>
Build-Depends: debhelper (>= 11)
Standards-Version: 4.1.3
Homepage: https://github.com/deepin-community/template-repository
#Vcs-Browser: https://salsa.debian.org/debian/deepin-community-template-repository
#Vcs-Git: https://salsa.debian.org/debian/deepin-community-template-repository.git
Maintainer: Debian Python Team <team+python@tracker.debian.org>
Uploaders: Michal Čihař <nijel@debian.org>,
Build-Depends:
debhelper-compat (= 13),
python3,
dh-sequence-python3,
Rules-Requires-Root: no
Standards-Version: 3.9.6
Vcs-Git: https://salsa.debian.org/python-team/packages/smem.git
Vcs-Browser: https://salsa.debian.org/python-team/packages/smem
Homepage: https://www.selenic.com/smem/

Package: template-repository
Package: smem
Architecture: all
Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
Recommends: python3-matplotlib
Multi-Arch: foreign
Description: memory reporting tool
Tool that can give numerous reports on memory usage on Linux systems.
Unlike existing tools, smem can report proportional set size (PSS),
which is a more meaningful representation of the amount of memory used
by libraries and applications in a virtual memory system.
.
This package contains main tool which can also process data collected
by smemcap.

Package: smemcap
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: <insert up to 60 chars description>
<insert long description, indented with spaces>
Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
Description: data collection tool for memory reporting
Tool that can give numerous reports on memory usage on Linux systems.
Unlike existing tools, smem can report proportional set size (PSS),
which is a more meaningful representation of the amount of memory used
by libraries and applications in a virtual memory system.
.
This package contains smemcap utility, which can be used to collect
data on resource constrained systems without depending on Python.
.
The captured data can be processed by smem program.
55 changes: 33 additions & 22 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: template-repository
Source: https://github.com/deepin-community/template-repository

Files: *
Copyright: 2023 Tsic404 <liuheng@deepin.org>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
This package was debianized by Michal Čihař <nijel@debian.org> on
Wed, 23 Dec 2009 15:20:42 +0100.

It was downloaded from <http://www.selenic.com/smem/download/>

Upstream Author:

Matt Mackall

Copyright:

Copyright 2008-2009 Matt Mackall <mpm@selenic.com>

License:

This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 or later
as published by the Free Software Foundation.

This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.

The Debian packaging is Copyright (C) 2009, Michal Čihař
<nijel@debian.org> and is licensed under the GPL, see above.
2 changes: 2 additions & 0 deletions debian/gbp.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[DEFAULT]
debian-branch=debian/master
14 changes: 14 additions & 0 deletions debian/patches/buildsystem.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
From: Michal Čihař <nijel@debian.org>
Subject: Add simple buildsystem
Forwarded: no

--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+all: smemcap
+
+smemcap: smemcap.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -o $@
+
+clean:
+ rm -f smemcap
46 changes: 46 additions & 0 deletions debian/patches/manpage.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From: Michal Čihař <nijel@debian.org>
Subject: Minor fixes to manpage
Forwarded: no

--- a/smem.8
+++ b/smem.8
@@ -48,7 +48,7 @@ source tree.)
Amount of physical RAM. This lets smem detect the amount of memory used
by firmware/hardware in the systemwide (\-w) output. If provided, it
will also be used as the total memory size to base percentages on.
-Example: --realmem=1024M
+Example: \-\-realmem=1024M

.TP
.BI "\-S " SOURCE ", \-\-source=" SOURCE
@@ -158,25 +158,23 @@ The matplotlib library

.SH EMBEDDED USAGE
To capture memory statistics on resource\-constrained systems, the
-the \fBsmem\fP source includes a utility named \fBsmemcap\fP.
+the \fBsmemcap\fP package includes a utility named \fBsmemcap\fP.
\fBsmemcap\fP captures all /proc entries required by \fBsmem\fP
and outputs them as an uncompressed .tar file to STDOUT.
\fBsmem\fP can analyze the output using the \fB\-\-source\fP option.
\fBsmemcap\fP is small and does not require Python.
.PP
To use \fBsmemcap\fP:
-.IP 1. 3
-Obtain the smem source at http://selenic.com/repo/smem
+.IP 1.
+Install package smemcap on target system.
.IP 2.
-Compile \fIsmemcap.c\fP for your target system.
-.IP 3.
Run \fBsmemcap\fP on the target system and save the output:
.br
smemcap > memorycapture.tar
-.IP 4.
+.IP 3.
Copy the output to another machine and run smem on it:
.br
-smem -S memorycapture.tar
+smem \-S memorycapture.tar

.SH FILES
.I /proc/$pid/cmdline
4 changes: 4 additions & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
manpage.patch
buildsystem.patch
smem-py3k.patch
smem-xrange-fix.patch
8 changes: 8 additions & 0 deletions debian/patches/smem-py3k.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/smem
+++ b/smem
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# smem - a tool for meaningful memory reporting
#
11 changes: 11 additions & 0 deletions debian/patches/smem-xrange-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- original/smem 2020-04-18 12:20:22.524849106 -0700
+++ fixed/smem 2020-04-18 12:19:24.912251338 -0700
@@ -646,7 +646,7 @@

pl = []
ind = numpy.arange(len(l))
- for n in xrange(len(rc)):
+ for n in range(len(rc)):
pl.append(pylab.bar(ind + offset + width * n,
[x[1][rc[n]] for x in l], width, color=gc(n)))

2 changes: 2 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/make -f

#export DH_VERBOSE=1

%:
dh $@
1 change: 1 addition & 0 deletions debian/smem.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
smem usr/bin
1 change: 1 addition & 0 deletions debian/smem.manpages
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
smem.8
Loading
Loading