[Merge] lp:~noskcaj/ubuntu/trusty/xchat-gnome/merge into lp:ubuntu/xchat-gnome

Daniel Holbach daniel.holbach at ubuntu.com
Thu Jan 23 14:47:35 UTC 2014 

Review: Needs Fixing

daniel at daydream:~/xchat-gnome$ bzr merge lp:~noskcaj/ubuntu/trusty/xchat-gnome/merge
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.30.0~git20131003.d20b8d.                                    
Unapplying quilt patches to prevent spurious conflicts
+N  .bzrignore                                                                                                                                       
+N  MAINTAINERS
+N  data/icons/hicolor/16x16/apps/xchat-gnome-message-new.svg
+N  data/icons/hicolor/16x16/apps/xchat-gnome-message-nickname-said.svg
+N  data/icons/hicolor/16x16/apps/xchat-gnome-plugin.svg
+N  data/icons/hicolor/16x16/apps/xchat-gnome-status-halfop.svg
+N  data/icons/hicolor/16x16/apps/xchat-gnome-status-operator.svg
+N  data/icons/hicolor/22x22/apps/xchat-gnome-message-new.svg
+N  data/icons/hicolor/22x22/apps/xchat-gnome-message-nickname-said.svg
+N  data/icons/hicolor/22x22/apps/xchat-gnome-plugin.svg
+N  data/icons/hicolor/22x22/apps/xchat-gnome-status-halfop.svg
+N  data/icons/hicolor/22x22/apps/xchat-gnome-status-operator.svg
+N  debian/patches/01_finish_gtk3_port.patch
+N  debian/patches/02_bring_back_completion.patch
+N  debian/patches/03_scroll_wheel.patch
+N  debian/patches/04_no_spellcheck.patch
+N  help/omf.make
+N  help/xmldocs.make
+N  media/
+N  media/xchat-gnome-small.blend
+N  media/xchat-gnome-small.png
+N  media/xchat-gnome.blend
+N  media/xchat-gnome.png
+N  plugins/url_scraper/BUGS
+N  po/eo.po
+N  po/sr at latin.po
+N  src/common/.cvsignore
+N  src/common/make-te.c
+N  src/common/textevents.in
+N  xchat-gnome.doap
-D  ABOUT-NLS
-D  ChangeLog
-D  Makefile.in
-D  aclocal.m4
 M  autogen.sh
-D  compile
-D  config.guess
-D  config.h.in
-D  config.rpath
-D  config.sub
-D  configure
 M  configure.ac
-D  data/Makefile.in
-D  data/icons/Makefile.in
-D  data/icons/hicolor/128x128/Makefile.in
-D  data/icons/hicolor/128x128/apps/Makefile.in
-D  data/icons/hicolor/16x16/Makefile.in
-D  data/icons/hicolor/16x16/apps/Makefile.in
-D  data/icons/hicolor/22x22/Makefile.in
-D  data/icons/hicolor/22x22/apps/Makefile.in
-D  data/icons/hicolor/48x48/Makefile.in
-D  data/icons/hicolor/48x48/apps/Makefile.in
-D  data/icons/hicolor/Makefile.in
-D  data/icons/hicolor/scalable/Makefile.in
-D  data/icons/hicolor/scalable/apps/Makefile.in
 M  data/irc-network-editor.glade
 M  data/preferences-dialog.glade
 M  data/topic-change.glade
 M  data/xchat-gnome.glade
 M  debian/changelog
 M  debian/compat
 M  debian/control
 M  debian/control.in
 M  debian/patches/00git_remember_window_maximise.patch
 M  debian/patches/04_autojoin_ubuntu_chan.patch
 M  debian/patches/100-Zero-out-passwords-upon-exit.patch
 M  debian/patches/101-Sync-in-servers-from-xchat.patch
 M  debian/patches/102-Drop-IPV6-servers.patch
 M  debian/patches/103-Add-chillfactory-irc-servers.patch
 M  debian/patches/104-Don-t-crash-if-servlist-is-undefined.patch
 M  debian/patches/105-Use-u-instead-of-s.patch
 M  debian/patches/106-ensure-an-empty-string-at-index-32-for-cmd_deop-etc.patch
 M  debian/patches/107-fix-permissions-on-creating-files.patch
 M  debian/patches/108-userlist-default-width.patch
-D  debian/patches/109-use-scrollback-timestamps.patch
 M  debian/patches/10_xchat-gnome-close-event.patch
-D  debian/patches/110-fix-fd-leak.patch
 M  debian/patches/111-increase-channel-limit.patch
-D  debian/patches/115-fix-network-editor.patch
-D  debian/patches/116-remove-amiganet.patch
 M  debian/patches/117-fix-net-monitor-segfault.patch
 M  debian/patches/118-fix-net-monitor-reconnect.patch
 M  debian/patches/119-fix-null-channel-list-window.patch
 M  debian/patches/120-fix-clipboard-segfault.patch
 M  debian/patches/20_add_gui_focus.patch
 M  debian/patches/51_freenode_default_port_8001.patch
 M  debian/patches/95_apturl-support.patch
 M  debian/patches/define_functions_fix_build.patch
-D  debian/patches/link.diff
 M  debian/patches/series
 M  debian/rules
 M  debian/watch
 M  debian/xchat-gnome-common.install
 M  debian/xchat-gnome.install
