diff options
author | Mark Hindley <mark@hindley.org.uk> | 2018-11-09 12:05:21 +0000 |
---|---|---|
committer | Mark Hindley <mark@hindley.org.uk> | 2018-11-09 12:05:21 +0000 |
commit | b2472313a9b7ec4c104e412d7301e1f18a706c1b (patch) | |
tree | 48e61b91b43c82d4f2f71d7f101fcc02137da121 | |
parent | ebc2e2fcbc3339bd12fc028deef3f032e0d8c0a2 (diff) | |
parent | b4ada899b0670bba47f82f4a94bea8a8dd529771 (diff) |
Merge branch 'remove_pwx_submodule' into merge_rc2
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/watch | 1 | ||||
m--------- | pwx | 0 |
5 files changed, 3 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 0c45e459f..41372a1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -40,10 +40,6 @@ __pycache__/ /test-libelogind* # Local Helper Scripts and Tools - Not for distribution -pwx/patches/* -!pwx/patches/.keep_dir -pwx/patches_port/* -!pwx/patches_port/.keep_dir *.orig *.rej *.remote diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d9427f25e..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "pwx"] - path = pwx - url = https://github.com/Yamakuzure/pwx-elogind-migration-tools.git diff --git a/debian/changelog b/debian/changelog index 0b84d3171..859c51a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ elogind (239.1-1+debian1~rc2) unstable; urgency=medium * Use shutdown rather than poweroff as the latter is missing on runit systems. + * Remove upstream pwx git submodule. Thanks to Ian Jackson. -- -elogind (239.1-1~rc1) unstable; urgency=medium +elogind (239.1-1+debian1~rc1) unstable; urgency=medium * Initial upload to Debian (closes: #905388). * New upstream release v239.1. diff --git a/debian/watch b/debian/watch index fda9f7dad..158e3faed 100644 --- a/debian/watch +++ b/debian/watch @@ -7,4 +7,5 @@ version=3 # URLs use only the version as the name, it is recommended to use a # filenamemangle to adjust the name of the downloaded file: opts="filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/elogind-$1.tar.gz/" \ + "dversionmangle=s/\+nosubmodule//" \ https://github.com/elogind/elogind/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz diff --git a/pwx b/pwx deleted file mode 160000 -Subproject a7a0ef894d5b221eeb675cea4f69a7d66922168 |