[med-svn] [Git][med-team/logol][master] 6 commits: Use Files-Excluded to create clean tarball
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Jul 22 08:57:21 BST 2021
Andreas Tille pushed to branch master at Debian Med / logol
Commits:
292e1898 by Andreas Tille at 2021-07-22T09:36:42+02:00
Use Files-Excluded to create clean tarball
- - - - -
70827454 by Andreas Tille at 2021-07-22T09:43:54+02:00
Fix watch file, watch file version 4
- - - - -
889f8e1e by Andreas Tille at 2021-07-22T09:46:40+02:00
New upstream version 1.7.9+dfsg
- - - - -
90ccc412 by Andreas Tille at 2021-07-22T09:46:41+02:00
Update upstream source from tag 'upstream/1.7.9+dfsg'
Update to upstream version '1.7.9+dfsg'
with Debian dir 51b726cb56729c5c9e7144dc8bc6b26e46277d76
- - - - -
e3dc69f5 by Andreas Tille at 2021-07-22T09:47:19+02:00
Drop get-orig-source target
- - - - -
fdc351d0 by Andreas Tille at 2021-07-22T09:57:05+02:00
Skip blhc and reprotest in CI
- - - - -
9 changed files:
- + Doc/Logol.mdr
- Doc/grammar/add_rule.sh
- Doc/grammar/generate.sh
- debian/changelog
- debian/copyright
- − debian/get-orig-source.sh
- debian/rules
- debian/salsa-ci.yml
- debian/watch
Changes:
=====================================
Doc/Logol.mdr
=====================================
Binary files /dev/null and b/Doc/Logol.mdr differ
=====================================
Doc/grammar/add_rule.sh
=====================================
=====================================
Doc/grammar/generate.sh
=====================================
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-logol (1.7.9-4) UNRELEASED; urgency=medium
+logol (1.7.9+dfsg-1) UNRELEASED; urgency=medium
[ Shruti Sridhar ]
* Team Upload.
@@ -7,6 +7,11 @@ logol (1.7.9-4) UNRELEASED; urgency=medium
[ Andreas Tille ]
* Add hardening options
+ * Use Files-Excluded to create clean tarball
+ * Fix watch file
+ * Watch file version 4
+ * d/rules: Drop get-orig-source target
+ * Skip blhc and reprotest in CI
-- Shruti Sridhar <shruti.sridhar99 at gmail.com> Wed, 21 Jul 2021 12:02:43 +0530
=====================================
debian/copyright
=====================================
@@ -1,6 +1,10 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: logol
Source: https://gforge.inria.fr/projects/logolexec
+Files-Excluded: Doc/uml
+ Doc/Service*
+ lib/*
+ Doc/JavaDoc
Files: *
Copyright: 2015 Olivier Sallou <olivier.sallou at irisa.fr>
=====================================
debian/get-orig-source.sh deleted
=====================================
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-set -e
-
-PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-#VERSION=`uscan --rename --verbose --force-download |
-# grep "Newest version on remote site is .* local version is .*" |
-# head -n 1 |
-# sed "s/Newest version on remote site is \([a-z0-9.]\+\),.*/\1/"`
-uscan --rename --verbose --force-download
-VERSION=`dpkg-parsechangelog | awk '/^Version/ { print $2 }'| cut -d"-" -f1`
-#svn export svn://scm.gforge.inria.fr/svn/logolexec/trunk/LogolExec ${PKG}-${VERSION}.orig
-
-mkdir -p ../tarballs
-cd ../tarballs
-
-UTAR="${PKG}_${VERSION}.orig.tar.gz"
-mv ../${UTAR} .
-tar xfz ${UTAR}
-
-mv ${PKG}-${VERSION} ${PKG}-${VERSION}.orig
-
-rm -rf ${PKG}-${VERSION}.orig/Doc/uml
-rm -f ${PKG}-${VERSION}.orig/Doc/Service*
-#mv ${PKG}-${VERSION}.orig/lib/antlrworks-1.4.2.jar .
-rm -rf ${PKG}-${VERSION}.orig/lib/*
-#mv antlrworks-1.4.2.jar ${PKG}-${VERSION}.orig/lib/
-rm -rf ${PKG}-${VERSION}.orig/Doc/JavaDoc
-chmod 755 ${PKG}-${VERSION}.orig/Doc/grammar/*.sh
-chmod 755 ${PKG}-${VERSION}.orig/tools/*.sh
-rm -f ${PKG}-${VERSION}.orig/Doc/*.mdr*
-rm -f ${PKG}-${VERSION}.orig/prolog/*.exe
-# Will be regenerated at build time
-rm -f ${PKG}-${VERSION}.orig/src/org/irisa/genouest/logol/parser/*
-# Will be rewritten from template
-rm -f ${PKG}-${VERSION}.orig/tools/suffixSearch.sh
-
-
-BZIP2="--best" tar -cjf ${PKG}_${VERSION}.orig.tar.bz2 ${PKG}-${VERSION}.orig
-
-rm -rf ${PKG}-${VERSION}.orig
=====================================
debian/rules
=====================================
@@ -63,6 +63,3 @@ override_dh_installexamples:
override_dh_strip:
dh_strip -Xlogol.exe -Xpreanalyse.exe
-
-get-orig-source:
- debian/get-orig-source.sh
=====================================
debian/salsa-ci.yml
=====================================
@@ -2,3 +2,7 @@
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ SALSA_CI_DISABLE_BLHC: 1
+ SALSA_CI_DISABLE_REPROTEST: 1
=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
-version=3
-#https://gforge.inria.fr/frs/?group_id=1318 .*/logol_(\d[\d.-]+)\.orig\.tar\.bz2
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/logol-$1\.tar\.gz/ \
- https://github.com/genouest/logol/tags .*/v?(\d\S*)\.tar\.gz
+version=4
+
+opts="repacksuffix=+dfsg,dversionmangle=auto,repack,compression=xz,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/logol-$1\.tar\.gz/" \
+ https://github.com/genouest/logol/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
View it on GitLab: https://salsa.debian.org/med-team/logol/-/compare/c2268512ed6577ef7a714f2b3643d0c34f0958f6...fdc351d09e70bf8b77cbbb44fcb1e4f258d162fd
--
View it on GitLab: https://salsa.debian.org/med-team/logol/-/compare/c2268512ed6577ef7a714f2b3643d0c34f0958f6...fdc351d09e70bf8b77cbbb44fcb1e4f258d162fd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210722/e2977c6e/attachment-0001.htm>
More information about the debian-med-commit
mailing list