[med-svn] [Git][med-team/golang-github-dataence-porter2][master] 9 commits: Use git mode

Andreas Tille (@tille) gitlab at salsa.debian.org
Thu Oct 14 08:26:55 BST 2021



Andreas Tille pushed to branch master at Debian Med / golang-github-dataence-porter2


Commits:
2aa41243 by Andreas Tille at 2021-10-14T08:45:46+02:00
Use git mode

- - - - -
06ca4bf3 by Andreas Tille at 2021-10-14T08:48:10+02:00
routine-update: Standards-Version: 4.6.0

- - - - -
cd1094b9 by Andreas Tille at 2021-10-14T08:48:10+02:00
routine-update: debhelper-compat 13

- - - - -
3e0a06c7 by Andreas Tille at 2021-10-14T08:52:35+02:00
routine-update: Add salsa-ci file

- - - - -
99cc96f6 by Andreas Tille at 2021-10-14T08:52:35+02:00
routine-update: Rules-Requires-Root: no

- - - - -
96723d7b by Andreas Tille at 2021-10-14T08:52:39+02:00
Apply multi-arch hints.
+ golang-github-dataence-porter2-dev: Add Multi-Arch: foreign.

Changes-By: apply-multiarch-hints

- - - - -
16342536 by Andreas Tille at 2021-10-14T09:19:53+02:00
Restore original upstream files in master branch

- - - - -
0e6fecef by Andreas Tille at 2021-10-14T09:23:25+02:00
Install all binaries created by upstream build

- - - - -
2c3743c2 by Andreas Tille at 2021-10-14T09:24:06+02:00
Drop debian/gbp.conf which is redundant according to Debian Med policy

- - - - -


8 changed files:

- .gitignore
- debian/changelog
- debian/control
- − debian/gbp.conf
- + debian/salsa-ci.yml
- debian/suffixfsm.install
- debian/watch
- porter2_test.go


Changes:

=====================================
.gitignore
=====================================
@@ -36,6 +36,3 @@ _testmain.go
 
 *.sublime-project
 *.sublime-workspace
-
-.pc
-obj-*