-D  depcomp
-D  gnome-doc-utils.make
-D  help/Makefile.in
-D  help/ca/xchat-gnome.xml
-D  help/cs/xchat-gnome.xml
-D  help/da/xchat-gnome.xml
-D  help/de/xchat-gnome.xml
 M  help/es/es.po
-D  help/es/xchat-gnome.xml
-D  help/fr/xchat-gnome.xml
 M  help/it/it.po
-D  help/it/xchat-gnome.xml
-D  help/oc/xchat-gnome.xml
 M  help/pt_BR/pt_BR.po
-D  help/pt_BR/xchat-gnome.xml
-D  help/sl/xchat-gnome.xml
-D  help/sv/xchat-gnome.xml
 M  help/th/th.po
-D  help/th/xchat-gnome.xml
-D  help/zh_CN/xchat-gnome.xml
-D  install-sh
-D  ltmain.sh
-D  m4/gettext.m4
-D  m4/gnome-doc-utils.m4
-D  m4/iconv.m4
-D  m4/intlmacosx.m4
-D  m4/intltool.m4
-D  m4/lib-ld.m4
-D  m4/lib-link.m4
-D  m4/lib-prefix.m4
-D  m4/libtool.m4
-D  m4/ltoptions.m4
-D  m4/ltsugar.m4
-D  m4/ltversion.m4
-D  m4/lt~obsolete.m4
-D  m4/nls.m4
-D  m4/po.m4
-D  m4/progtest.m4
-D  missing
-D  plugins/Makefile.in
-D  plugins/autoaway/Makefile.in
-D  plugins/net-monitor/Makefile.in
 M  plugins/net-monitor/net-monitor.c
-D  plugins/notification/Makefile.in
-D  plugins/notify-osd/Makefile.in
-D  plugins/perl/Makefile.in
-D  plugins/python/Makefile.in
-D  plugins/sound-notification/Makefile.in
-D  plugins/tcl/Makefile.in
-D  plugins/url_scraper/Makefile.in
 M  po/LINGUAS
-D  po/Makefile.in.in
 M  po/POTFILES.in
 M  po/cs.po
 M  po/da.po
 M  po/de.po
 M  po/el.po
 M  po/en_GB.po
 M  po/es.po
 M  po/fi.po
 M  po/fr.po
 M  po/gl.po
 M  po/hu.po
 M  po/it.po
 M  po/ja.po
 M  po/lt.po
 M  po/lv.po
 M  po/pt_BR.po
 M  po/ru.po
 M  po/sl.po
 M  po/sv.po
 M  po/th.po
 M  src/Makefile.am
-D  src/Makefile.in
-D  src/common/Makefile.in
-D  src/common/dbus/Makefile.in
 M  src/common/inbound.c
 M  src/common/proto-irc.c
 M  src/common/servlist.c
 M  src/common/userlist.c
 M  src/common/xchat.c
 M  src/common/xchat.h
 M  src/fe-gnome/Makefile.am
-D  src/fe-gnome/Makefile.in
 M  src/fe-gnome/about.c
 M  src/fe-gnome/channel-list-window.c
 M  src/fe-gnome/conversation-panel.c
 M  src/fe-gnome/conversation-panel.h
 M  src/fe-gnome/dcc-window.c
 M  src/fe-gnome/fe-gnome.c
 M  src/fe-gnome/find-bar.c
-D  src/fe-gnome/image-utils.c
-D  src/fe-gnome/image-utils.h
 M  src/fe-gnome/irc-network-editor.c
 M  src/fe-gnome/main-window.c
 M  src/fe-gnome/navigation-tree.c
 M  src/fe-gnome/palette.c
 M  src/fe-gnome/palette.h
 M  src/fe-gnome/preferences-page-colors.c
 M  src/fe-gnome/preferences-page-spellcheck.c
 M  src/fe-gnome/text-entry.c
 M  src/fe-gnome/text-entry.h
 M  src/fe-gnome/userlist-gui.c
 M  src/fe-gnome/userlist.c
 M  src/fe-gnome/userlist.h
 M  src/fe-gnome/util.c
-D  src/fe-gnome/xg-marshal.c
-D  src/fe-gnome/xg-marshal.h
 M  src/fe-gnome/xtext.c
 M  src/fe-gnome/xtext.h
-D  src/libcontrast/Makefile.in
-D  src/libeggsmclient/
-D  src/libeggsmclient/Makefile.am
-D  src/libeggsmclient/Makefile.in
-D  src/libeggsmclient/eggdesktopfile.c
-D  src/libeggsmclient/eggdesktopfile.h
-D  src/libeggsmclient/eggsmclient-private.h
-D  src/libeggsmclient/eggsmclient-xsmp.c
-D  src/libeggsmclient/eggsmclient.c
-D  src/libeggsmclient/eggsmclient.h
Text conflict in configure.ac
Text conflict in src/fe-gnome/irc-network-editor.c
Text conflict in src/fe-gnome/text-entry.c
Auf 3 Konflikte gestoßen.                                                                                                                            
daniel at daydream:~/xchat-gnome$ 
-- 
https://code.launchpad.net/~noskcaj/ubuntu/trusty/xchat-gnome/merge/+merge/202555
Your team Ubuntu branches is subscribed to branch lp:ubuntu/xchat-gnome.

More information about the Ubuntu-reviews mailing list