Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package golang-github-linuxdeepin-go-lib for
openSUSE:Factory checked in at 2022-04-22 21:54:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/golang-github-linuxdeepin-go-lib (Old)
and /work/SRC/openSUSE:Factory/.golang-github-linuxdeepin-go-lib.new.1538
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-github-linuxdeepin-go-lib"
Fri Apr 22 21:54:06 2022 rev:6 rq:971806 version:6.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/golang-github-linuxdeepin-go-lib/golang-github-linuxdeepin-go-lib.changes
2022-03-07 17:46:34.955126055 +0100
+++
/work/SRC/openSUSE:Factory/.golang-github-linuxdeepin-go-lib.new.1538/golang-github-linuxdeepin-go-lib.changes
2022-04-22 21:54:57.658854314 +0200
@@ -1,0 +2,7 @@
+Sat Apr 2 07:41:56 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 6.0.0
+ * Change pkg.deepin.io to github.com
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
go-lib-5.8.4.tar.gz
New:
----
go-lib-6.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ golang-github-linuxdeepin-go-lib.spec ++++++
--- /var/tmp/diff_new_pack.db5CLK/_old 2022-04-22 21:54:58.206854938 +0200
+++ /var/tmp/diff_new_pack.db5CLK/_new 2022-04-22 21:54:58.210854943 +0200
@@ -17,10 +17,10 @@
%define _name go-lib
-%define import_path pkg.deepin.io/lib
+%define import_path github.com/linuxdeepin/go-lib
Name: golang-github-linuxdeepin-go-lib
-Version: 5.8.4
+Version: 6.0.0
Release: 0
Summary: Go bindings for Deepin Desktop Environment development
License: GPL-3.0-or-later
@@ -33,15 +33,15 @@
BuildRequires: golang-packaging
BuildRequires: libpulse0
BuildRequires: mobile-broadband-provider-info
-BuildRequires: golang(pkg.deepin.io/gir/gio-2.0)
-BuildRequires: golang(pkg.deepin.io/gir/glib-2.0)
+BuildRequires: golang(github.com/linuxdeepin/go-gir/gio-2.0)
+BuildRequires: golang(github.com/linuxdeepin/go-gir/glib-2.0)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(x11)
BuildArch: noarch
-Requires: golang(pkg.deepin.io/gir/gio-2.0)
-Requires: golang(pkg.deepin.io/gir/glib-2.0)
+Requires: golang(github.com/linuxdeepin/go-gir/gio-2.0)
+Requires: golang(github.com/linuxdeepin/go-gir/glib-2.0)
AutoReq: Off
%{go_provides}
++++++ go-lib-5.8.4.tar.gz -> go-lib-6.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/CHANGELOG.md
new/go-lib-6.0.0/CHANGELOG.md
--- old/go-lib-5.8.4/CHANGELOG.md 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/CHANGELOG.md 2021-12-15 12:32:06.000000000 +0100
@@ -12,7 +12,7 @@
[1.9.2] 2019-03-01
* chore(dbusutil): RemoveHandler check signal ext
-* chore: use pkg.deepin.io/gir
+* chore: use github.com/linuxdeepin/go-gir
[1.9.1] 2019-02-25
* fix(proxy): abnormally clear env vars when modifying config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/Makefile new/go-lib-6.0.0/Makefile
--- old/go-lib-5.8.4/Makefile 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/Makefile 2021-12-15 12:32:06.000000000 +0100
@@ -1,5 +1,5 @@
GOPATH_DIR = gopath
-GOPKG_PREFIX = pkg.deepin.io/lib
+GOPKG_PREFIX = github.com/linuxdeepin/go-lib
prepare:
@mkdir -p ${GOPATH_DIR}/src/$(dir ${GOPKG_PREFIX});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/README.md new/go-lib-6.0.0/README.md
--- old/go-lib-5.8.4/README.md 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/README.md 2021-12-15 12:32:06.000000000 +0100
@@ -28,8 +28,8 @@
Install
```
-mkdir -p $GOPATH/src/pkg.deepin.io
-cp -r go-lib $GOPATH/src/pkg.deepin.io/lib
+mkdir -p $GOPATH/src/github.com/linuxdeepin/
+cp -r go-lib $GOPATH/src/github.com/linuxdeepin/go-lib
```
## Getting help
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/TODO new/go-lib-6.0.0/TODO
--- old/go-lib-5.8.4/TODO 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/TODO 2021-12-15 12:32:06.000000000 +0100
@@ -1 +1,3 @@
[ ] compact utils directory, separate it into different packages.
+
+??????rmp??????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/app/app.go new/go-lib-6.0.0/app/app.go
--- old/go-lib-5.8.4/app/app.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/app/app.go 2021-12-15 12:32:06.000000000 +0100
@@ -22,9 +22,9 @@
import (
"fmt"
+ "github.com/linuxdeepin/go-lib/log"
+ "github.com/linuxdeepin/go-lib/profile"
"gopkg.in/alecthomas/kingpin.v2"
- "pkg.deepin.io/lib/log"
- "pkg.deepin.io/lib/profile"
"strings"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/go-lib-5.8.4/appinfo/desktopappinfo/desktopappinfo.go
new/go-lib-6.0.0/appinfo/desktopappinfo/desktopappinfo.go
--- old/go-lib-5.8.4/appinfo/desktopappinfo/desktopappinfo.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/appinfo/desktopappinfo/desktopappinfo.go 2021-12-15
12:32:06.000000000 +0100
@@ -29,11 +29,11 @@
"sync"
"time"
- gio "pkg.deepin.io/gir/gio-2.0"
- "pkg.deepin.io/lib/appinfo"
- "pkg.deepin.io/lib/keyfile"
- "pkg.deepin.io/lib/shell"
- "pkg.deepin.io/lib/xdg/basedir"
+ "github.com/linuxdeepin/go-lib/appinfo"
+ "github.com/linuxdeepin/go-lib/keyfile"
+ "github.com/linuxdeepin/go-lib/shell"
+ "github.com/linuxdeepin/go-lib/xdg/basedir"
+ gio "github.com/linuxdeepin/go-gir/gio-2.0"
)
const (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/go-lib-5.8.4/appinfo/desktopappinfo/desktopappinfo_test.go
new/go-lib-6.0.0/appinfo/desktopappinfo/desktopappinfo_test.go
--- old/go-lib-5.8.4/appinfo/desktopappinfo/desktopappinfo_test.go
2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/appinfo/desktopappinfo/desktopappinfo_test.go
2021-12-15 12:32:06.000000000 +0100
@@ -26,7 +26,7 @@
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "pkg.deepin.io/lib/keyfile"
+ "github.com/linuxdeepin/go-lib/keyfile"
)
func TestNewDesktopAppInfoFromKeyFile(t *testing.T) {
@@ -453,7 +453,6 @@
cmdline = []string{"/opt/Foxitreader/FoxitReader.sh", "%F"}
parts, err = expandFieldCode(cmdline, files, translatedName, icon,
desktopFile)
require.NoError(t, err)
- assert.Equal(t, parts, []string{"/opt/Foxitreader/FoxitReader.sh",
"/home/tp/2017???03???-????????????-?????????.pdf"})
files = []string{"/a/b/log"}
cmdline = []string{"start", "file=%u", "end"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/appinfo/desktopappinfo/exec.go
new/go-lib-6.0.0/appinfo/desktopappinfo/exec.go
--- old/go-lib-5.8.4/appinfo/desktopappinfo/exec.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/appinfo/desktopappinfo/exec.go 2021-12-15
12:32:06.000000000 +0100
@@ -26,7 +26,7 @@
"net/url"
"strings"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/utils"
)
func getDefaultTerminal() (exec string, execArg string) {
@@ -224,7 +224,7 @@
}
func toLocalPath(in string) string {
- u, err := url.Parse(in)
+ u, err := url.Parse(url.QueryEscape(in))
if err != nil {
return ""
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/archive/archive.go
new/go-lib-6.0.0/archive/archive.go
--- old/go-lib-5.8.4/archive/archive.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/archive/archive.go 2021-12-15 12:32:06.000000000 +0100
@@ -23,7 +23,7 @@
"fmt"
"strings"
- "pkg.deepin.io/lib/archive/gzip"
+ "github.com/linuxdeepin/go-lib/archive/gzip"
)
const (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/archive/gzip/tar.go
new/go-lib-6.0.0/archive/gzip/tar.go
--- old/go-lib-5.8.4/archive/gzip/tar.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/archive/gzip/tar.go 2021-12-15 12:32:06.000000000
+0100
@@ -23,7 +23,7 @@
"archive/tar"
"compress/gzip"
"os"
- "pkg.deepin.io/lib/archive/utils"
+ "github.com/linuxdeepin/go-lib/archive/utils"
)
func tarCompressFiles(files []string, dest string) error {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/archive/tar.go
new/go-lib-6.0.0/archive/tar.go
--- old/go-lib-5.8.4/archive/tar.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/archive/tar.go 2021-12-15 12:32:06.000000000 +0100
@@ -22,7 +22,7 @@
import (
"archive/tar"
"os"
- "pkg.deepin.io/lib/archive/utils"
+ "github.com/linuxdeepin/go-lib/archive/utils"
)
func tarCompressFiles(files []string, dest string) error {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/archive/utils/tar.go
new/go-lib-6.0.0/archive/utils/tar.go
--- old/go-lib-5.8.4/archive/utils/tar.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/archive/utils/tar.go 2021-12-15 12:32:06.000000000
+0100
@@ -25,7 +25,7 @@
"io"
"os"
"path"
- dutils "pkg.deepin.io/lib/utils"
+ dutils "github.com/linuxdeepin/go-lib/utils"
)
func TarWriterCompressFiles(writer *tar.Writer, files []string) error {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/backlight/display/display.go
new/go-lib-6.0.0/backlight/display/display.go
--- old/go-lib-5.8.4/backlight/display/display.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/backlight/display/display.go 2021-12-15
12:32:06.000000000 +0100
@@ -20,7 +20,7 @@
package display
import (
- "pkg.deepin.io/lib/backlight/common"
+ "github.com/linuxdeepin/go-lib/backlight/common"
"strings"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/backlight/keyboard/keyboard.go
new/go-lib-6.0.0/backlight/keyboard/keyboard.go
--- old/go-lib-5.8.4/backlight/keyboard/keyboard.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/backlight/keyboard/keyboard.go 2021-12-15
12:32:06.000000000 +0100
@@ -21,7 +21,7 @@
import (
"path/filepath"
- . "pkg.deepin.io/lib/backlight/common"
+ . "github.com/linuxdeepin/go-lib/backlight/common"
"strings"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/calendar.go
new/go-lib-6.0.0/calendar/calendar.go
--- old/go-lib-5.8.4/calendar/calendar.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/calendar/calendar.go 2021-12-15 12:32:06.000000000
+0100
@@ -20,7 +20,7 @@
package calendar
import (
- "pkg.deepin.io/lib/calendar/lunar"
+ "github.com/linuxdeepin/go-lib/calendar/lunar"
)
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/lunar/elp82.go
new/go-lib-6.0.0/calendar/lunar/elp82.go
--- old/go-lib-5.8.4/calendar/lunar/elp82.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/calendar/lunar/elp82.go 2021-12-15 12:32:06.000000000
+0100
@@ -21,7 +21,7 @@
import (
"math"
- "pkg.deepin.io/lib/calendar/util"
+ "github.com/linuxdeepin/go-lib/calendar/util"
)
// ?????? T ???????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/lunar/lunar.go
new/go-lib-6.0.0/calendar/lunar/lunar.go
--- old/go-lib-5.8.4/calendar/lunar/lunar.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/calendar/lunar/lunar.go 2021-12-15 12:32:06.000000000
+0100
@@ -23,7 +23,7 @@
"fmt"
"time"
- "pkg.deepin.io/lib/calendar/util"
+ "github.com/linuxdeepin/go-lib/calendar/util"
)
// Calendar ?????????????????????????????????????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/lunar/newmoon_test.go
new/go-lib-6.0.0/calendar/lunar/newmoon_test.go
--- old/go-lib-5.8.4/calendar/lunar/newmoon_test.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/calendar/lunar/newmoon_test.go 2021-12-15
12:32:06.000000000 +0100
@@ -20,7 +20,7 @@
package lunar
import (
- "pkg.deepin.io/lib/calendar/util"
+ "github.com/linuxdeepin/go-lib/calendar/util"
"testing"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/lunar/solarterms.go
new/go-lib-6.0.0/calendar/lunar/solarterms.go
--- old/go-lib-5.8.4/calendar/lunar/solarterms.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/calendar/lunar/solarterms.go 2021-12-15
12:32:06.000000000 +0100
@@ -21,7 +21,7 @@
import (
"math"
- "pkg.deepin.io/lib/calendar/util"
+ "github.com/linuxdeepin/go-lib/calendar/util"
)
var SolarTermNames = []string{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/lunar/solarterms_test.go
new/go-lib-6.0.0/calendar/lunar/solarterms_test.go
--- old/go-lib-5.8.4/calendar/lunar/solarterms_test.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/calendar/lunar/solarterms_test.go 2021-12-15
12:32:06.000000000 +0100
@@ -24,7 +24,7 @@
"testing"
"github.com/stretchr/testify/assert"
- "pkg.deepin.io/lib/calendar/util"
+ "github.com/linuxdeepin/go-lib/calendar/util"
)
func TestSolarTerms(t *testing.T) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/lunar/vsop87earthd.go
new/go-lib-6.0.0/calendar/lunar/vsop87earthd.go
--- old/go-lib-5.8.4/calendar/lunar/vsop87earthd.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/calendar/lunar/vsop87earthd.go 2021-12-15
12:32:06.000000000 +0100
@@ -21,7 +21,7 @@
import (
"math"
- "pkg.deepin.io/lib/calendar/util"
+ "github.com/linuxdeepin/go-lib/calendar/util"
)
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/calendar/lunar/vsop87earthd_test.go
new/go-lib-6.0.0/calendar/lunar/vsop87earthd_test.go
--- old/go-lib-5.8.4/calendar/lunar/vsop87earthd_test.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/calendar/lunar/vsop87earthd_test.go 2021-12-15
12:32:06.000000000 +0100
@@ -20,7 +20,7 @@
package lunar
import (
- "pkg.deepin.io/lib/calendar/util"
+ "github.com/linuxdeepin/go-lib/calendar/util"
"testing"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/cgroup/cgroup.go
new/go-lib-6.0.0/cgroup/cgroup.go
--- old/go-lib-5.8.4/cgroup/cgroup.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/cgroup/cgroup.go 2021-12-15 12:32:06.000000000 +0100
@@ -13,7 +13,7 @@
"strings"
"syscall"
- "pkg.deepin.io/lib/log"
+ "github.com/linuxdeepin/go-lib/log"
)
var logger = log.NewLogger("lib/cgroup")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/go-lib-5.8.4/dbusutil/_tool/dbusutil-gen/exported_methods.go
new/go-lib-6.0.0/dbusutil/_tool/dbusutil-gen/exported_methods.go
--- old/go-lib-5.8.4/dbusutil/_tool/dbusutil-gen/exported_methods.go
2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/dbusutil/_tool/dbusutil-gen/exported_methods.go
2021-12-15 12:32:06.000000000 +0100
@@ -11,9 +11,9 @@
"sort"
"unicode"
- "pkg.deepin.io/lib/strv"
+ "github.com/linuxdeepin/go-lib/strv"
- "pkg.deepin.io/lib/dbusutil"
+ "github.com/linuxdeepin/go-lib/dbusutil"
)
func (g *Generator) genExportedMethods(types strv.Strv) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/dbusutil/_tool/dbusutil-gen/main.go
new/go-lib-6.0.0/dbusutil/_tool/dbusutil-gen/main.go
--- old/go-lib-5.8.4/dbusutil/_tool/dbusutil-gen/main.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/dbusutil/_tool/dbusutil-gen/main.go 2021-12-15
12:32:06.000000000 +0100
@@ -15,7 +15,7 @@
"strings"
"unicode"
- "pkg.deepin.io/lib/strv"
+ "github.com/linuxdeepin/go-lib/strv"
)
func astNodeToStr(fSet *token.FileSet, node interface{}) (string, error) {
@@ -246,7 +246,7 @@
if _outputFile == "" {
_outputFile = "exported_methods_auto.go"
}
- g.pkg.extraImports = append(g.pkg.extraImports,
`"pkg.deepin.io/lib/dbusutil"`)
+ g.pkg.extraImports = append(g.pkg.extraImports,
`"github.com/linuxdeepin/go-lib/dbusutil"`)
g.genHeader()
g.genExportedMethods(types)
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/dbusutil/gsprop/gsprop.go
new/go-lib-6.0.0/dbusutil/gsprop/gsprop.go
--- old/go-lib-5.8.4/dbusutil/gsprop/gsprop.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/dbusutil/gsprop/gsprop.go 2021-12-15 12:32:06.000000000
+0100
@@ -5,10 +5,10 @@
"reflect"
"sync"
- "pkg.deepin.io/gir/gio-2.0"
"github.com/godbus/dbus"
- "pkg.deepin.io/lib/dbusutil"
- "pkg.deepin.io/lib/gsettings"
+ "github.com/linuxdeepin/go-lib/dbusutil"
+ "github.com/linuxdeepin/go-lib/gsettings"
+ "github.com/linuxdeepin/go-gir/gio-2.0"
)
type base struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/dbusutil/gsprop/gsprop_test.go
new/go-lib-6.0.0/dbusutil/gsprop/gsprop_test.go
--- old/go-lib-5.8.4/dbusutil/gsprop/gsprop_test.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/dbusutil/gsprop/gsprop_test.go 2021-12-15
12:32:06.000000000 +0100
@@ -9,9 +9,9 @@
"github.com/godbus/dbus"
"github.com/godbus/dbus/introspect"
- "pkg.deepin.io/gir/gio-2.0"
- "pkg.deepin.io/lib/dbusutil"
- "pkg.deepin.io/lib/gsettings"
+ "github.com/linuxdeepin/go-gir/gio-2.0"
+ "github.com/linuxdeepin/go-lib/dbusutil"
+ "github.com/linuxdeepin/go-lib/gsettings"
)
const demoSchemaId = "ca.desrt.dconf-editor.Demo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/dbusutil/introspectable.go
new/go-lib-6.0.0/dbusutil/introspectable.go
--- old/go-lib-5.8.4/dbusutil/introspectable.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/dbusutil/introspectable.go 2021-12-15 12:32:06.000000000
+0100
@@ -6,7 +6,7 @@
"github.com/godbus/dbus"
"github.com/godbus/dbus/introspect"
"github.com/godbus/dbus/prop"
- "pkg.deepin.io/lib/strv"
+ "github.com/linuxdeepin/go-lib/strv"
)
var peerIntrospectData = introspect.Interface{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/dbusutil/proxy/object.go
new/go-lib-6.0.0/dbusutil/proxy/object.go
--- old/go-lib-5.8.4/dbusutil/proxy/object.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/dbusutil/proxy/object.go 2021-12-15 12:32:06.000000000
+0100
@@ -6,7 +6,7 @@
"sync"
"github.com/godbus/dbus"
- "pkg.deepin.io/lib/dbusutil"
+ "github.com/linuxdeepin/go-lib/dbusutil"
)
type Object interface {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/dbusutil/proxy/object_mock.go
new/go-lib-6.0.0/dbusutil/proxy/object_mock.go
--- old/go-lib-5.8.4/dbusutil/proxy/object_mock.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/dbusutil/proxy/object_mock.go 2021-12-15
12:32:06.000000000 +0100
@@ -5,7 +5,7 @@
"github.com/godbus/dbus"
"github.com/stretchr/testify/mock"
- "pkg.deepin.io/lib/dbusutil"
+ "github.com/linuxdeepin/go-lib/dbusutil"
)
type MockObject struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/debian/changelog
new/go-lib-6.0.0/debian/changelog
--- old/go-lib-5.8.4/debian/changelog 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/debian/changelog 2021-12-15 12:32:06.000000000 +0100
@@ -1,3 +1,9 @@
+golang-github-linuxdeepin-go-lib (0.5.0-1) unstable; urgency=medium
+
+ * change package name to golang-github-linuxdeepin-go-lib
+
+ -- weizhixiang <[email protected]> Tue, 30 Nov 2021 19:39:58 +0800
+
go-dlib (0.4.11-1) unstable; urgency=low
* Autobuild Tag 0.4.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/debian/control
new/go-lib-6.0.0/debian/control
--- old/go-lib-5.8.4/debian/control 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/debian/control 2021-12-15 12:32:06.000000000 +0100
@@ -1,4 +1,4 @@
-Source: go-dlib
+Source: golang-github-linuxdeepin-go-lib
Section: devel
Priority: extra
Maintainer: Deepin Packages Builder <[email protected]>
@@ -16,7 +16,7 @@
Standards-Version: 3.9.8
Homepage: http://www.deepin.org
-Package: golang-dlib-dev
+Package: golang-github-linuxdeepin-go-lib-dev
Architecture: all
Depends: ${misc:Depends},
golang-github-linuxdeepin-go-x11-client-dev,
@@ -27,8 +27,11 @@
golang-gir-glib-2.0-dev (>> 1.2.0+),
golang-dbus-dev,
libpulse-dev, libgtk-3-dev, libasound2-dev, libpam0g-dev,
golang-golang-x-net-dev
+Replaces:
+ golang-dlib-dev
+Conflicts:
+ golang-dlib-dev
Built-Using: ${misc:Built-Using}
-Provides: go-dlib
Description: Go bindings for Deepin Desktop Environment development
DLib is a set of Go bindings/libraries for DDE development.
Containing dbus (forking from guelfey), glib, gdkpixbuf, pulse and more.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/debian/rules
new/go-lib-6.0.0/debian/rules
--- old/go-lib-5.8.4/debian/rules 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/debian/rules 2021-12-15 12:32:06.000000000 +0100
@@ -3,15 +3,15 @@
export GOCACHE := /tmp/gocache
-export DH_GOPKG := pkg.deepin.io/lib
+export DH_GOPKG := github.com/linuxdeepin/go-lib
export DH_GOLANG_INSTALL_ALL := 1
-
+
%:
dh $@ --buildsystem=golang --with=golang
override_dh_auto_install:
dh_auto_install
- find ${CURDIR}/debian/golang-dlib-dev -regex
'.*\.git\|.*testdata\|.*LICENSE\|.*\.gitignore' | xargs rm -rf
+ find ${CURDIR}/debian/golang-github-linuxdeepin-go-lib-dev -regex
'.*\.git\|.*testdata\|.*LICENSE\|.*\.gitignore' | xargs rm -rf
override_dh_fixperms:
dh_fixperms
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/doc/dbusutil.md
new/go-lib-6.0.0/doc/dbusutil.md
--- old/go-lib-5.8.4/doc/dbusutil.md 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/doc/dbusutil.md 2021-12-15 12:32:06.000000000 +0100
@@ -212,7 +212,7 @@
????????? dbusutil-gen ??? $GOPATH/bin ?????????????????????
```
-go install pkg.deepin.io/lib/dbusutil/_tool/dbusutil-gen
+go install github.com/linuxdeepin/go-lib/dbusutil/_tool/dbusutil-gen
```
??????????????????????????????
@@ -242,4 +242,3 @@
* nil ???????????????
* ???????????? bytes.Equal????????????????????????????????? bytes.Equal(old,
new)
* ???method: ???????????? method:equal, ??????????????????????????????
old.equal(new)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/gdkpixbuf/README.md
new/go-lib-6.0.0/gdkpixbuf/README.md
--- old/go-lib-5.8.4/gdkpixbuf/README.md 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/gdkpixbuf/README.md 2021-12-15 12:32:06.000000000
+0100
@@ -1,7 +1,7 @@
Go ???????????????, ???????????? GdkPixbuf ?????????????????????.
?????????????????????
??????, ??????, ??????, ??????, ?????????????????????.
-API ?????????????????? pkg.deepin.io/lib/graphic ?????????, ??? Blur
????????????:
+API ?????????????????? github.com/linuxdeepin/go-lib/graphic ?????????, ???
Blur ????????????:
- **Blur** ??? C.GdkPixbuf ????????????????????????
- **BlurImage** ?????????????????????????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/gdkpixbuf/blur.go
new/go-lib-6.0.0/gdkpixbuf/blur.go
--- old/go-lib-5.8.4/gdkpixbuf/blur.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/gdkpixbuf/blur.go 2021-12-15 12:32:06.000000000 +0100
@@ -27,7 +27,7 @@
import (
"fmt"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/utils"
)
// BlurImage generate blur effect to an image file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/gdkpixbuf/gdkpixbuf.go
new/go-lib-6.0.0/gdkpixbuf/gdkpixbuf.go
--- old/go-lib-5.8.4/gdkpixbuf/gdkpixbuf.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/gdkpixbuf/gdkpixbuf.go 2021-12-15 12:32:06.000000000
+0100
@@ -32,7 +32,7 @@
"unsafe"
x "github.com/linuxdeepin/go-x11-client"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/utils"
)
// Format defines the type of image format.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/gdkpixbuf/utils.go
new/go-lib-6.0.0/gdkpixbuf/utils.go
--- old/go-lib-5.8.4/gdkpixbuf/utils.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/gdkpixbuf/utils.go 2021-12-15 12:32:06.000000000 +0100
@@ -20,8 +20,8 @@
package gdkpixbuf
import (
- "pkg.deepin.io/lib/graphic"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/graphic"
+ "github.com/linuxdeepin/go-lib/utils"
)
// function links to lib/graphic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/graphic/info.go
new/go-lib-6.0.0/graphic/info.go
--- old/go-lib-5.8.4/graphic/info.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/graphic/info.go 2021-12-15 12:32:06.000000000 +0100
@@ -22,7 +22,7 @@
import (
"image"
"os"
- dutils "pkg.deepin.io/lib/utils"
+ dutils "github.com/linuxdeepin/go-lib/utils"
)
// GetImageSize return image's width and height.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/graphic/utils.go
new/go-lib-6.0.0/graphic/utils.go
--- old/go-lib-5.8.4/graphic/utils.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/graphic/utils.go 2021-12-15 12:32:06.000000000 +0100
@@ -23,7 +23,7 @@
"image"
"image/draw"
"os"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/utils"
)
func generateCacheFilePath(keyword string) (dstfile string) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/imgutil/imgutil.go
new/go-lib-6.0.0/imgutil/imgutil.go
--- old/go-lib-5.8.4/imgutil/imgutil.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/imgutil/imgutil.go 2021-12-15 12:32:06.000000000 +0100
@@ -10,8 +10,8 @@
_ "golang.org/x/image/bmp"
_ "golang.org/x/image/tiff"
- "pkg.deepin.io/lib/gdkpixbuf"
- "pkg.deepin.io/lib/strv"
+ "github.com/linuxdeepin/go-lib/gdkpixbuf"
+ "github.com/linuxdeepin/go-lib/strv"
)
const (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/initializer/initializer_test.go
new/go-lib-6.0.0/initializer/initializer_test.go
--- old/go-lib-5.8.4/initializer/initializer_test.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/initializer/initializer_test.go 2021-12-15
12:32:06.000000000 +0100
@@ -24,7 +24,7 @@
"testing"
. "github.com/smartystreets/goconvey/convey"
- . "pkg.deepin.io/lib/initializer"
+ . "github.com/linuxdeepin/go-lib/initializer"
)
func TestInitializer(t *testing.T) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/initializer/v2/initializer_test.go
new/go-lib-6.0.0/initializer/v2/initializer_test.go
--- old/go-lib-5.8.4/initializer/v2/initializer_test.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/initializer/v2/initializer_test.go 2021-12-15
12:32:06.000000000 +0100
@@ -24,7 +24,7 @@
"testing"
. "github.com/smartystreets/goconvey/convey"
- "pkg.deepin.io/lib/initializer/v2"
+ "github.com/linuxdeepin/go-lib/initializer/v2"
)
func e1() error {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/iso/country.go
new/go-lib-6.0.0/iso/country.go
--- old/go-lib-5.8.4/iso/country.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/iso/country.go 2021-12-15 12:32:06.000000000 +0100
@@ -24,7 +24,7 @@
"fmt"
"io/ioutil"
"os"
- . "pkg.deepin.io/lib/gettext"
+ . "github.com/linuxdeepin/go-lib/gettext"
"strings"
"sync"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/iso/country_test.go
new/go-lib-6.0.0/iso/country_test.go
--- old/go-lib-5.8.4/iso/country_test.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/iso/country_test.go 2021-12-15 12:32:06.000000000
+0100
@@ -22,7 +22,7 @@
import (
"github.com/stretchr/testify/require"
"os"
- . "pkg.deepin.io/lib/gettext"
+ . "github.com/linuxdeepin/go-lib/gettext"
"testing"
"github.com/stretchr/testify/assert"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/keyfile/get.go
new/go-lib-6.0.0/keyfile/get.go
--- old/go-lib-5.8.4/keyfile/get.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/keyfile/get.go 2021-12-15 12:32:06.000000000 +0100
@@ -26,7 +26,7 @@
"strings"
"unicode/utf8"
- libLocale "pkg.deepin.io/lib/locale"
+ libLocale "github.com/linuxdeepin/go-lib/locale"
)
func parseValueAsBool(value string) (bool, error) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/log/README.md
new/go-lib-6.0.0/log/README.md
--- old/go-lib-5.8.4/log/README.md 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/log/README.md 2021-12-15 12:32:06.000000000 +0100
@@ -56,7 +56,7 @@
## ????????????
```go
-import "pkg.deepin.io/lib/log"
+import "github.com/linuxdeepin/go-lib/log"
import "flag"
var (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/log/backend_console.go
new/go-lib-6.0.0/log/backend_console.go
--- old/go-lib-5.8.4/log/backend_console.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/log/backend_console.go 2021-12-15 12:32:06.000000000
+0100
@@ -22,7 +22,7 @@
import (
"fmt"
"os"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/utils"
"time"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/log/logger.go
new/go-lib-6.0.0/log/logger.go
--- old/go-lib-5.8.4/log/logger.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/log/logger.go 2021-12-15 12:32:06.000000000 +0100
@@ -31,7 +31,7 @@
"runtime"
"sync"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/utils"
)
const (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/mime/mime.go
new/go-lib-6.0.0/mime/mime.go
--- old/go-lib-5.8.4/mime/mime.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/mime/mime.go 2021-12-15 12:32:06.000000000 +0100
@@ -24,8 +24,8 @@
"os"
"path/filepath"
- gio "pkg.deepin.io/gir/gio-2.0"
- dutils "pkg.deepin.io/lib/utils"
+ dutils "github.com/linuxdeepin/go-lib/utils"
+ gio "github.com/linuxdeepin/go-gir/gio-2.0"
)
const (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/mime/theme.go
new/go-lib-6.0.0/mime/theme.go
--- old/go-lib-5.8.4/mime/theme.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/mime/theme.go 2021-12-15 12:32:06.000000000 +0100
@@ -22,7 +22,7 @@
import (
"fmt"
"path"
- dutils "pkg.deepin.io/lib/utils"
+ dutils "github.com/linuxdeepin/go-lib/utils"
)
const (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/notify/examples/action.go
new/go-lib-6.0.0/notify/examples/action.go
--- old/go-lib-5.8.4/notify/examples/action.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/notify/examples/action.go 2021-12-15 12:32:06.000000000
+0100
@@ -23,7 +23,7 @@
import (
"log"
- "pkg.deepin.io/lib/notify"
+ "github.com/linuxdeepin/go-lib/notify"
"time"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/notify/examples/image.go
new/go-lib-6.0.0/notify/examples/image.go
--- old/go-lib-5.8.4/notify/examples/image.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/notify/examples/image.go 2021-12-15 12:32:06.000000000
+0100
@@ -27,7 +27,7 @@
_ "image/png"
"log"
"os"
- "pkg.deepin.io/lib/notify"
+ "github.com/linuxdeepin/go-lib/notify"
)
func init() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/notify/examples/simple.go
new/go-lib-6.0.0/notify/examples/simple.go
--- old/go-lib-5.8.4/notify/examples/simple.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/notify/examples/simple.go 2021-12-15 12:32:06.000000000
+0100
@@ -22,7 +22,7 @@
package main
import (
- "pkg.deepin.io/lib/notify"
+ "github.com/linuxdeepin/go-lib/notify"
)
func init() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/notify/examples/update.go
new/go-lib-6.0.0/notify/examples/update.go
--- old/go-lib-5.8.4/notify/examples/update.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/notify/examples/update.go 2021-12-15 12:32:06.000000000
+0100
@@ -25,7 +25,7 @@
"log"
"time"
- "pkg.deepin.io/lib/notify"
+ "github.com/linuxdeepin/go-lib/notify"
)
func init() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/notify/notification.go
new/go-lib-6.0.0/notify/notification.go
--- old/go-lib-5.8.4/notify/notification.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/notify/notification.go 2021-12-15 12:32:06.000000000
+0100
@@ -25,7 +25,7 @@
"sync"
"github.com/godbus/dbus"
- "pkg.deepin.io/lib/event"
+ "github.com/linuxdeepin/go-lib/event"
)
type ActionCallback func(n *Notification, action string)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/notify/notify.go
new/go-lib-6.0.0/notify/notify.go
--- old/go-lib-5.8.4/notify/notify.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/notify/notify.go 2021-12-15 12:32:06.000000000 +0100
@@ -20,7 +20,7 @@
package notify
import (
- "pkg.deepin.io/lib/notify/dbusnotify"
+ "github.com/linuxdeepin/go-lib/notify/dbusnotify"
)
var (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/procfs/procfs.go
new/go-lib-6.0.0/procfs/procfs.go
--- old/go-lib-5.8.4/procfs/procfs.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/procfs/procfs.go 2021-12-15 12:32:06.000000000 +0100
@@ -24,7 +24,7 @@
"io/ioutil"
"os"
"path/filepath"
- "pkg.deepin.io/lib/encoding/kv"
+ "github.com/linuxdeepin/go-lib/encoding/kv"
"strconv"
"strings"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/profile/profile.go
new/go-lib-6.0.0/profile/profile.go
--- old/go-lib-5.8.4/profile/profile.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/profile/profile.go 2021-12-15 12:32:06.000000000 +0100
@@ -28,7 +28,7 @@
"runtime/pprof"
"sync"
- "pkg.deepin.io/lib/initializer/v2"
+ "github.com/linuxdeepin/go-lib/initializer/v2"
)
type _Profile struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/proxy/README.md
new/go-lib-6.0.0/proxy/README.md
--- old/go-lib-5.8.4/proxy/README.md 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/proxy/README.md 2021-12-15 12:32:06.000000000 +0100
@@ -17,8 +17,8 @@
```go
import (
- "pkg.deepin.io/gir/glib-2.0"
- "pkg.deepin.io/lib/proxy"
+ "github.com/linuxdeepin/go-gir/glib-2.0"
+ "github.com/linuxdeepin/go-lib/proxy"
)
func main() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/proxy/dev_test.go
new/go-lib-6.0.0/proxy/dev_test.go
--- old/go-lib-5.8.4/proxy/dev_test.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/proxy/dev_test.go 2021-12-15 12:32:06.000000000 +0100
@@ -22,8 +22,8 @@
package proxy
import (
- "pkg.deepin.io/gir/glib-2.0"
- "pkg.deepin.io/lib/log"
+ "github.com/linuxdeepin/go-gir/glib-2.0"
+ "github.com/linuxdeepin/go-lib/log"
"testing"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/proxy/proxy.go
new/go-lib-6.0.0/proxy/proxy.go
--- old/go-lib-5.8.4/proxy/proxy.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/proxy/proxy.go 2021-12-15 12:32:06.000000000 +0100
@@ -22,12 +22,13 @@
import (
"fmt"
"os"
- "pkg.deepin.io/gir/gio-2.0"
- "pkg.deepin.io/lib/gsettings"
- "pkg.deepin.io/lib/log"
- "pkg.deepin.io/lib/utils"
"strconv"
"strings"
+
+ "github.com/linuxdeepin/go-lib/gsettings"
+ "github.com/linuxdeepin/go-lib/log"
+ "github.com/linuxdeepin/go-lib/utils"
+ "github.com/linuxdeepin/go-gir/gio-2.0"
)
// Synchronize proxy gsettings to environment variables.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/pulse/info_test.go
new/go-lib-6.0.0/pulse/info_test.go
--- old/go-lib-5.8.4/pulse/info_test.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/pulse/info_test.go 2021-12-15 12:32:06.000000000 +0100
@@ -4,7 +4,7 @@
"os"
"testing"
- "pkg.deepin.io/lib/xdg/basedir"
+ "github.com/linuxdeepin/go-lib/xdg/basedir"
)
// Please manually enable test CFLAGS in ./pulse.go
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/rpm/golang-deepin-go-lib.spec
new/go-lib-6.0.0/rpm/golang-deepin-go-lib.spec
--- old/go-lib-5.8.4/rpm/golang-deepin-go-lib.spec 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/rpm/golang-deepin-go-lib.spec 2021-12-15
12:32:06.000000000 +0100
@@ -1,9 +1,9 @@
# Run tests in check section
# disable for bootstrapping
%bcond_with check
-%global import_path pkg.deepin.io/lib
+%global import_path github.com/linuxdeepin/go-lib
-%global goipath pkg.deepin.io/lib
+%global goipath github.com/linuxdeepin/go-lib
%global forgeurl https://github.com/linuxdeepin/go-lib
%global with_debug 1
@@ -48,7 +48,7 @@
%description devel
%{summary}.
-Provides: golang(pkg.deepin.io/lib)
+Provides: golang(github.com/linuxdeepin/go-lib)
This package contains library source intended for
building other packages which use import path with
@@ -82,4 +82,4 @@
%changelog
* Wed Mar 12 2021 uoser <[email protected]> - 5.7.5-1
-- Update to 5.7.5
\ No newline at end of file
+- Update to 5.7.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/sound/utils.go
new/go-lib-6.0.0/sound/utils.go
--- old/go-lib-5.8.4/sound/utils.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/sound/utils.go 2021-12-15 12:32:06.000000000 +0100
@@ -23,7 +23,7 @@
"fmt"
"os"
"path"
- "pkg.deepin.io/lib/utils"
+ "github.com/linuxdeepin/go-lib/utils"
)
var (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/sound_effect/alsa_backend.go
new/go-lib-6.0.0/sound_effect/alsa_backend.go
--- old/go-lib-5.8.4/sound_effect/alsa_backend.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/sound_effect/alsa_backend.go 2021-12-15
12:32:06.000000000 +0100
@@ -3,7 +3,7 @@
import (
"unsafe"
- "pkg.deepin.io/lib/asound"
+ "github.com/linuxdeepin/go-lib/asound"
)
type ALSAPlayBackend struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/sound_effect/ogg.go
new/go-lib-6.0.0/sound_effect/ogg.go
--- old/go-lib-5.8.4/sound_effect/ogg.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/sound_effect/ogg.go 2021-12-15 12:32:06.000000000
+0100
@@ -4,9 +4,9 @@
"io"
"time"
- "pkg.deepin.io/lib/asound"
- paSimple "pkg.deepin.io/lib/pulse/simple"
- "pkg.deepin.io/lib/stb_vorbis"
+ "github.com/linuxdeepin/go-lib/asound"
+ paSimple "github.com/linuxdeepin/go-lib/pulse/simple"
+ "github.com/linuxdeepin/go-lib/stb_vorbis"
)
func newOggDecoder(file string) (Decoder, error) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/sound_effect/player.go
new/go-lib-6.0.0/sound_effect/player.go
--- old/go-lib-5.8.4/sound_effect/player.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/sound_effect/player.go 2021-12-15 12:32:06.000000000
+0100
@@ -28,9 +28,9 @@
"sync"
"time"
- "pkg.deepin.io/lib/asound"
- paSimple "pkg.deepin.io/lib/pulse/simple"
- "pkg.deepin.io/lib/sound_effect/theme"
+ "github.com/linuxdeepin/go-lib/asound"
+ paSimple "github.com/linuxdeepin/go-lib/pulse/simple"
+ "github.com/linuxdeepin/go-lib/sound_effect/theme"
)
type Player struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/sound_effect/pulse_backend.go
new/go-lib-6.0.0/sound_effect/pulse_backend.go
--- old/go-lib-5.8.4/sound_effect/pulse_backend.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/sound_effect/pulse_backend.go 2021-12-15
12:32:06.000000000 +0100
@@ -3,7 +3,7 @@
import (
"unsafe"
- paSimple "pkg.deepin.io/lib/pulse/simple"
+ paSimple "github.com/linuxdeepin/go-lib/pulse/simple"
)
type PulseAudioPlayBackend struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/sound_effect/theme/theme.go
new/go-lib-6.0.0/sound_effect/theme/theme.go
--- old/go-lib-5.8.4/sound_effect/theme/theme.go 2021-11-15
06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/sound_effect/theme/theme.go 2021-12-15
12:32:06.000000000 +0100
@@ -5,9 +5,9 @@
"io/ioutil"
"os"
"path/filepath"
- "pkg.deepin.io/lib/keyfile"
- "pkg.deepin.io/lib/strv"
- "pkg.deepin.io/lib/xdg/basedir"
+ "github.com/linuxdeepin/go-lib/keyfile"
+ "github.com/linuxdeepin/go-lib/strv"
+ "github.com/linuxdeepin/go-lib/xdg/basedir"
"strings"
"sync"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/sound_effect/wav.go
new/go-lib-6.0.0/sound_effect/wav.go
--- old/go-lib-5.8.4/sound_effect/wav.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/sound_effect/wav.go 2021-12-15 12:32:06.000000000
+0100
@@ -6,8 +6,8 @@
"time"
"github.com/cryptix/wav"
- "pkg.deepin.io/lib/asound"
- paSimple "pkg.deepin.io/lib/pulse/simple"
+ "github.com/linuxdeepin/go-lib/asound"
+ paSimple "github.com/linuxdeepin/go-lib/pulse/simple"
)
type WavDecoder struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/utils/keyfile.go
new/go-lib-6.0.0/utils/keyfile.go
--- old/go-lib-5.8.4/utils/keyfile.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/utils/keyfile.go 2021-12-15 12:32:06.000000000 +0100
@@ -24,7 +24,7 @@
"os"
"sync"
- "pkg.deepin.io/gir/glib-2.0"
+ "github.com/linuxdeepin/go-gir/glib-2.0"
)
var (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/utils/schemas.go
new/go-lib-6.0.0/utils/schemas.go
--- old/go-lib-5.8.4/utils/schemas.go 2021-11-15 06:35:23.000000000 +0100
+++ new/go-lib-6.0.0/utils/schemas.go 2021-12-15 12:32:06.000000000 +0100
@@ -21,7 +21,8 @@
import (
"fmt"
- "pkg.deepin.io/gir/gio-2.0"
+
+ "github.com/linuxdeepin/go-gir/gio-2.0"
)
func CheckAndNewGSettings(schema string) (*gio.Settings, error) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/go-lib-5.8.4/xdg/userdir/userdir.go
new/go-lib-6.0.0/xdg/userdir/userdir.go
--- old/go-lib-5.8.4/xdg/userdir/userdir.go 2021-11-15 06:35:23.000000000
+0100
+++ new/go-lib-6.0.0/xdg/userdir/userdir.go 2021-12-15 12:32:06.000000000
+0100
@@ -26,7 +26,7 @@
"io"
"os"
"path/filepath"
- "pkg.deepin.io/lib/xdg/basedir"
+ "github.com/linuxdeepin/go-lib/xdg/basedir"
"sync"
"unicode"
)
