~sircmpwn/sr.ht-packages

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
5 2

[PATCH core.sr.ht-deb 1/2] bump debhelper compat to 13

Details
Message ID
<20210430153127.835384-1-tb46305@gmail.com>
DKIM signature
pass
Download raw message
Patch: +1 -2
Signed-off-by: Armin Weigl <tb46305@gmail.com>
---
 debian/compat  | 1 -
 debian/control | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 debian/compat

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
@@ -1 +0,0 @@
11
diff --git a/debian/control b/debian/control
index 0a59972..ed36d21 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: core.sr.ht
Section: misc
Priority: optional
Maintainer: Denis Laxalde <denis@laxalde.org>
Build-Depends: debhelper (>= 11),
Build-Depends: debhelper-compat (= 13),
  dh-python,
  python3-all,
  python3-setuptools,
-- 
2.30.2

[PATCH core.sr.ht-deb 2/2] split out python3-srht-dev

Details
Message ID
<20210430153127.835384-2-tb46305@gmail.com>
In-Reply-To
<20210430153127.835384-1-tb46305@gmail.com> (view parent)
DKIM signature
pass
Download raw message
Patch: +24 -1
Signed-off-by: Armin Weigl <tb46305@gmail.com>
---
 debian/control                           | 15 +++++++++++++++
 debian/install                           |  5 +++++
 debian/not-installed                     |  1 +
 debian/python3-srht-dev.install          |  3 +++
 debian/{links => python3-srht-dev.links} |  0
 debian/rules                             |  1 -
 6 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100755 debian/install
 create mode 100644 debian/not-installed
 create mode 100644 debian/python3-srht-dev.install
 rename debian/{links => python3-srht-dev.links} (100%)

diff --git a/debian/control b/debian/control
index ed36d21..4d320bf 100644
--- a/debian/control
+++ b/debian/control
@@ -28,3 +28,18 @@ Description: shared library for sr.ht (Python 3)
 development projects.
 .
 This package installs the core library for Python 3.

Package: python3-srht-dev
Architecture: all
Depends:
  ${python3:Depends},
  ${misc:Depends},
  python3-srht (= ${binary:Version}),
  cleancss,
  sassc,
  libjs-bootstrap4,
Description: shared library for sr.ht (Python 3) (development files)
 Sourcehut (a.k.a. sr.ht) is a software suite for managing your software
 development projects.
 .
 This package installs the development files for Python 3.
diff --git a/debian/install b/debian/install
new file mode 100755
index 0000000..baf8131
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,5 @@
#!/bin/sh
echo usr/bin
echo 'usr/lib/python3.*/dist-packages/srht-*.egg-info'
echo 'usr/lib/python3.*/dist-packages/srht/templates'
find debian/tmp -name '*.py' -or -name '*.pyc'
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..53fde12
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1 @@
usr/lib/python3.*/dist-packages/srht/package.json
diff --git a/debian/python3-srht-dev.install b/debian/python3-srht-dev.install
new file mode 100644
index 0000000..937e37f
--- /dev/null
+++ b/debian/python3-srht-dev.install
@@ -0,0 +1,3 @@
usr/lib/python3.*/dist-packages/srht/scss
usr/lib/python3.*/dist-packages/srht/static
usr/lib/python3.*/dist-packages/srht/Makefile
diff --git a/debian/links b/debian/python3-srht-dev.links
similarity index 100%
rename from debian/links
rename to debian/python3-srht-dev.links
diff --git a/debian/rules b/debian/rules
index 39cc431..166a2a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@

export PKGVER=$(shell dpkg-parsechangelog -S Version | cut -d'-' -f1)

export PYBUILD_NAME=srht
export PYBUILD_DISABLE=test

%:
-- 
2.30.2
Details
Message ID
<20210501082353.n4xjsyltv2vsmlc6@laxalde.org>
In-Reply-To
<20210430153127.835384-1-tb46305@gmail.com> (view parent)
DKIM signature
missing
Download raw message
Applied first patch, thanks.
Will look at the second one later on.

Re: [PATCH core.sr.ht-deb 2/2] split out python3-srht-dev

