[med-svn] [aeskulap] 01/03: Correct patch
Gert Wollny
gewo at moszumanska.debian.org
Thu Feb 1 09:53:17 UTC 2018
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository aeskulap.
commit 466c40c59fbd36c2283683cf4c0097355ac47ef7
Author: Gert Wollny <gewo at debian.org>
Date: Thu Feb 1 10:32:08 2018 +0100
Correct patch
---
debian/patches/bundle-glademm.patch | 60 ++++---------------------------------
1 file changed, 5 insertions(+), 55 deletions(-)
diff --git a/debian/patches/bundle-glademm.patch b/debian/patches/bundle-glademm.patch
index 753facb..1f9aad9 100644
--- a/debian/patches/bundle-glademm.patch
+++ b/debian/patches/bundle-glademm.patch
@@ -9,11 +9,9 @@ Description: Bundle glademm
one is also an old Gnome2 program that will probably be dropped
bundlings seems like a viable option.
-diff --git a/Makefile.am b/Makefile.am
-index e31b3b7..3468b66 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -4,6 +4,7 @@ SUBDIRS = \
+@@ -4,6 +4,7 @@
po \
configuration \
imagepool \
@@ -21,11 +19,9 @@ index e31b3b7..3468b66 100644
widgets \
src \
pixmaps
-diff --git a/configure.ac b/configure.ac
-index 30f36b7..dace3d8 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -74,9 +74,9 @@ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.6.0)
+@@ -72,9 +72,9 @@
AC_SUBST(GTKMM_CFLAGS)
AC_SUBST(GTKMM_LIBS)
@@ -38,7 +34,7 @@ index 30f36b7..dace3d8 100644
PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
AC_SUBST(GTHREAD_CFLAGS)
-@@ -157,6 +157,7 @@ po/Makefile.in
+@@ -130,6 +130,7 @@
Makefile
configuration/Makefile
imagepool/Makefile
@@ -46,9 +42,6 @@ index 30f36b7..dace3d8 100644
src/Makefile
widgets/Makefile
pixmaps/Makefile
-diff --git a/glademm/Makefile.am b/glademm/Makefile.am
-new file mode 100644
-index 0000000..e8ccfdc
--- /dev/null
+++ b/glademm/Makefile.am
@@ -0,0 +1,33 @@
@@ -85,9 +78,6 @@ index 0000000..e8ccfdc
+ -I$(top_srcdir) \
+ $(GLADE_CFLAGS) \
+ $(GTKMM_CFLAGS)
-diff --git a/glademm/init.cc b/glademm/init.cc
-new file mode 100644
-index 0000000..a179f19
--- /dev/null
+++ b/glademm/init.cc
@@ -0,0 +1,34 @@
@@ -125,9 +115,6 @@ index 0000000..a179f19
+
+} //namespace Glade
+} //namespace Gnome
-diff --git a/glademm/init.h b/glademm/init.h
-new file mode 100644
-index 0000000..6b2c564
--- /dev/null
+++ b/glademm/init.h
@@ -0,0 +1,38 @@
@@ -169,9 +156,6 @@ index 0000000..6b2c564
+
+#endif //_LIBGLADEMM_INIT_H
+
-diff --git a/glademm/variablesmap.cc b/glademm/variablesmap.cc
-new file mode 100644
-index 0000000..0b4c3dc
--- /dev/null
+++ b/glademm/variablesmap.cc
@@ -0,0 +1,199 @@
@@ -374,9 +358,6 @@ index 0000000..0b4c3dc
+
+} /* namespace Glade */
+} /* namespace Gnome */
-diff --git a/glademm/variablesmap.h b/glademm/variablesmap.h
-new file mode 100644
-index 0000000..c76e313
--- /dev/null
+++ b/glademm/variablesmap.h
@@ -0,0 +1,96 @@
@@ -476,9 +457,6 @@ index 0000000..c76e313
+#endif /* _LIBGLADEMM_VARIABLESMAP_H */
+
+
-diff --git a/glademm/wrap_init.cc b/glademm/wrap_init.cc
-new file mode 100644
-index 0000000..1e979f6
--- /dev/null
+++ b/glademm/wrap_init.cc
@@ -0,0 +1,50 @@
@@ -532,9 +510,6 @@ index 0000000..1e979f6
+} //Gnome
+
+
-diff --git a/glademm/wrap_init.h b/glademm/wrap_init.h
-new file mode 100644
-index 0000000..59dcf4a
--- /dev/null
+++ b/glademm/wrap_init.h
@@ -0,0 +1,37 @@
@@ -575,9 +550,6 @@ index 0000000..59dcf4a
+} /* namespace Gnome */
+
+#endif // _LIBGLADEMM_WRAP_INIT_H
-diff --git a/glademm/xml.cc b/glademm/xml.cc
-new file mode 100644
-index 0000000..5d42674
--- /dev/null
+++ b/glademm/xml.cc
@@ -0,0 +1,426 @@
@@ -1007,9 +979,6 @@ index 0000000..5d42674
+} // namespace Gnome
+
+
-diff --git a/glademm/xml.h b/glademm/xml.h
-new file mode 100644
-index 0000000..f2d7693
--- /dev/null
+++ b/glademm/xml.h
@@ -0,0 +1,402 @@
@@ -1415,9 +1384,6 @@ index 0000000..f2d7693
+
+#endif /* _LIBGLADEMM_XML_H */
+
-diff --git a/glademm/xml_p.h b/glademm/xml_p.h
-new file mode 100644
-index 0000000..12e6941
--- /dev/null
+++ b/glademm/xml_p.h
@@ -0,0 +1,57 @@
@@ -1478,11 +1444,9 @@ index 0000000..12e6941
+
+#endif /* _LIBGLADEMM_XML_P_H */
+
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e657baa..6c6c1a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -40,8 +40,8 @@ aeskulap_LDADD = \
+@@ -40,8 +40,8 @@
../widgets/libgtkdicom.la \
../imagepool/libimagepool.la \
../configuration/libconfiguration.la \
@@ -1490,10 +1454,8 @@ index e657baa..6c6c1a8 100644
$(GTKMM_LIBS) \
- $(GLADEMM_LIBS) \
$(GTHREAD_LIBS) \
- $(GCONFMM_LIBS) \
$(DCMTK_LIBS)
-diff --git a/src/aboutdialog.h b/src/aboutdialog.h
-index 4eb9566..c85844b 100644
+
--- a/src/aboutdialog.h
+++ b/src/aboutdialog.h
@@ -25,7 +25,7 @@
@@ -1505,8 +1467,6 @@ index 4eb9566..c85844b 100644
class AboutDialog : public Gtk::AboutDialog {
public:
-diff --git a/src/main.cpp b/src/main.cpp
-index b7330e7..783267d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,7 +35,7 @@
@@ -1518,8 +1478,6 @@ index b7330e7..783267d 100644
#include <iostream>
#include "gettext.h"
-diff --git a/src/mainwindow.h b/src/mainwindow.h
-index ec8fa50..d5bbd30 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -25,7 +25,7 @@
@@ -1531,8 +1489,6 @@ index ec8fa50..d5bbd30 100644
#include "fileloader.h"
#include "netloader.h"
-diff --git a/src/prescandialog.h b/src/prescandialog.h
-index 8a4e943..cd0503a 100644
--- a/src/prescandialog.h
+++ b/src/prescandialog.h
@@ -25,7 +25,7 @@
@@ -1544,8 +1500,6 @@ index 8a4e943..cd0503a 100644
class PrescanDialog : public Gtk::Window {
public:
-diff --git a/src/settings.h b/src/settings.h
-index 2a53659..51945c2 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -25,7 +25,7 @@
@@ -1557,8 +1511,6 @@ index 2a53659..51945c2 100644
#include "aconfigclient.h"
-diff --git a/src/studymanager.h b/src/studymanager.h
-index b84bb15..89d1467 100644
--- a/src/studymanager.h
+++ b/src/studymanager.h
@@ -25,7 +25,7 @@
@@ -1570,8 +1522,6 @@ index b84bb15..89d1467 100644
#include "aconfigclient.h"
#include <map>
-diff --git a/src/windowleveldialog.h b/src/windowleveldialog.h
-index a6a4050..71fe0d4 100644
--- a/src/windowleveldialog.h
+++ b/src/windowleveldialog.h
@@ -25,7 +25,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aeskulap.git
More information about the debian-med-commit
mailing list