=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+golang-github-dataence-porter2 (0.0~git20150829.56e4718-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * d/watch: Use git mode
+  * Standards-Version: 4.6.0 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Apply multi-arch hints.
+    + golang-github-dataence-porter2-dev: Add Multi-Arch: foreign.
+  * Install all binaries created by upstream build
+  * Drop debian/gbp.conf which is redundant according to Debian Med policy
+
+ -- Andreas Tille <tille at debian.org>  Thu, 14 Oct 2021 08:45:31 +0200
+
 golang-github-dataence-porter2 (0.0~git20150829.56e4718-3) unstable; urgency=medium
 
   * Bump debhelper from old 11 to 12.


=====================================
debian/control
=====================================
@@ -3,13 +3,14 @@ Section: devel
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Aaron M. Ucko <ucko at debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                dh-golang,
                golang-any,
                golang-glog-dev,
                golang-github-stretchr-testify-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Homepage: https://github.com/dataence/porter2
+Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/med-team/golang-github-dataence-porter2
 Vcs-Git: https://salsa.debian.org/med-team/golang-github-dataence-porter2.git
 XS-Go-Import-Path: github.com/dataence/porter2
@@ -18,6 +19,7 @@ Testsuite: autopkgtest-pkg-go
 Package: golang-github-dataence-porter2-dev
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: native Go high-performance Porter2 stemmer for English
  Porter2 implements the Porter2 stemmer for English.  It is written
  completely using finite state machines to do suffix comparison,


=====================================
debian/gbp.conf deleted
=====================================
@@ -1,2 +0,0 @@
-[DEFAULT]
-pristine-tar = True


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+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


=====================================
debian/suffixfsm.install
=====================================
@@ -1 +1 @@
-usr/bin/suffixfsm
+usr/bin


=====================================
debian/watch
=====================================
@@ -1,4 +1,9 @@
-version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/golang-github-dataence-porter2-\$1\.tar\.gz/,\
-uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/ \
-  https://github.com/dataence/porter2/tags .*/v?(\d\S*)\.tar\.gz
+version=4
+
+opts="mode=git,pretty=0.0~git%cd.%h, \
+      filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/golang-github-dataence-porter2-\$1\.tar\.gz/, \
+      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/" \
+  https://github.com/dataence/porter2.git HEAD
+
+# Upstream has no tags
+#  https://github.com/dataence/porter2/tags .*/v?(\d\S*)\.tar\.gz


=====================================
porter2_test.go
=====================================
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/golang/glog"
+	"github.com/surge/glog"
 )
 
 var (
@@ -324,7 +324,7 @@ var (
 func TestEnglishStep0(t *testing.T) {
 
 	for i, rs := range data0 {
-		//glog.Infof("rs=%q, expected=%q", string(rs), string(expect[i]))
+		//glog.Debugf("rs=%q, expected=%q", string(rs), string(expect[i]))
 		assert.Equal(t, step0(rs), expect0[i])
 	}
 }
@@ -333,7 +333,7 @@ func TestEnglishStep1a(t *testing.T) {
 
 	for i, rs := range data1a {
 		assert.Equal(t, step1a(rs), expect1a[i])
-		//glog.Infof("rs=%q, expected=%q, got=%q", string(rs), string(expect1a[i]), string(s))
+		//glog.Debugf("rs=%q, expected=%q, got=%q", string(rs), string(expect1a[i]), string(s))
 	}
 }
 
@@ -341,7 +341,7 @@ func TestEnglishStep1b(t *testing.T) {
 
 	for i, rs := range data1b {
 		r1, _ := markR1R2(rs)
-		//glog.Infof("rs=%q, expected=%q, r1=%d", string(rs), string(expect1b[i]), r1)
+		//glog.Debugf("rs=%q, expected=%q, r1=%d", string(rs), string(expect1b[i]), r1)
 		s := step1b(rs, r1)
 		assert.Equal(t, s, expect1b[i])
 	}
@@ -350,7 +350,7 @@ func TestEnglishStep1b(t *testing.T) {
 func TestEnglishStep1c(t *testing.T) {
 
 	for i, rs := range data1c {
-		//glog.Infof("rs=%q, expected=%q, got=%q", string(rs), string(expect1c[i]), string(step1c(rs)))
+		//glog.Debugf("rs=%q, expected=%q, got=%q", string(rs), string(expect1c[i]), string(step1c(rs)))
 		assert.Equal(t, step1c(rs), expect1c[i])
 	}
 }
@@ -360,7 +360,7 @@ func TestEnglishStep2(t *testing.T) {
 	for i, rs := range data2 {
 		r1, _ := markR1R2(rs)
 		s := step2(rs, r1)
-		//glog.Infof("rs=%q, expected=%q, got=%q, r1=%d", string(rs), string(expect2[i]), string(s), r1)
+		//glog.Debugf("rs=%q, expected=%q, got=%q, r1=%d", string(rs), string(expect2[i]), string(s), r1)
 		assert.Equal(t, s, expect2[i])
 	}
 }
@@ -370,7 +370,7 @@ func TestEnglishStep3(t *testing.T) {
 	for i, rs := range data3 {
 		r1, r2 := markR1R2(rs)
 		s := step3(rs, r1, r2)
-		//glog.Infof("rs=%q, expected=%q, got=%q, r1=%d", string(rs), string(expect3[i]), string(s), r1)
+		//glog.Debugf("rs=%q, expected=%q, got=%q, r1=%d", string(rs), string(expect3[i]), string(s), r1)
 		assert.Equal(t, s, expect3[i])
 	}
 }
@@ -380,7 +380,7 @@ func TestEnglishStep4(t *testing.T) {
 	for i, rs := range data4 {
 		_, r2 := markR1R2(rs)
 		s := step4(rs, r2)
-		//glog.Infof("rs=%q, expected=%q, got=%q, r1=%d, r2=%d", string(rs), string(expect4[i]), string(s), r1, r2)
+		//glog.Debugf("rs=%q, expected=%q, got=%q, r1=%d, r2=%d", string(rs), string(expect4[i]), string(s), r1, r2)
 		assert.Equal(t, s, expect4[i])
 	}
 }
@@ -390,7 +390,7 @@ func TestEnglishStep5(t *testing.T) {
 	for i, rs := range data5 {
 		r1, r2 := markR1R2(rs)
 		s := step5(rs, r1, r2)
-		//glog.Infof("rs=%q, expected=%q, got=%q, r1=%d, r2=%d", string(rs), string(expect5[i]), string(s), r1, r2)
+		//glog.Debugf("rs=%q, expected=%q, got=%q, r1=%d, r2=%d", string(rs), string(expect5[i]), string(s), r1, r2)
 		assert.Equal(t, s, expect5[i])
 	}
 }
@@ -398,7 +398,7 @@ func TestEnglishStep5(t *testing.T) {
 func TestEnglishMarkR1R2(t *testing.T) {
 	for i, rs := range dataRegions {
 		r1, r2 := markR1R2(rs)
-		//glog.Infof("rs = %v, expected = %v, got = %v", rs, expectRegions[i], []int{r1, r2})
+		//glog.Debugf("rs = %v, expected = %v, got = %v", rs, expectRegions[i], []int{r1, r2})
 		assert.Equal(t, expectRegions[i], []int{r1, r2})
 	}
 
@@ -408,7 +408,7 @@ func TestEnglishIsShortWord(t *testing.T) {
 	for s, v := range shortWords {
 		rs := []rune(s)
 		r1, _ := markR1R2(rs)
-		//glog.Infof("rs=%q, r1=%d", s, r1)
+		//glog.Debugf("rs=%q, r1=%d", s, r1)
 		assert.Equal(t, v, isShortWord(rs, r1))
 	}
 }
@@ -417,7 +417,7 @@ func TestEnglishExceptions1(t *testing.T) {
 
 	for k, v := range exceptions1 {
 		rs, ex := exception1([]rune(k))
-		//glog.Infof("rs=%q, expected=%q, got=%q", k, v, string(rs))
+		//glog.Debugf("rs=%q, expected=%q, got=%q", k, v, string(rs))
 		assert.True(t, ex)
 		assert.Equal(t, []rune(v), rs)
 	}
@@ -484,10 +484,10 @@ func TestEnglishVocOutput(t *testing.T) {
 
 		word := inscan.Text()
 		expect := outscan.Text()
-		//glog.Infof("word=%q, expect=%q", word, expect)
+		//glog.Debugf("word=%q, expect=%q", word, expect)
 		actual := Stem(word)
 		if actual != expect {
-			glog.Infof("word=%q, actual=%q != expect=%q", word, actual, expect)
+			glog.Debugf("word=%q, actual=%q != expect=%q", word, actual, expect)
 		}
 		assert.Equal(t, expect, actual)
 	}



View it on GitLab: https://salsa.debian.org/med-team/golang-github-dataence-porter2/-/compare/3a7c3eea370c6b634a53fa3ea2966bdad99a7b7c...2c3743c20ade0f9fd837670ff461c7f8651b9771

-- 
View it on GitLab: https://salsa.debian.org/med-team/golang-github-dataence-porter2/-/compare/3a7c3eea370c6b634a53fa3ea2966bdad99a7b7c...2c3743c20ade0f9fd837670ff461c7f8651b9771
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/20211014/c2d647c4/attachment-0001.htm>


More information about the debian-med-commit mailing list