Details
Message ID
<70ff8d6c-4d90-d08a-dc75-0a9e91df46b0@laxalde.org>
In-Reply-To
<20210430153127.835384-2-tb46305@gmail.com> (view parent)
DKIM signature
missing
Download raw message
> diff --git a/debian/install b/debian/install
> new file mode 100755
> index 0000000..baf8131
> --- /dev/null
> +++ b/debian/install
> @@ -0,0 +1,5 @@
> +#!/bin/sh
> +echo usr/bin
> +echo 'usr/lib/python3.*/dist-packages/srht-*.egg-info'
> +echo 'usr/lib/python3.*/dist-packages/srht/templates'
> +find debian/tmp -name '*.py' -or -name '*.pyc'

I was not aware of this executable debian/install file "feature". Is 
this documented somewhere?

Alternatively, can these steps be done in a more "standard" way, e.g. 
debian/rules or in python3-srht.install?

> index 39cc431..166a2a4 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -5,7 +5,6 @@
>   
>   export PKGVER=$(shell dpkg-parsechangelog -S Version | cut -d'-' -f1)
>   
> -export PYBUILD_NAME=srht

Can you explain this change?

>   export PYBUILD_DISABLE=test
>   
>   %:
> 

Re: [PATCH core.sr.ht-deb 2/2] split out python3-srht-dev

Details
Message ID
<3998f987b84af81a9c482c7a80262d7808a44266.camel@gmail.com>
In-Reply-To
<70ff8d6c-4d90-d08a-dc75-0a9e91df46b0@laxalde.org> (view parent)
DKIM signature
pass
Download raw message
On Mon, 2021-05-03 at 13:57 +0200, Denis Laxalde wrote:
> > diff --git a/debian/install b/debian/install
> > new file mode 100755
> > index 0000000..baf8131
> > --- /dev/null
> > +++ b/debian/install
> > @@ -0,0 +1,5 @@
> > +#!/bin/sh
> > +echo usr/bin
> > +echo 'usr/lib/python3.*/dist-packages/srht-*.egg-info'
> > +echo 'usr/lib/python3.*/dist-packages/srht/templates'
> > +find debian/tmp -name '*.py' -or -name '*.pyc'
> 
> I was not aware of this executable debian/install file "feature". Is 
> this documented somewhere?

This is documented in debhelper(7)[0].

[0]:
https://manpages.debian.org/testing/debhelper/debhelper.7.en.html#Executable_debhelper_config_files

> Alternatively, can these steps be done in a more "standard" way, e.g. 
> debian/rules or in python3-srht.install?

debian/install is equivalent to debian/python3-srht.install because 
python3-srht is the main package (the first one listed in debian/control).

> 
> > index 39cc431..166a2a4 100755
> > --- a/debian/rules
> > +++ b/debian/rules
> > @@ -5,7 +5,6 @@
> >   
> >   export PKGVER=$(shell dpkg-parsechangelog -S Version | cut -d'-' -f1)
> >   
> > -export PYBUILD_NAME=srht
> 
> Can you explain this change?

When PYBUILD_NAME is set pybuild installs the files directly into
debian/python3-${PYBUILD_NAME}, making it impractical to split them into
multiple packages.

> 
> >   export PYBUILD_DISABLE=test
> >   
> >   %:
> > 
> 

Re: [PATCH core.sr.ht-deb 2/2] split out python3-srht-dev

Details
Message ID
<97713556-39af-fc21-2c52-0a510986d03f@laxalde.org>
In-Reply-To
<3998f987b84af81a9c482c7a80262d7808a44266.camel@gmail.com> (view parent)
DKIM signature
missing
Download raw message
>> Alternatively, can these steps be done in a more "standard" way, e.g.
>> debian/rules or in python3-srht.install?
> 
> debian/install is equivalent to debian/python3-srht.install because
> python3-srht is the main package (the first one listed in debian/control).

This seems a bit fragile so I'd rather have things explicit and use 
debian/python3-srht.install file.

Can you send a v2 changing this?

Please also explain all changes in the commit message and add a 
d/changelog entry.

Also, we'll need patches similar to the one you sent for gitsrht for all 
srht-deb repositories.
Reply to thread Export thread (mbox)