Description: Change go package path to github Author: Arun Kumar Pariyar Bug-Debian: https://bugs.debian.org/1027604 Last-Update: 2023-01-03 --- --- go-dlib-5.6.0.9+dfsg.orig/CHANGELOG.md +++ go-dlib-5.6.0.9+dfsg/CHANGELOG.md @@ -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 --- go-dlib-5.6.0.9+dfsg.orig/Makefile +++ go-dlib-5.6.0.9+dfsg/Makefile @@ -1,5 +1,5 @@ GOPATH_DIR = gopath -GOPKG_PREFIX = pkg.deepin.io/lib +GOPKG_PREFIX = github.com/linuxdeepin/go-lib prepare: @if [ ! -d ${GOPATH_DIR}/src/${GOPKG_PREFIX} ]; then \ --- go-dlib-5.6.0.9+dfsg.orig/README.md +++ go-dlib-5.6.0.9+dfsg/README.md @@ -29,7 +29,7 @@ Install ``` mkdir -p $GOPATH/src/pkg.deepin.io -cp -r go-lib $GOPATH/src/pkg.deepin.io/lib +cp -r go-lib $GOPATH/src/github.com/linuxdeepin/go-lib ``` ## Getting help --- go-dlib-5.6.0.9+dfsg.orig/app/app.go +++ go-dlib-5.6.0.9+dfsg/app/app.go @@ -22,10 +22,11 @@ package app import ( "fmt" - "gopkg.in/alecthomas/kingpin.v2" - "pkg.deepin.io/lib/log" - "pkg.deepin.io/lib/profile" "strings" + + "github.com/linuxdeepin/go-lib/log" + "github.com/linuxdeepin/go-lib/profile" + "gopkg.in/alecthomas/kingpin.v2" ) func toLogLevel(name string) (log.Priority, error) { @@ -124,10 +125,11 @@ func (app *App) CpuProf() string { // New creates a new application according to name, description and version. // There are some default command line flag: -// verbose(v for short): show much more message, shorthand for --loglevel debug which will be ignored if loglevel is specificed. -// loglevel(l for short): set log level, possible value is error/warn/info/debug/no, info is default. -// memprof: the file to save memory profile. -// cpuprof: the file to save cpu profile. +// +// verbose(v for short): show much more message, shorthand for --loglevel debug which will be ignored if loglevel is specificed. +// loglevel(l for short): set log level, possible value is error/warn/info/debug/no, info is default. +// memprof: the file to save memory profile. +// cpuprof: the file to save cpu profile. func New(name string, desc string, version string) *App { cmd := kingpin.New(name, desc) cmd.Version(version) --- go-dlib-5.6.0.9+dfsg.orig/appinfo/desktopappinfo/desktopappinfo.go +++ go-dlib-5.6.0.9+dfsg/appinfo/desktopappinfo/desktopappinfo.go @@ -30,11 +30,11 @@ import ( "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" + gio "github.com/linuxdeepin/go-gir/gio-2.0" + "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" ) const ( --- go-dlib-5.6.0.9+dfsg.orig/appinfo/desktopappinfo/desktopappinfo_test.go +++ go-dlib-5.6.0.9+dfsg/appinfo/desktopappinfo/desktopappinfo_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" + "github.com/linuxdeepin/go-lib/keyfile" . "github.com/smartystreets/goconvey/convey" - "pkg.deepin.io/lib/keyfile" ) func TestNewDesktopAppInfoFromKeyFile(t *testing.T) { --- go-dlib-5.6.0.9+dfsg.orig/appinfo/desktopappinfo/exec.go +++ go-dlib-5.6.0.9+dfsg/appinfo/desktopappinfo/exec.go @@ -26,7 +26,7 @@ import ( "net/url" "strings" - "pkg.deepin.io/lib/utils" + "github.com/linuxdeepin/go-lib/utils" ) func getDefaultTerminal() (exec string, execArg string) { --- go-dlib-5.6.0.9+dfsg.orig/archive/archive.go +++ go-dlib-5.6.0.9+dfsg/archive/archive.go @@ -23,7 +23,7 @@ import ( "fmt" "strings" - "pkg.deepin.io/lib/archive/gzip" + "github.com/linuxdeepin/go-lib/archive/gzip" ) const ( --- go-dlib-5.6.0.9+dfsg.orig/archive/gzip/tar.go +++ go-dlib-5.6.0.9+dfsg/archive/gzip/tar.go @@ -23,7 +23,8 @@ import ( "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 { --- go-dlib-5.6.0.9+dfsg.orig/archive/tar.go +++ go-dlib-5.6.0.9+dfsg/archive/tar.go @@ -22,7 +22,8 @@ package archive import ( "archive/tar" "os" - "pkg.deepin.io/lib/archive/utils" + + "github.com/linuxdeepin/go-lib/archive/utils" ) func tarCompressFiles(files []string, dest string) error { --- go-dlib-5.6.0.9+dfsg.orig/archive/utils/tar.go +++ go-dlib-5.6.0.9+dfsg/archive/utils/tar.go @@ -25,7 +25,8 @@ import ( "io" "os" "path" - dutils "pkg.deepin.io/lib/utils" + + dutils "github.com/linuxdeepin/go-lib/utils" ) func TarWriterCompressFiles(writer *tar.Writer, files []string) error { --- go-dlib-5.6.0.9+dfsg.orig/backlight/display/display.go +++ go-dlib-5.6.0.9+dfsg/backlight/display/display.go @@ -20,8 +20,9 @@ package display import ( - "pkg.deepin.io/lib/backlight/common" "strings" + + "github.com/linuxdeepin/go-lib/backlight/common" ) const controllersDir = "/sys/class/backlight" --- go-dlib-5.6.0.9+dfsg.orig/backlight/keyboard/keyboard.go +++ go-dlib-5.6.0.9+dfsg/backlight/keyboard/keyboard.go @@ -21,8 +21,9 @@ package keyboard import ( "path/filepath" - . "pkg.deepin.io/lib/backlight/common" "strings" + + . "github.com/linuxdeepin/go-lib/backlight/common" ) const controllersDir = "/sys/class/leds" --- go-dlib-5.6.0.9+dfsg.orig/calendar/calendar.go +++ go-dlib-5.6.0.9+dfsg/calendar/calendar.go @@ -20,7 +20,7 @@ package calendar import ( - "pkg.deepin.io/lib/calendar/lunar" + "github.com/linuxdeepin/go-lib/calendar/lunar" ) /* --- go-dlib-5.6.0.9+dfsg.orig/calendar/lunar/elp82.go +++ go-dlib-5.6.0.9+dfsg/calendar/lunar/elp82.go @@ -21,7 +21,8 @@ package lunar import ( "math" - "pkg.deepin.io/lib/calendar/util" + + "github.com/linuxdeepin/go-lib/calendar/util" ) // 参数 T 儒略世纪数 --- go-dlib-5.6.0.9+dfsg.orig/calendar/lunar/lunar.go +++ go-dlib-5.6.0.9+dfsg/calendar/lunar/lunar.go @@ -23,7 +23,7 @@ import ( "fmt" "time" - "pkg.deepin.io/lib/calendar/util" + "github.com/linuxdeepin/go-lib/calendar/util" ) // Calendar 保存公历年内计算农历所需的信息 --- go-dlib-5.6.0.9+dfsg.orig/calendar/lunar/newmoon_test.go +++ go-dlib-5.6.0.9+dfsg/calendar/lunar/newmoon_test.go @@ -20,7 +20,7 @@ package lunar import ( - "pkg.deepin.io/lib/calendar/util" + "github.com/linuxdeepin/go-lib/calendar/util" "testing" ) --- go-dlib-5.6.0.9+dfsg.orig/calendar/lunar/solarterms.go +++ go-dlib-5.6.0.9+dfsg/calendar/lunar/solarterms.go @@ -21,7 +21,8 @@ package lunar import ( "math" - "pkg.deepin.io/lib/calendar/util" + + "github.com/linuxdeepin/go-lib/calendar/util" ) var SolarTermNames = []string{ --- go-dlib-5.6.0.9+dfsg.orig/calendar/lunar/solarterms_test.go +++ go-dlib-5.6.0.9+dfsg/calendar/lunar/solarterms_test.go @@ -20,8 +20,8 @@ package lunar import ( + "github.com/linuxdeepin/go-lib/calendar/util" . "github.com/smartystreets/goconvey/convey" - "pkg.deepin.io/lib/calendar/util" "strings" "testing" ) --- go-dlib-5.6.0.9+dfsg.orig/calendar/lunar/vsop87earthd.go +++ go-dlib-5.6.0.9+dfsg/calendar/lunar/vsop87earthd.go @@ -21,7 +21,8 @@ package lunar import ( "math" - "pkg.deepin.io/lib/calendar/util" + + "github.com/linuxdeepin/go-lib/calendar/util" ) /** --- go-dlib-5.6.0.9+dfsg.orig/calendar/lunar/vsop87earthd_test.go +++ go-dlib-5.6.0.9+dfsg/calendar/lunar/vsop87earthd_test.go @@ -20,7 +20,7 @@ package lunar import ( - "pkg.deepin.io/lib/calendar/util" + "github.com/linuxdeepin/go-lib/calendar/util" "testing" ) --- go-dlib-5.6.0.9+dfsg.orig/cgroup/cgroup.go +++ go-dlib-5.6.0.9+dfsg/cgroup/cgroup.go @@ -13,7 +13,7 @@ import ( "strings" "syscall" - "pkg.deepin.io/lib/log" + "github.com/linuxdeepin/go-lib/log" ) var logger = log.NewLogger("lib/cgroup") --- go-dlib-5.6.0.9+dfsg.orig/dbusutil/_tool/dbusutil-gen/main.go +++ go-dlib-5.6.0.9+dfsg/dbusutil/_tool/dbusutil-gen/main.go @@ -15,7 +15,7 @@ import ( "strings" "unicode" - "pkg.deepin.io/lib/strv" + "github.com/linuxdeepin/go-lib/strv" ) func astNodeToStr(fset *token.FileSet, node interface{}) (string, error) { --- go-dlib-5.6.0.9+dfsg.orig/dbusutil/gsprop/gsprop.go +++ go-dlib-5.6.0.9+dfsg/dbusutil/gsprop/gsprop.go @@ -5,10 +5,10 @@ import ( "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-gir/gio-2.0" + "github.com/linuxdeepin/go-lib/dbusutil" + "github.com/linuxdeepin/go-lib/gsettings" ) type base struct { --- go-dlib-5.6.0.9+dfsg.orig/dbusutil/gsprop/gsprop_test.go +++ go-dlib-5.6.0.9+dfsg/dbusutil/gsprop/gsprop_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "pkg.deepin.io/gir/gio-2.0" "github.com/godbus/dbus" "github.com/godbus/dbus/introspect" - "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" --- go-dlib-5.6.0.9+dfsg.orig/dbusutil/introspectable.go +++ go-dlib-5.6.0.9+dfsg/dbusutil/introspectable.go @@ -6,7 +6,7 @@ import ( "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{ --- go-dlib-5.6.0.9+dfsg.orig/dbusutil/proxy/object.go +++ go-dlib-5.6.0.9+dfsg/dbusutil/proxy/object.go @@ -6,13 +6,13 @@ import ( "sync" "github.com/godbus/dbus" - "pkg.deepin.io/lib/dbusutil" + "github.com/linuxdeepin/go-lib/dbusutil" ) type Object struct { - obj dbus.BusObject - conn *dbus.Conn - mu sync.Mutex + obj dbus.BusObject + conn *dbus.Conn + mu sync.Mutex extraMap map[string]interface{} *objectSignalExt } @@ -46,7 +46,7 @@ type objectSignalExt struct { // used when ruleAuto is false handleIds []dbusutil.SignalHandlerId //nolint: - propChangedHandlerId dbusutil.SignalHandlerId //nolint: + propChangedHandlerId dbusutil.SignalHandlerId //nolint: propChangedCallbacks map[propChangedKey][]PropChangedCallback //nolint: } --- go-dlib-5.6.0.9+dfsg.orig/doc/dbusutil.md +++ go-dlib-5.6.0.9+dfsg/doc/dbusutil.md @@ -212,7 +212,7 @@ Prop4 使用 gsprop.String 内部的锁� 先安装 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 ``` 在代码里写上特殊注释 --- go-dlib-5.6.0.9+dfsg.orig/gdkpixbuf/README.md +++ go-dlib-5.6.0.9+dfsg/gdkpixbuf/README.md @@ -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** 对目标文件进行模糊处理 --- go-dlib-5.6.0.9+dfsg.orig/gdkpixbuf/blur.go +++ go-dlib-5.6.0.9+dfsg/gdkpixbuf/blur.go @@ -27,7 +27,8 @@ import "C" import ( "fmt" - "pkg.deepin.io/lib/utils" + + "github.com/linuxdeepin/go-lib/utils" ) // BlurImage generate blur effect to an image file. --- go-dlib-5.6.0.9+dfsg.orig/gdkpixbuf/gdkpixbuf.go +++ go-dlib-5.6.0.9+dfsg/gdkpixbuf/gdkpixbuf.go @@ -31,8 +31,8 @@ import ( "image" "unsafe" + "github.com/linuxdeepin/go-lib/utils" x "github.com/linuxdeepin/go-x11-client" - "pkg.deepin.io/lib/utils" ) // Format defines the type of image format. --- go-dlib-5.6.0.9+dfsg.orig/gdkpixbuf/utils.go +++ go-dlib-5.6.0.9+dfsg/gdkpixbuf/utils.go @@ -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 --- go-dlib-5.6.0.9+dfsg.orig/graphic/info.go +++ go-dlib-5.6.0.9+dfsg/graphic/info.go @@ -22,7 +22,8 @@ package graphic import ( "image" "os" - dutils "pkg.deepin.io/lib/utils" + + dutils "github.com/linuxdeepin/go-lib/utils" ) // GetImageSize return image's width and height. --- go-dlib-5.6.0.9+dfsg.orig/graphic/utils.go +++ go-dlib-5.6.0.9+dfsg/graphic/utils.go @@ -23,7 +23,8 @@ import ( "image" "image/draw" "os" - "pkg.deepin.io/lib/utils" + + "github.com/linuxdeepin/go-lib/utils" ) func generateCacheFilePath(keyword string) (dstfile string) { --- go-dlib-5.6.0.9+dfsg.orig/imgutil/imgutil.go +++ go-dlib-5.6.0.9+dfsg/imgutil/imgutil.go @@ -8,10 +8,10 @@ import ( "image/png" "os" + "github.com/linuxdeepin/go-lib/gdkpixbuf" + "github.com/linuxdeepin/go-lib/strv" _ "golang.org/x/image/bmp" _ "golang.org/x/image/tiff" - "pkg.deepin.io/lib/gdkpixbuf" - "pkg.deepin.io/lib/strv" ) const ( --- go-dlib-5.6.0.9+dfsg.orig/initializer/initializer_test.go +++ go-dlib-5.6.0.9+dfsg/initializer/initializer_test.go @@ -23,8 +23,8 @@ import ( "errors" "testing" + . "github.com/linuxdeepin/go-lib/initializer" . "github.com/smartystreets/goconvey/convey" - . "pkg.deepin.io/lib/initializer" ) func TestInitializer(t *testing.T) { --- go-dlib-5.6.0.9+dfsg.orig/initializer/v2/initializer_test.go +++ go-dlib-5.6.0.9+dfsg/initializer/v2/initializer_test.go @@ -23,8 +23,8 @@ import ( "errors" "testing" + "github.com/linuxdeepin/go-lib/initializer/v2" . "github.com/smartystreets/goconvey/convey" - "pkg.deepin.io/lib/initializer/v2" ) func e1() error { --- go-dlib-5.6.0.9+dfsg.orig/iso/country.go +++ go-dlib-5.6.0.9+dfsg/iso/country.go @@ -24,9 +24,10 @@ import ( "fmt" "io/ioutil" "os" - . "pkg.deepin.io/lib/gettext" "strings" "sync" + + . "github.com/linuxdeepin/go-lib/gettext" ) const iso3166XMLFile = "/usr/share/xml/iso-codes/iso_3166.xml" --- go-dlib-5.6.0.9+dfsg.orig/iso/country_test.go +++ go-dlib-5.6.0.9+dfsg/iso/country_test.go @@ -20,9 +20,9 @@ package iso import ( + . "github.com/linuxdeepin/go-lib/gettext" C "gopkg.in/check.v1" "os" - . "pkg.deepin.io/lib/gettext" ) const envLanguage = "LANGUAGE" --- go-dlib-5.6.0.9+dfsg.orig/keyfile/get.go +++ go-dlib-5.6.0.9+dfsg/keyfile/get.go @@ -26,7 +26,7 @@ import ( "strings" "unicode/utf8" - libLocale "pkg.deepin.io/lib/locale" + libLocale "github.com/linuxdeepin/go-lib/locale" ) func parseValueAsBool(value string) (bool, error) { --- go-dlib-5.6.0.9+dfsg.orig/log/README.md +++ go-dlib-5.6.0.9+dfsg/log/README.md @@ -56,7 +56,7 @@ env DDE_DEBUG_MATCH="network" DDE_DEBUG_ ## 示例代码 ```go -import "pkg.deepin.io/lib/log" +import "github.com/linuxdeepin/go-lib/log" import "flag" var ( --- go-dlib-5.6.0.9+dfsg.orig/log/backend_console.go +++ go-dlib-5.6.0.9+dfsg/log/backend_console.go @@ -22,8 +22,9 @@ package log import ( "fmt" "os" - "pkg.deepin.io/lib/utils" "time" + + "github.com/linuxdeepin/go-lib/utils" ) const defaultDebugConsoleEnv = "DDE_DEBUG_CONSOLE" --- go-dlib-5.6.0.9+dfsg.orig/log/logger.go +++ go-dlib-5.6.0.9+dfsg/log/logger.go @@ -31,7 +31,7 @@ import ( "runtime" "sync" - "pkg.deepin.io/lib/utils" + "github.com/linuxdeepin/go-lib/utils" ) const ( --- go-dlib-5.6.0.9+dfsg.orig/mime/mime.go +++ go-dlib-5.6.0.9+dfsg/mime/mime.go @@ -21,8 +21,9 @@ package mime import ( "fmt" - "pkg.deepin.io/gir/gio-2.0" - dutils "pkg.deepin.io/lib/utils" + + "github.com/linuxdeepin/go-gir/gio-2.0" + dutils "github.com/linuxdeepin/go-lib/utils" ) const ( --- go-dlib-5.6.0.9+dfsg.orig/mime/theme.go +++ go-dlib-5.6.0.9+dfsg/mime/theme.go @@ -22,7 +22,8 @@ package mime import ( "fmt" "path" - dutils "pkg.deepin.io/lib/utils" + + dutils "github.com/linuxdeepin/go-lib/utils" ) const ( --- go-dlib-5.6.0.9+dfsg.orig/notify/examples/action.go +++ go-dlib-5.6.0.9+dfsg/notify/examples/action.go @@ -1,3 +1,4 @@ +//go:build ignore // +build ignore /* @@ -23,8 +24,9 @@ package main import ( "log" - "pkg.deepin.io/lib/notify" "time" + + "github.com/linuxdeepin/go-lib/notify" ) func init() { --- go-dlib-5.6.0.9+dfsg.orig/notify/examples/image.go +++ go-dlib-5.6.0.9+dfsg/notify/examples/image.go @@ -1,3 +1,4 @@ +//go:build ignore // +build ignore /* @@ -27,7 +28,8 @@ import ( _ "image/png" "log" "os" - "pkg.deepin.io/lib/notify" + + "github.com/linuxdeepin/go-lib/notify" ) func init() { --- go-dlib-5.6.0.9+dfsg.orig/notify/examples/simple.go +++ go-dlib-5.6.0.9+dfsg/notify/examples/simple.go @@ -1,3 +1,4 @@ +//go:build ignore // +build ignore /* @@ -22,7 +23,7 @@ package main import ( - "pkg.deepin.io/lib/notify" + "github.com/linuxdeepin/go-lib/notify" ) func init() { --- go-dlib-5.6.0.9+dfsg.orig/notify/examples/update.go +++ go-dlib-5.6.0.9+dfsg/notify/examples/update.go @@ -1,3 +1,4 @@ +//go:build ignore // +build ignore /* @@ -25,7 +26,7 @@ import ( "log" "time" - "pkg.deepin.io/lib/notify" + "github.com/linuxdeepin/go-lib/notify" ) func init() { --- go-dlib-5.6.0.9+dfsg.orig/notify/notification.go +++ go-dlib-5.6.0.9+dfsg/notify/notification.go @@ -25,7 +25,7 @@ import ( "sync" "github.com/godbus/dbus" - "pkg.deepin.io/lib/event" + "github.com/linuxdeepin/go-lib/event" ) type ActionCallback func(n *Notification, action string) --- go-dlib-5.6.0.9+dfsg.orig/notify/notify.go +++ go-dlib-5.6.0.9+dfsg/notify/notify.go @@ -20,7 +20,7 @@ package notify import ( - "pkg.deepin.io/lib/notify/dbusnotify" + "github.com/linuxdeepin/go-lib/notify/dbusnotify" ) var ( @@ -79,7 +79,7 @@ type ServerInfo struct { Name, Vendor, Version, SpecVersion string } -//name string, vendor string, version string, spec_version string +// name string, vendor string, version string, spec_version string func GetServerInfo() (*ServerInfo, error) { name, vendor, version, specVersion, err := notifier.GetServerInformation() if err != nil { --- go-dlib-5.6.0.9+dfsg.orig/procfs/procfs.go +++ go-dlib-5.6.0.9+dfsg/procfs/procfs.go @@ -24,9 +24,10 @@ import ( "io/ioutil" "os" "path/filepath" - "pkg.deepin.io/lib/encoding/kv" "strconv" "strings" + + "github.com/linuxdeepin/go-lib/encoding/kv" ) type Process uint --- go-dlib-5.6.0.9+dfsg.orig/profile/profile.go +++ go-dlib-5.6.0.9+dfsg/profile/profile.go @@ -28,7 +28,7 @@ import ( "runtime/pprof" "sync" - "pkg.deepin.io/lib/initializer/v2" + "github.com/linuxdeepin/go-lib/initializer/v2" ) type _Profile struct { --- go-dlib-5.6.0.9+dfsg.orig/proxy/README.md +++ go-dlib-5.6.0.9+dfsg/proxy/README.md @@ -17,8 +17,8 @@ no_proxy="localhost,127.0.0.0/8,::1" ```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() { --- go-dlib-5.6.0.9+dfsg.orig/proxy/dev_test.go +++ go-dlib-5.6.0.9+dfsg/proxy/dev_test.go @@ -1,4 +1,5 @@ -//+build dev +//go:build dev +// +build dev /* * Copyright (C) 2016 ~ 2018 Deepin Technology Co., Ltd. @@ -22,9 +23,9 @@ package proxy import ( - "pkg.deepin.io/gir/glib-2.0" + "github.com/linuxdeepin/go-gir/glib-2.0" + "github.com/linuxdeepin/go-lib/log" C "gopkg.in/check.v1" - "pkg.deepin.io/lib/log" "testing" ) --- go-dlib-5.6.0.9+dfsg.orig/proxy/proxy.go +++ go-dlib-5.6.0.9+dfsg/proxy/proxy.go @@ -22,12 +22,13 @@ package proxy 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-gir/gio-2.0" + "github.com/linuxdeepin/go-lib/gsettings" + "github.com/linuxdeepin/go-lib/log" + "github.com/linuxdeepin/go-lib/utils" ) // Synchronize proxy gsettings to environment variables. --- go-dlib-5.6.0.9+dfsg.orig/pulse/info_test.go +++ go-dlib-5.6.0.9+dfsg/pulse/info_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "pkg.deepin.io/lib/xdg/basedir" + "github.com/linuxdeepin/go-lib/xdg/basedir" ) // Please manually enable test CFLAGS in ./pulse.go --- go-dlib-5.6.0.9+dfsg.orig/sound/utils.go +++ go-dlib-5.6.0.9+dfsg/sound/utils.go @@ -23,7 +23,8 @@ import ( "fmt" "os" "path" - "pkg.deepin.io/lib/utils" + + "github.com/linuxdeepin/go-lib/utils" ) var ( --- go-dlib-5.6.0.9+dfsg.orig/sound_effect/alsa_backend.go +++ go-dlib-5.6.0.9+dfsg/sound_effect/alsa_backend.go @@ -3,7 +3,7 @@ package sound_effect import ( "unsafe" - "pkg.deepin.io/lib/asound" + "github.com/linuxdeepin/go-lib/asound" ) type ALSAPlayBackend struct { --- go-dlib-5.6.0.9+dfsg.orig/sound_effect/ogg.go +++ go-dlib-5.6.0.9+dfsg/sound_effect/ogg.go @@ -4,9 +4,9 @@ import ( "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) { --- go-dlib-5.6.0.9+dfsg.orig/sound_effect/player.go +++ go-dlib-5.6.0.9+dfsg/sound_effect/player.go @@ -28,9 +28,9 @@ import ( "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 { --- go-dlib-5.6.0.9+dfsg.orig/sound_effect/pulse_backend.go +++ go-dlib-5.6.0.9+dfsg/sound_effect/pulse_backend.go @@ -3,7 +3,7 @@ package sound_effect import ( "unsafe" - paSimple "pkg.deepin.io/lib/pulse/simple" + paSimple "github.com/linuxdeepin/go-lib/pulse/simple" ) type PulseAudioPlayBackend struct { --- go-dlib-5.6.0.9+dfsg.orig/sound_effect/theme/theme.go +++ go-dlib-5.6.0.9+dfsg/sound_effect/theme/theme.go @@ -5,11 +5,12 @@ import ( "io/ioutil" "os" "path/filepath" - "pkg.deepin.io/lib/keyfile" - "pkg.deepin.io/lib/strv" - "pkg.deepin.io/lib/xdg/basedir" "strings" "sync" + + "github.com/linuxdeepin/go-lib/keyfile" + "github.com/linuxdeepin/go-lib/strv" + "github.com/linuxdeepin/go-lib/xdg/basedir" ) type Theme struct { --- go-dlib-5.6.0.9+dfsg.orig/sound_effect/wav.go +++ go-dlib-5.6.0.9+dfsg/sound_effect/wav.go @@ -6,8 +6,8 @@ import ( "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 { --- go-dlib-5.6.0.9+dfsg.orig/timer/timer_test.go +++ go-dlib-5.6.0.9+dfsg/timer/timer_test.go @@ -20,8 +20,8 @@ package timer_test import ( + . "github.com/linuxdeepin/go-lib/timer" . "github.com/smartystreets/goconvey/convey" - . "pkg.deepin.io/lib/timer" "testing" "time" ) --- go-dlib-5.6.0.9+dfsg.orig/utils/keyfile.go +++ go-dlib-5.6.0.9+dfsg/utils/keyfile.go @@ -24,7 +24,7 @@ import ( "os" "sync" - "pkg.deepin.io/gir/glib-2.0" + "github.com/linuxdeepin/go-gir/glib-2.0" ) var ( @@ -226,8 +226,8 @@ func WriteKeyToKeyFile(filename, group, return ok } -//TODO: Abandoned it -//Do't use this interface. +// TODO: Abandoned it +// Do't use this interface. func WriteStringToKeyFile(filename, content string) bool { err := WriteStringToFile(filename, content) return err == nil --- go-dlib-5.6.0.9+dfsg.orig/utils/schemas.go +++ go-dlib-5.6.0.9+dfsg/utils/schemas.go @@ -21,7 +21,8 @@ package utils import ( "fmt" - "pkg.deepin.io/gir/gio-2.0" + + "github.com/linuxdeepin/go-gir/gio-2.0" ) func CheckAndNewGSettings(schema string) (*gio.Settings, error) { --- go-dlib-5.6.0.9+dfsg.orig/xdg/userdir/userdir.go +++ go-dlib-5.6.0.9+dfsg/xdg/userdir/userdir.go @@ -26,9 +26,10 @@ import ( "io" "os" "path/filepath" - "pkg.deepin.io/lib/xdg/basedir" "sync" "unicode" + + "github.com/linuxdeepin/go-lib/xdg/basedir" ) const (